diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 20:46:26 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-07-27 09:05:45 +1000 |
commit | 92fba5d3c8f5b757c4e3fdc89afe76a8f6c4da68 (patch) | |
tree | 28eab941dd7b34c8044060a2830cc36dc1ebe51c /drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | |
parent | 0407b33fadcd7a5d31ba3c473cef95b2b418d8c4 (diff) |
drm/nouveau/disp: collapse nv50_disp into nvkm_disp
Dump of one struct's members into another, with a couple of list
renames because of collisions.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c index 76425e8586da..5f9fa8af1f83 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c @@ -38,7 +38,7 @@ gf119_disp_dmac_bind(struct nv50_disp_chan *chan, void gf119_disp_dmac_fini(struct nv50_disp_chan *chan) { - struct nvkm_subdev *subdev = &chan->disp->base.engine.subdev; + struct nvkm_subdev *subdev = &chan->disp->engine.subdev; struct nvkm_device *device = subdev->device; int ctrl = chan->chid.ctrl; int user = chan->chid.user; @@ -60,7 +60,7 @@ gf119_disp_dmac_fini(struct nv50_disp_chan *chan) static int gf119_disp_dmac_init(struct nv50_disp_chan *chan) { - struct nvkm_subdev *subdev = &chan->disp->base.engine.subdev; + struct nvkm_subdev *subdev = &chan->disp->engine.subdev; struct nvkm_device *device = subdev->device; int ctrl = chan->chid.ctrl; int user = chan->chid.user; |