mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
cced63c3dd
The next commit removes the nvif rd/wr methods from nvif_device, which were probably a bad idea, and mostly intended as a fallback if ioremap() failed (or wasn't available, as was the case in some tools I once used). The nv04 KMS driver already mapped the device, because it's mostly been kept alive on life-support for many years and still directly bashes PRI a lot for modesetting. Post-nv50, I tried pretty hard to keep PRI accesses out of the DRM code, but there's still a few random places where we do, and those were using the rd/wr paths prior to this commit. This allocates and maps a new nvif_device (which will replace the usage of nouveau_drm.master.device later on), and replicates this pointer to all other possible users. This will be cleaned up by the end of another patch series, after it's been made safe to do so. Signed-off-by: Ben Skeggs <bskeggs@nvidia.com> Signed-off-by: Danilo Krummrich <dakr@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-25-bskeggs@nvidia.com
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/*
|
|
* Copyright 2014 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Ben Skeggs <bskeggs@redhat.com>
|
|
*/
|
|
#include <nvif/device.h>
|
|
#include <nvif/client.h>
|
|
|
|
u64
|
|
nvif_device_time(struct nvif_device *device)
|
|
{
|
|
if (!device->user.func) {
|
|
struct nv_device_time_v0 args = {};
|
|
int ret = nvif_object_mthd(&device->object, NV_DEVICE_V0_TIME,
|
|
&args, sizeof(args));
|
|
WARN_ON_ONCE(ret != 0);
|
|
return args.time;
|
|
}
|
|
|
|
return device->user.func->time(&device->user);
|
|
}
|
|
|
|
int
|
|
nvif_device_map(struct nvif_device *device)
|
|
{
|
|
return nvif_object_map(&device->object, NULL, 0);
|
|
}
|
|
|
|
void
|
|
nvif_device_dtor(struct nvif_device *device)
|
|
{
|
|
nvif_user_dtor(device);
|
|
kfree(device->runlist);
|
|
device->runlist = NULL;
|
|
nvif_object_dtor(&device->object);
|
|
}
|
|
|
|
int
|
|
nvif_device_ctor(struct nvif_client *client, const char *name, struct nvif_device *device)
|
|
{
|
|
int ret = nvif_object_ctor(&client->object, name ? name : "nvifDevice", 0,
|
|
0x0080, NULL, 0, &device->object);
|
|
device->runlist = NULL;
|
|
device->user.func = NULL;
|
|
if (ret == 0) {
|
|
device->info.version = 0;
|
|
ret = nvif_object_mthd(&device->object, NV_DEVICE_V0_INFO,
|
|
&device->info, sizeof(device->info));
|
|
}
|
|
return ret;
|
|
}
|