Commit a1bfb29a authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/device: split user device implementation out on its own

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0ac9d210
nvkm-y += nvkm/engine/device/acpi.o nvkm-y += nvkm/engine/device/acpi.o
nvkm-y += nvkm/engine/device/base.o nvkm-y += nvkm/engine/device/base.o
nvkm-y += nvkm/engine/device/ctrl.o nvkm-y += nvkm/engine/device/ctrl.o
nvkm-y += nvkm/engine/device/user.o
nvkm-y += nvkm/engine/device/nv04.o nvkm-y += nvkm/engine/device/nv04.o
nvkm-y += nvkm/engine/device/nv10.o nvkm-y += nvkm/engine/device/nv10.o
nvkm-y += nvkm/engine/device/nv20.o nvkm-y += nvkm/engine/device/nv20.o
......
...@@ -24,16 +24,10 @@ ...@@ -24,16 +24,10 @@
#include "priv.h" #include "priv.h"
#include "acpi.h" #include "acpi.h"
#include <core/client.h>
#include <core/option.h>
#include <core/notify.h> #include <core/notify.h>
#include <core/parent.h> #include <core/option.h>
#include <subdev/bios.h>
#include <subdev/fb.h>
#include <subdev/instmem.h>
#include <nvif/class.h> #include <subdev/bios.h>
#include <nvif/unpack.h>
static DEFINE_MUTEX(nv_devices_mutex); static DEFINE_MUTEX(nv_devices_mutex);
static LIST_HEAD(nv_devices); static LIST_HEAD(nv_devices);
...@@ -67,220 +61,6 @@ nvkm_device_list(u64 *name, int size) ...@@ -67,220 +61,6 @@ nvkm_device_list(u64 *name, int size)
return nr; return nr;
} }
/******************************************************************************
* nvkm_devobj (0x0080): class implementation
*****************************************************************************/
struct nvkm_devobj {
struct nvkm_parent base;
};
static int
nvkm_devobj_info(struct nvkm_object *object, void *data, u32 size)
{
struct nvkm_device *device = nv_device(object);
struct nvkm_fb *fb = nvkm_fb(device);
struct nvkm_instmem *imem = nvkm_instmem(device);
union {
struct nv_device_info_v0 v0;
} *args = data;
int ret;
nvif_ioctl(object, "device info size %d\n", size);
if (nvif_unpack(args->v0, 0, 0, false)) {
nvif_ioctl(object, "device info vers %d\n", args->v0.version);
} else
return ret;
switch (device->chipset) {
case 0x01a:
case 0x01f:
case 0x04c:
case 0x04e:
case 0x063:
case 0x067:
case 0x068:
case 0x0aa:
case 0x0ac:
case 0x0af:
args->v0.platform = NV_DEVICE_INFO_V0_IGP;
break;
default:
if (device->pdev) {
if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP))
args->v0.platform = NV_DEVICE_INFO_V0_AGP;
else
if (pci_is_pcie(device->pdev))
args->v0.platform = NV_DEVICE_INFO_V0_PCIE;
else
args->v0.platform = NV_DEVICE_INFO_V0_PCI;
} else {
args->v0.platform = NV_DEVICE_INFO_V0_SOC;
}
break;
}
switch (device->card_type) {
case NV_04: args->v0.family = NV_DEVICE_INFO_V0_TNT; break;
case NV_10:
case NV_11: args->v0.family = NV_DEVICE_INFO_V0_CELSIUS; break;
case NV_20: args->v0.family = NV_DEVICE_INFO_V0_KELVIN; break;
case NV_30: args->v0.family = NV_DEVICE_INFO_V0_RANKINE; break;
case NV_40: args->v0.family = NV_DEVICE_INFO_V0_CURIE; break;
case NV_50: args->v0.family = NV_DEVICE_INFO_V0_TESLA; break;
case NV_C0: args->v0.family = NV_DEVICE_INFO_V0_FERMI; break;
case NV_E0: args->v0.family = NV_DEVICE_INFO_V0_KEPLER; break;
case GM100: args->v0.family = NV_DEVICE_INFO_V0_MAXWELL; break;
default:
args->v0.family = 0;
break;
}
args->v0.chipset = device->chipset;
args->v0.revision = device->chiprev;
if (fb && fb->ram)
args->v0.ram_size = args->v0.ram_user = fb->ram->size;
else
args->v0.ram_size = args->v0.ram_user = 0;
if (imem && args->v0.ram_size > 0)
args->v0.ram_user = args->v0.ram_user - imem->reserved;
return 0;
}
static int
nvkm_devobj_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
{
switch (mthd) {
case NV_DEVICE_V0_INFO:
return nvkm_devobj_info(object, data, size);
default:
break;
}
return -EINVAL;
}
static u8
nvkm_devobj_rd08(struct nvkm_object *object, u64 addr)
{
return nvkm_rd08(object->engine->subdev.device, addr);
}
static u16
nvkm_devobj_rd16(struct nvkm_object *object, u64 addr)
{
return nvkm_rd16(object->engine->subdev.device, addr);
}
static u32
nvkm_devobj_rd32(struct nvkm_object *object, u64 addr)
{
return nvkm_rd32(object->engine->subdev.device, addr);
}
static void
nvkm_devobj_wr08(struct nvkm_object *object, u64 addr, u8 data)
{
nvkm_wr08(object->engine->subdev.device, addr, data);
}
static void
nvkm_devobj_wr16(struct nvkm_object *object, u64 addr, u16 data)
{
nvkm_wr16(object->engine->subdev.device, addr, data);
}
static void
nvkm_devobj_wr32(struct nvkm_object *object, u64 addr, u32 data)
{
nvkm_wr32(object->engine->subdev.device, addr, data);
}
static int
nvkm_devobj_map(struct nvkm_object *object, u64 *addr, u32 *size)
{
struct nvkm_device *device = nv_device(object);
*addr = nv_device_resource_start(device, 0);
*size = nv_device_resource_len(device, 0);
return 0;
}
static struct nvkm_oclass
nvkm_devobj_oclass_super = {
.handle = NV_DEVICE,
.ofuncs = &(struct nvkm_ofuncs) {
.dtor = _nvkm_parent_dtor,
.init = _nvkm_parent_init,
.fini = _nvkm_parent_fini,
.mthd = nvkm_devobj_mthd,
.map = nvkm_devobj_map,
.rd08 = nvkm_devobj_rd08,
.rd16 = nvkm_devobj_rd16,
.rd32 = nvkm_devobj_rd32,
.wr08 = nvkm_devobj_wr08,
.wr16 = nvkm_devobj_wr16,
.wr32 = nvkm_devobj_wr32,
}
};
static int
nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
union {
struct nv_device_v0 v0;
} *args = data;
struct nvkm_client *client = nv_client(parent);
struct nvkm_device *device;
struct nvkm_devobj *devobj;
int ret;
nvif_ioctl(parent, "create device size %d\n", size);
if (nvif_unpack(args->v0, 0, 0, false)) {
nvif_ioctl(parent, "create device v%d device %016llx\n",
args->v0.version, args->v0.device);
} else
return ret;
/* give priviledged clients register access */
if (client->super)
oclass = &nvkm_devobj_oclass_super;
/* find the device subdev that matches what the client requested */
device = client->device;
if (args->v0.device != ~0) {
device = nvkm_device_find(args->v0.device);
if (!device)
return -ENODEV;
}
ret = nvkm_parent_create(parent, nv_object(device), oclass, 0,
nvkm_control_oclass,
(1ULL << NVDEV_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_FIFO) |
(1ULL << NVDEV_ENGINE_DISP) |
(1ULL << NVDEV_ENGINE_PM), &devobj);
*pobject = nv_object(devobj);
if (ret)
return ret;
return 0;
}
static struct nvkm_ofuncs
nvkm_devobj_ofuncs = {
.ctor = nvkm_devobj_ctor,
.dtor = _nvkm_parent_dtor,
.init = _nvkm_parent_init,
.fini = _nvkm_parent_fini,
.mthd = nvkm_devobj_mthd,
};
/******************************************************************************
* nvkm_device: engine functions
*****************************************************************************/
struct nvkm_device * struct nvkm_device *
nv_device(void *obj) nv_device(void *obj)
{ {
...@@ -301,7 +81,7 @@ nv_device(void *obj) ...@@ -301,7 +81,7 @@ nv_device(void *obj)
static struct nvkm_oclass static struct nvkm_oclass
nvkm_device_sclass[] = { nvkm_device_sclass[] = {
{ 0x0080, &nvkm_devobj_ofuncs }, { 0x0080, &nvkm_udevice_ofuncs },
{} {}
}; };
......
...@@ -13,4 +13,6 @@ int nv50_identify(struct nvkm_device *); ...@@ -13,4 +13,6 @@ int nv50_identify(struct nvkm_device *);
int gf100_identify(struct nvkm_device *); int gf100_identify(struct nvkm_device *);
int gk104_identify(struct nvkm_device *); int gk104_identify(struct nvkm_device *);
int gm100_identify(struct nvkm_device *); int gm100_identify(struct nvkm_device *);
extern struct nvkm_ofuncs nvkm_udevice_ofuncs;
#endif #endif
/*
* Copyright 2012 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
*/
#include "priv.h"
#include <core/client.h>
#include <subdev/fb.h>
#include <subdev/instmem.h>
#include <nvif/class.h>
#include <nvif/unpack.h>
struct nvkm_udevice {
struct nvkm_parent base;
struct nvkm_device *device;
};
static int
nvkm_udevice_info(struct nvkm_object *object, void *data, u32 size)
{
struct nvkm_udevice *udev = (void *)object;
struct nvkm_device *device = udev->device;
struct nvkm_fb *fb = device->fb;
struct nvkm_instmem *imem = device->imem;
union {
struct nv_device_info_v0 v0;
} *args = data;
int ret;
nvif_ioctl(object, "device info size %d\n", size);
if (nvif_unpack(args->v0, 0, 0, false)) {
nvif_ioctl(object, "device info vers %d\n", args->v0.version);
} else
return ret;
switch (device->chipset) {
case 0x01a:
case 0x01f:
case 0x04c:
case 0x04e:
case 0x063:
case 0x067:
case 0x068:
case 0x0aa:
case 0x0ac:
case 0x0af:
args->v0.platform = NV_DEVICE_INFO_V0_IGP;
break;
default:
if (device->pdev) {
if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP))
args->v0.platform = NV_DEVICE_INFO_V0_AGP;
else
if (pci_is_pcie(device->pdev))
args->v0.platform = NV_DEVICE_INFO_V0_PCIE;
else
args->v0.platform = NV_DEVICE_INFO_V0_PCI;
} else {
args->v0.platform = NV_DEVICE_INFO_V0_SOC;
}
break;
}
switch (device->card_type) {
case NV_04: args->v0.family = NV_DEVICE_INFO_V0_TNT; break;
case NV_10:
case NV_11: args->v0.family = NV_DEVICE_INFO_V0_CELSIUS; break;
case NV_20: args->v0.family = NV_DEVICE_INFO_V0_KELVIN; break;
case NV_30: args->v0.family = NV_DEVICE_INFO_V0_RANKINE; break;
case NV_40: args->v0.family = NV_DEVICE_INFO_V0_CURIE; break;
case NV_50: args->v0.family = NV_DEVICE_INFO_V0_TESLA; break;
case NV_C0: args->v0.family = NV_DEVICE_INFO_V0_FERMI; break;
case NV_E0: args->v0.family = NV_DEVICE_INFO_V0_KEPLER; break;
case GM100: args->v0.family = NV_DEVICE_INFO_V0_MAXWELL; break;
default:
args->v0.family = 0;
break;
}
args->v0.chipset = device->chipset;
args->v0.revision = device->chiprev;
if (fb && fb->ram)
args->v0.ram_size = args->v0.ram_user = fb->ram->size;
else
args->v0.ram_size = args->v0.ram_user = 0;
if (imem && args->v0.ram_size > 0)
args->v0.ram_user = args->v0.ram_user - imem->reserved;
return 0;
}
static int
nvkm_udevice_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
{
switch (mthd) {
case NV_DEVICE_V0_INFO:
return nvkm_udevice_info(object, data, size);
default:
break;
}
return -EINVAL;
}
static u8
nvkm_udevice_rd08(struct nvkm_object *object, u64 addr)
{
struct nvkm_udevice *udev = (void *)object;
return nvkm_rd08(udev->device, addr);
}
static u16
nvkm_udevice_rd16(struct nvkm_object *object, u64 addr)
{
struct nvkm_udevice *udev = (void *)object;
return nvkm_rd16(udev->device, addr);
}
static u32
nvkm_udevice_rd32(struct nvkm_object *object, u64 addr)
{
struct nvkm_udevice *udev = (void *)object;
return nvkm_rd32(udev->device, addr);
}
static void
nvkm_udevice_wr08(struct nvkm_object *object, u64 addr, u8 data)
{
struct nvkm_udevice *udev = (void *)object;
nvkm_wr08(udev->device, addr, data);
}
static void
nvkm_udevice_wr16(struct nvkm_object *object, u64 addr, u16 data)
{
struct nvkm_udevice *udev = (void *)object;
nvkm_wr16(udev->device, addr, data);
}
static void
nvkm_udevice_wr32(struct nvkm_object *object, u64 addr, u32 data)
{
struct nvkm_udevice *udev = (void *)object;
nvkm_wr32(udev->device, addr, data);
}
static int
nvkm_udevice_map(struct nvkm_object *object, u64 *addr, u32 *size)
{
struct nvkm_udevice *udev = (void *)object;
struct nvkm_device *device = udev->device;
*addr = nv_device_resource_start(device, 0);
*size = nv_device_resource_len(device, 0);
return 0;
}
static struct nvkm_oclass
nvkm_udevice_oclass_super = {
.handle = NV_DEVICE,
.ofuncs = &(struct nvkm_ofuncs) {
.dtor = _nvkm_parent_dtor,
.init = _nvkm_parent_init,
.fini = _nvkm_parent_fini,
.mthd = nvkm_udevice_mthd,
.map = nvkm_udevice_map,
.rd08 = nvkm_udevice_rd08,
.rd16 = nvkm_udevice_rd16,
.rd32 = nvkm_udevice_rd32,
.wr08 = nvkm_udevice_wr08,
.wr16 = nvkm_udevice_wr16,
.wr32 = nvkm_udevice_wr32,
}
};
static int
nvkm_udevice_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
union {
struct nv_device_v0 v0;
} *args = data;
struct nvkm_client *client = nvkm_client(parent);
struct nvkm_device *device;
struct nvkm_udevice *udev;
int ret;
nvif_ioctl(parent, "create device size %d\n", size);
if (nvif_unpack(args->v0, 0, 0, false)) {
nvif_ioctl(parent, "create device v%d device %016llx\n",
args->v0.version, args->v0.device);
} else
return ret;
/* give priviledged clients register access */
if (client->super)
oclass = &nvkm_udevice_oclass_super;
/* find the device subdev that matches what the client requested */
device = client->device;
if (args->v0.device != ~0) {
device = nvkm_device_find(args->v0.device);
if (!device)
return -ENODEV;
}
ret = nvkm_parent_create(parent, nv_object(device), oclass, 0,
nvkm_control_oclass,
(1ULL << NVDEV_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_FIFO) |
(1ULL << NVDEV_ENGINE_DISP) |
(1ULL << NVDEV_ENGINE_PM), &udev);
*pobject = nv_object(udev);
if (ret)
return ret;
udev->device = device;
return 0;
}
struct nvkm_ofuncs
nvkm_udevice_ofuncs = {
.ctor = nvkm_udevice_ctor,
.dtor = _nvkm_parent_dtor,
.init = _nvkm_parent_init,
.fini = _nvkm_parent_fini,
.mthd = nvkm_udevice_mthd,
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment