drm/nouveau/disp/g94-: port OR DP training pattern control to nvkm_ior

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
index df3917cb1cb944933acaf22f605ebbe1118a0441..2d32bcc8aa8a774598302bac226da0bfa08a6a35 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
@@ -24,8 +24,6 @@
 #include "ior.h"
 #include "nv50.h"
 
-#include <subdev/timer.h>
-
 static inline u32
 gm200_sor_soff(struct nvkm_output_dp *outp)
 {
@@ -41,7 +39,7 @@ gm200_sor_loff(struct nvkm_output_dp *outp)
 static inline u32
 gm200_sor_dp_lane_map(struct nvkm_device *device, u8 lane)
 {
-       return lane * 0x08;
+       return nvkm_ior_find(device->disp, SOR, -1)->func->dp.lanes[lane] * 8;
 }
 
 static int
@@ -82,31 +80,8 @@ gm200_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
        return 0;
 }
 
-static int
-gm200_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
-{
-       struct nvkm_device *device = outp->base.disp->engine.subdev.device;
-       const u32 soff = gm200_sor_soff(outp);
-       const u32 loff = gm200_sor_loff(outp);
-       u32 mask = 0, i;
-
-       for (i = 0; i < nr; i++)
-               mask |= 1 << (gm200_sor_dp_lane_map(device, i) >> 3);
-
-       nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask);
-       nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000);
-       nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x61c034 + soff) & 0x80000000))
-                       break;
-       );
-       return 0;
-}
-
 static const struct nvkm_output_dp_func
 gm200_sor_dp_func = {
-       .pattern = gm107_sor_dp_pattern,
-       .lnk_pwr = gm200_sor_dp_lnk_pwr,
-       .lnk_ctl = gf119_sor_dp_lnk_ctl,
        .drv_ctl = gm200_sor_dp_drv_ctl,
        .vcpi = gf119_sor_dp_vcpi,
 };
@@ -132,6 +107,17 @@ gm200_sor_magic(struct nvkm_output *outp)
 
 static const struct nvkm_ior_func
 gm200_sor = {
+       .state = gf119_sor_state,
+       .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gk104_hdmi_ctrl,
+       },
+       .dp = {
+               .lanes = { 0, 1, 2, 3 },
+               .links = gf119_sor_dp_links,
+               .power = g94_sor_dp_power,
+               .pattern = gm107_sor_dp_pattern,
+       },
 };
 
 int