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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
index 621cb0b..ee9e800 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
@@ -31,6 +31,7 @@
 int
 g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
 {
+       struct nvkm_device *device = disp->base.engine.subdev.device;
        const u32 hoff = (head * 0x800);
        union {
                struct nv50_disp_sor_hdmi_pwr_v0 v0;
@@ -38,12 +39,12 @@ g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
        u32 ctrl;
        int ret;
 
-       nv_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
+       nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
        if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
-                                "max_ac_packet %d rekey %d\n",
-                        args->v0.version, args->v0.state,
-                        args->v0.max_ac_packet, args->v0.rekey);
+               nvif_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
+                                  "max_ac_packet %d rekey %d\n",
+                          args->v0.version, args->v0.state,
+                          args->v0.max_ac_packet, args->v0.rekey);
                if (args->v0.max_ac_packet > 0x1f || args->v0.rekey > 0x7f)
                        return -EINVAL;
                ctrl  = 0x40000000 * !!args->v0.state;
@@ -54,38 +55,38 @@ g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
                return ret;
 
        if (!(ctrl & 0x40000000)) {
-               nv_mask(priv, 0x6165a4 + hoff, 0x40000000, 0x00000000);
-               nv_mask(priv, 0x616520 + hoff, 0x00000001, 0x00000000);
-               nv_mask(priv, 0x616500 + hoff, 0x00000001, 0x00000000);
+               nvkm_mask(device, 0x6165a4 + hoff, 0x40000000, 0x00000000);
+               nvkm_mask(device, 0x616520 + hoff, 0x00000001, 0x00000000);
+               nvkm_mask(device, 0x616500 + hoff, 0x00000001, 0x00000000);
                return 0;
        }
 
        /* AVI InfoFrame */
-       nv_mask(priv, 0x616520 + hoff, 0x00000001, 0x00000000);
-       nv_wr32(priv, 0x616528 + hoff, 0x000d0282);
-       nv_wr32(priv, 0x61652c + hoff, 0x0000006f);
-       nv_wr32(priv, 0x616530 + hoff, 0x00000000);
-       nv_wr32(priv, 0x616534 + hoff, 0x00000000);
-       nv_wr32(priv, 0x616538 + hoff, 0x00000000);
-       nv_mask(priv, 0x616520 + hoff, 0x00000001, 0x00000001);
+       nvkm_mask(device, 0x616520 + hoff, 0x00000001, 0x00000000);
+       nvkm_wr32(device, 0x616528 + hoff, 0x000d0282);
+       nvkm_wr32(device, 0x61652c + hoff, 0x0000006f);
+       nvkm_wr32(device, 0x616530 + hoff, 0x00000000);
+       nvkm_wr32(device, 0x616534 + hoff, 0x00000000);
+       nvkm_wr32(device, 0x616538 + hoff, 0x00000000);
+       nvkm_mask(device, 0x616520 + hoff, 0x00000001, 0x00000001);
 
        /* Audio InfoFrame */
-       nv_mask(priv, 0x616500 + hoff, 0x00000001, 0x00000000);
-       nv_wr32(priv, 0x616508 + hoff, 0x000a0184);
-       nv_wr32(priv, 0x61650c + hoff, 0x00000071);
-       nv_wr32(priv, 0x616510 + hoff, 0x00000000);
-       nv_mask(priv, 0x616500 + hoff, 0x00000001, 0x00000001);
+       nvkm_mask(device, 0x616500 + hoff, 0x00000001, 0x00000000);
+       nvkm_wr32(device, 0x616508 + hoff, 0x000a0184);
+       nvkm_wr32(device, 0x61650c + hoff, 0x00000071);
+       nvkm_wr32(device, 0x616510 + hoff, 0x00000000);
+       nvkm_mask(device, 0x616500 + hoff, 0x00000001, 0x00000001);
 
-       nv_mask(priv, 0x6165d0 + hoff, 0x00070001, 0x00010001); /* SPARE, HW_CTS */
-       nv_mask(priv, 0x616568 + hoff, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */
-       nv_mask(priv, 0x616578 + hoff, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */
+       nvkm_mask(device, 0x6165d0 + hoff, 0x00070001, 0x00010001); /* SPARE, HW_CTS */
+       nvkm_mask(device, 0x616568 + hoff, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */
+       nvkm_mask(device, 0x616578 + hoff, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */
 
        /* ??? */
-       nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */
-       nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */
-       nv_mask(priv, 0x61733c, 0x00100000, 0x00000000); /* !RESETF */
+       nvkm_mask(device, 0x61733c, 0x00100000, 0x00100000); /* RESETF */
+       nvkm_mask(device, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */
+       nvkm_mask(device, 0x61733c, 0x00100000, 0x00000000); /* !RESETF */
 
        /* HDMI_CTRL */
-       nv_mask(priv, 0x6165a4 + hoff, 0x5f1f007f, ctrl);
+       nvkm_mask(device, 0x6165a4 + hoff, 0x5f1f007f, ctrl);
        return 0;
 }