aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-22 20:35:16 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-02-17 15:15:00 +1000
commit04b8867758a4e1fca9d349f4a279fff8855db58c (patch)
treeed6ce57d32f045d60f834942e5232ac9967caa93 /drivers/gpu/drm/nouveau/nouveau_drm.c
parentdrm/nouveau/core/client: pass notification callback to nvkm_client_new (diff)
downloadlinux-dev-04b8867758a4e1fca9d349f4a279fff8855db58c.tar.xz
linux-dev-04b8867758a4e1fca9d349f4a279fff8855db58c.zip
drm/nouveau/core/client: allow creation of subclients
We want a supervisor client of NVKM (such as the DRM) to be able to allow sharing of resources (such as memory objects) between clients. To allow this, the supervisor creates all its clients as children of itself, and will use an upcoming ioctl to permit sharing. Currently it's not possible for indirect clients to use subclients. Supporting this will require an additional field in the main ioctl. This isn't important currently, but will need to be fixed for virt. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index dd7b52ab505a..279a96dc9a60 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -37,6 +37,8 @@
#include <core/pci.h>
#include <core/tegra.h>
+#include <nvif/driver.h>
+
#include <nvif/class.h>
#include <nvif/cl0002.h>
#include <nvif/cla06f.h>
@@ -119,8 +121,8 @@ nouveau_cli_create(struct drm_device *dev, const char *sname,
snprintf(cli->name, sizeof(cli->name), "%s", sname);
cli->dev = dev;
- ret = nvif_client_init(NULL, cli->name, nouveau_name(dev),
- nouveau_config, nouveau_debug,
+ ret = nvif_driver_init(NULL, nouveau_config, nouveau_debug,
+ cli->name, nouveau_name(dev),
&cli->base);
if (ret == 0) {
mutex_init(&cli->mutex);