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/wimmgv100.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/wimmgv100.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c index bb4db6351ddf..49070727545e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c @@ -29,7 +29,7 @@ static void gv100_disp_wimm_intr(struct nv50_disp_chan *chan, bool en) { - struct nvkm_device *device = chan->disp->base.engine.subdev.device; + struct nvkm_device *device = chan->disp->engine.subdev.device; const u32 mask = 0x00000001 << chan->head; const u32 data = en ? mask : 0; nvkm_mask(device, 0x611da8, mask, data); @@ -46,7 +46,7 @@ gv100_disp_wimm = { static int gv100_disp_wimm_new_(const struct nv50_disp_chan_func *func, const struct nv50_disp_chan_mthd *mthd, - struct nv50_disp *disp, int chid, + struct nvkm_disp *disp, int chid, const struct nvkm_oclass *oclass, void *argv, u32 argc, struct nvkm_object **pobject) { @@ -75,7 +75,7 @@ gv100_disp_wimm_new_(const struct nv50_disp_chan_func *func, int gv100_disp_wimm_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, - struct nv50_disp *disp, struct nvkm_object **pobject) + struct nvkm_disp *disp, struct nvkm_object **pobject) { return gv100_disp_wimm_new_(&gv100_disp_wimm, NULL, disp, 33, oclass, argv, argc, pobject); |