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/coreg84.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/coreg84.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c index cfc54aad3e7c..0290041fe8f0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c @@ -104,7 +104,7 @@ g84_disp_core_mthd = { int g84_disp_core_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 nv50_disp_core_new_(&nv50_disp_core_func, &g84_disp_core_mthd, disp, 0, oclass, argv, argc, pobject); |