These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / disp / hdagt215.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
index 891d1e7..c1590b7 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
@@ -33,15 +33,17 @@
 int
 gt215_hda_eld(NV50_DISP_MTHD_V1)
 {
+       struct nvkm_device *device = disp->base.engine.subdev.device;
        union {
                struct nv50_disp_sor_hda_eld_v0 v0;
        } *args = data;
        const u32 soff = outp->or * 0x800;
        int ret, i;
 
-       nv_ioctl(object, "disp sor hda eld size %d\n", size);
+       nvif_ioctl(object, "disp sor hda eld size %d\n", size);
        if (nvif_unpack(args->v0, 0, 0, true)) {
-               nv_ioctl(object, "disp sor hda eld vers %d\n", args->v0.version);
+               nvif_ioctl(object, "disp sor hda eld vers %d\n",
+                          args->v0.version);
                if (size > 0x60)
                        return -E2BIG;
        } else
@@ -49,20 +51,28 @@ gt215_hda_eld(NV50_DISP_MTHD_V1)
 
        if (size && args->v0.data[0]) {
                if (outp->info.type == DCB_OUTPUT_DP) {
-                       nv_mask(priv, 0x61c1e0 + soff, 0x8000000d, 0x80000001);
-                       nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000);
+                       nvkm_mask(device, 0x61c1e0 + soff, 0x8000000d, 0x80000001);
+                       nvkm_msec(device, 2000,
+                               u32 tmp = nvkm_rd32(device, 0x61c1e0 + soff);
+                               if (!(tmp & 0x80000000))
+                                       break;
+                       );
                }
                for (i = 0; i < size; i++)
-                       nv_wr32(priv, 0x61c440 + soff, (i << 8) | args->v0.data[0]);
+                       nvkm_wr32(device, 0x61c440 + soff, (i << 8) | args->v0.data[0]);
                for (; i < 0x60; i++)
-                       nv_wr32(priv, 0x61c440 + soff, (i << 8));
-               nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000003);
+                       nvkm_wr32(device, 0x61c440 + soff, (i << 8));
+               nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000003);
        } else {
                if (outp->info.type == DCB_OUTPUT_DP) {
-                       nv_mask(priv, 0x61c1e0 + soff, 0x80000001, 0x80000000);
-                       nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000);
+                       nvkm_mask(device, 0x61c1e0 + soff, 0x80000001, 0x80000000);
+                       nvkm_msec(device, 2000,
+                               u32 tmp = nvkm_rd32(device, 0x61c1e0 + soff);
+                               if (!(tmp & 0x80000000))
+                                       break;
+                       );
                }
-               nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size);
+               nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size);
        }
 
        return 0;