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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
index ca34ff8..110dc19 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
@@ -31,6 +31,7 @@
 int
 gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
 {
+       struct nvkm_device *device = disp->base.engine.subdev.device;
        const u32 hoff = (head * 0x800);
        const u32 hdmi = (head * 0x400);
        union {
@@ -39,12 +40,12 @@ gk104_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,30 +55,30 @@ gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
                return ret;
 
        if (!(ctrl & 0x40000000)) {
-               nv_mask(priv, 0x616798 + hoff, 0x40000000, 0x00000000);
-               nv_mask(priv, 0x6900c0 + hdmi, 0x00000001, 0x00000000);
-               nv_mask(priv, 0x690000 + hdmi, 0x00000001, 0x00000000);
+               nvkm_mask(device, 0x616798 + hoff, 0x40000000, 0x00000000);
+               nvkm_mask(device, 0x6900c0 + hdmi, 0x00000001, 0x00000000);
+               nvkm_mask(device, 0x690000 + hdmi, 0x00000001, 0x00000000);
                return 0;
        }
 
        /* AVI InfoFrame */
-       nv_mask(priv, 0x690000 + hdmi, 0x00000001, 0x00000000);
-       nv_wr32(priv, 0x690008 + hdmi, 0x000d0282);
-       nv_wr32(priv, 0x69000c + hdmi, 0x0000006f);
-       nv_wr32(priv, 0x690010 + hdmi, 0x00000000);
-       nv_wr32(priv, 0x690014 + hdmi, 0x00000000);
-       nv_wr32(priv, 0x690018 + hdmi, 0x00000000);
-       nv_mask(priv, 0x690000 + hdmi, 0x00000001, 0x00000001);
+       nvkm_mask(device, 0x690000 + hdmi, 0x00000001, 0x00000000);
+       nvkm_wr32(device, 0x690008 + hdmi, 0x000d0282);
+       nvkm_wr32(device, 0x69000c + hdmi, 0x0000006f);
+       nvkm_wr32(device, 0x690010 + hdmi, 0x00000000);
+       nvkm_wr32(device, 0x690014 + hdmi, 0x00000000);
+       nvkm_wr32(device, 0x690018 + hdmi, 0x00000000);
+       nvkm_mask(device, 0x690000 + hdmi, 0x00000001, 0x00000001);
 
        /* ??? InfoFrame? */
-       nv_mask(priv, 0x6900c0 + hdmi, 0x00000001, 0x00000000);
-       nv_wr32(priv, 0x6900cc + hdmi, 0x00000010);
-       nv_mask(priv, 0x6900c0 + hdmi, 0x00000001, 0x00000001);
+       nvkm_mask(device, 0x6900c0 + hdmi, 0x00000001, 0x00000000);
+       nvkm_wr32(device, 0x6900cc + hdmi, 0x00000010);
+       nvkm_mask(device, 0x6900c0 + hdmi, 0x00000001, 0x00000001);
 
        /* ??? */
-       nv_wr32(priv, 0x690080 + hdmi, 0x82000000);
+       nvkm_wr32(device, 0x690080 + hdmi, 0x82000000);
 
        /* HDMI_CTRL */
-       nv_mask(priv, 0x616798 + hoff, 0x401f007f, ctrl);
+       nvkm_mask(device, 0x616798 + hoff, 0x401f007f, ctrl);
        return 0;
 }