drm/nouveau/disp/gt215-: port HDA ELD controls to nvkm_ior

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / disp / gk104.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
index 37f145cf30d78345c2c599ca9174994fc164b81f..e45cc01aed1c223a2cb3882a02c72eabb396ad95 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
@@ -22,6 +22,8 @@
  * Authors: Ben Skeggs
  */
 #include "nv50.h"
+#include "head.h"
+#include "ior.h"
 #include "rootnv50.h"
 
 static const struct nv50_disp_func
@@ -29,22 +31,15 @@ gk104_disp = {
        .intr = gf119_disp_intr,
        .intr_error = gf119_disp_intr_error,
        .uevent = &gf119_disp_chan_uevent,
-       .super = gf119_disp_intr_supervisor,
+       .super = gf119_disp_super,
        .root = &gk104_disp_root_oclass,
-       .head.vblank_init = gf119_disp_vblank_init,
-       .head.vblank_fini = gf119_disp_vblank_fini,
-       .head.scanoutpos = gf119_disp_root_scanoutpos,
+       .head.new = gf119_head_new,
        .outp.internal.crt = nv50_dac_output_new,
        .outp.internal.tmds = nv50_sor_output_new,
        .outp.internal.lvds = nv50_sor_output_new,
        .outp.internal.dp = gf119_sor_dp_new,
-       .dac.nr = 3,
-       .dac.power = nv50_dac_power,
-       .dac.sense = nv50_dac_sense,
-       .sor.nr = 4,
-       .sor.power = nv50_sor_power,
-       .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
+       .dac = { .nr = 3, .new = gf119_dac_new },
+       .sor = { .nr = 4, .new = gk104_sor_new },
 };
 
 int