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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
index b229a31..29e0d2a 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
@@ -33,6 +33,7 @@
 int
 nv50_sor_power(NV50_DISP_MTHD_V1)
 {
+       struct nvkm_device *device = disp->base.engine.subdev.device;
        union {
                struct nv50_disp_sor_pwr_v0 v0;
        } *args = data;
@@ -40,17 +41,39 @@ nv50_sor_power(NV50_DISP_MTHD_V1)
        u32 stat;
        int ret;
 
-       nv_ioctl(object, "disp sor pwr size %d\n", size);
+       nvif_ioctl(object, "disp sor pwr size %d\n", size);
        if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(object, "disp sor pwr vers %d state %d\n",
-                        args->v0.version, args->v0.state);
+               nvif_ioctl(object, "disp sor pwr vers %d state %d\n",
+                          args->v0.version, args->v0.state);
                stat = !!args->v0.state;
        } else
                return ret;
 
-       nv_wait(priv, 0x61c004 + soff, 0x80000000, 0x00000000);
-       nv_mask(priv, 0x61c004 + soff, 0x80000001, 0x80000000 | stat);
-       nv_wait(priv, 0x61c004 + soff, 0x80000000, 0x00000000);
-       nv_wait(priv, 0x61c030 + soff, 0x10000000, 0x00000000);
+
+       nvkm_msec(device, 2000,
+               if (!(nvkm_rd32(device, 0x61c004 + soff) & 0x80000000))
+                       break;
+       );
+       nvkm_mask(device, 0x61c004 + soff, 0x80000001, 0x80000000 | stat);
+       nvkm_msec(device, 2000,
+               if (!(nvkm_rd32(device, 0x61c004 + soff) & 0x80000000))
+                       break;
+       );
+       nvkm_msec(device, 2000,
+               if (!(nvkm_rd32(device, 0x61c030 + soff) & 0x10000000))
+                       break;
+       );
        return 0;
 }
+
+static const struct nvkm_output_func
+nv50_sor_output_func = {
+};
+
+int
+nv50_sor_output_new(struct nvkm_disp *disp, int index,
+                   struct dcb_output *dcbE, struct nvkm_output **poutp)
+{
+       return nvkm_output_new_(&nv50_sor_output_func, disp,
+                               index, dcbE, poutp);
+}