drm/nouveau/bios: convert to new-style nvkm_subdev

[mirror_ubuntu-eoan-kernel.git] / drivers / gpu / drm / nouveau / nvkm / engine / disp / nv50.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
index 9bc4273947c34a88b8bcfc0f63dad4974abe8b0c..efffecbc92a5bd0edf4536519b5e9e3d2dea365c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
@@ -319,6 +319,7 @@ nv50_disp_intr_unk10_0(struct nv50_disp *disp, int head)
 static void
 nv50_disp_intr_unk20_0(struct nv50_disp *disp, int head)
 {
+       struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_output *outp = exec_script(disp, head, 2);
 
        /* the binary driver does this outside of the supervisor handling
@@ -337,8 +338,8 @@ nv50_disp_intr_unk20_0(struct nv50_disp *disp, int head)
        if (outp && outp->info.type == DCB_OUTPUT_DP) {
                struct nvkm_output_dp *outpdp = nvkm_output_dp(outp);
                struct nvbios_init init = {
-                       .subdev = nv_subdev(disp),
-                       .bios = nvkm_bios(disp),
+                       .subdev = subdev,
+                       .bios = subdev->device->bios,
                        .outp = &outp->info,
                        .crtc = head,
                        .offset = outpdp->info.script[4],