drm/nouveau/disp/g84-: port OR HDMI control to nvkm_ior

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
index 3e11010..50fbe1c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
@@ -39,9 +39,7 @@ g84_disp = {
        .outp.external.tmds = nv50_pior_output_new,
        .outp.external.dp = nv50_pior_dp_new,
        .dac = { .nr = 3, .new = nv50_dac_new },
-       .sor.nr = 2,
-       .sor.new = g84_sor_new,
-       .sor.hdmi = g84_hdmi_ctrl,
+       .sor = { .nr = 2, .new = g84_sor_new },
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
index ac9cd33..8cc2a8c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
@@ -40,9 +40,7 @@ g94_disp = {
        .outp.external.tmds = nv50_pior_output_new,
        .outp.external.dp = nv50_pior_dp_new,
        .dac = { .nr = 3, .new = nv50_dac_new },
-       .sor.nr = 4,
-       .sor.new = g94_sor_new,
-       .sor.hdmi = g84_hdmi_ctrl,
+       .sor = { .nr = 4, .new = g94_sor_new },
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
index 76972e0..d4df198 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
@@ -510,7 +510,6 @@ gf119_disp = {
        .sor.nr = 4,
        .sor.new = gf119_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gf119_hdmi_ctrl,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
index 2f84b1b..4d22d87 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
@@ -42,7 +42,6 @@ gk104_disp = {
        .sor.nr = 4,
        .sor.new = gk104_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c
index abf50b2..adc2a22 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c
@@ -42,7 +42,6 @@ gk110_disp = {
        .sor.nr = 4,
        .sor.new = gk104_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
index 0923ca4..116b99b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
@@ -42,7 +42,6 @@ gm107_disp = {
        .sor.nr = 4,
        .sor.new = gm107_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c
index cc83734..ffdb5a4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c
@@ -42,7 +42,6 @@ gm200_disp = {
        .sor.nr = 4,
        .sor.new = gm200_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
        .sor.magic = gm200_sor_magic,
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c
index 4b6a60d..bd5ab59 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c
@@ -40,7 +40,6 @@ gp100_disp = {
        .sor.nr = 4,
        .sor.new = gm200_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
        .sor.magic = gm200_sor_magic,
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c
index 26f745b..4875d48 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c
@@ -66,7 +66,6 @@ gp102_disp = {
        .sor.nr = 4,
        .sor.new = gm200_sor_new,
        .sor.hda_eld = gf119_hda_eld,
-       .sor.hdmi = gk104_hdmi_ctrl,
        .sor.magic = gm200_sor_magic,
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
index f9d4376..387f57b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
@@ -39,9 +39,7 @@ gt200_disp = {
        .outp.external.tmds = nv50_pior_output_new,
        .outp.external.dp = nv50_pior_dp_new,
        .dac = { .nr = 3, .new = nv50_dac_new },
-       .sor.nr = 2,
-       .sor.new = g84_sor_new,
-       .sor.hdmi = g84_hdmi_ctrl,
+       .sor = { .nr = 2, .new = g84_sor_new },
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
index 6c75a97..4edd371 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
@@ -43,7 +43,6 @@ gt215_disp = {
        .sor.nr = 4,
        .sor.new = gt215_sor_new,
        .sor.hda_eld = gt215_hda_eld,
-       .sor.hdmi = gt215_hdmi_ctrl,
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
index 35a8251..528f562 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
@@ -1,6 +1,6 @@
 #ifndef __NVKM_DISP_HDMI_H__
 #define __NVKM_DISP_HDMI_H__
-#include "nv50.h"
+#include "ior.h"
 
 struct packed_hdmi_infoframe {
        u32 header;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
index f25d8c7..661410f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
@@ -23,65 +23,33 @@
  */
 #include "hdmi.h"
 
-#include <core/client.h>
-
-#include <nvif/cl5070.h>
-#include <nvif/unpack.h>
-
-int
-g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
+void
+g84_hdmi_ctrl(struct nvkm_ior *ior, int head, bool enable, u8 max_ac_packet,
+             u8 rekey, u8 *avi, u8 avi_size, u8 *vendor, u8 vendor_size)
 {
-       struct nvkm_device *device = disp->base.engine.subdev.device;
-       const u32 hoff = (head * 0x800);
-       union {
-               struct nv50_disp_sor_hdmi_pwr_v0 v0;
-       } *args = data;
+       struct nvkm_device *device = ior->disp->engine.subdev.device;
+       const u32 ctrl = 0x40000000 * enable |
+                        0x1f000000 /* ??? */ |
+                        max_ac_packet << 16 |
+                        rekey;
+       const u32 hoff = head * 0x800;
        struct packed_hdmi_infoframe avi_infoframe;
        struct packed_hdmi_infoframe vendor_infoframe;
-       u32 ctrl;
-       int ret = -ENOSYS;
-
-       nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
-               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;
-               ctrl |= args->v0.max_ac_packet << 16;
-               ctrl |= args->v0.rekey;
-               ctrl |= 0x1f000000; /* ??? */
-       } else
-               return ret;
-
-       if ((args->v0.avi_infoframe_length
-            + args->v0.vendor_infoframe_length) > size)
-               return -ENOSYS;
-       else if ((args->v0.avi_infoframe_length
-                   + args->v0.vendor_infoframe_length) < size)
-               return -E2BIG;
-
-       pack_hdmi_infoframe(&avi_infoframe,
-                           data,
-                           args->v0.avi_infoframe_length);
 
-       pack_hdmi_infoframe(&vendor_infoframe,
-                           data + args->v0.avi_infoframe_length,
-                           args->v0.vendor_infoframe_length);
+       pack_hdmi_infoframe(&avi_infoframe, avi, avi_size);
+       pack_hdmi_infoframe(&vendor_infoframe, vendor, vendor_size);
 
        if (!(ctrl & 0x40000000)) {
                nvkm_mask(device, 0x6165a4 + hoff, 0x40000000, 0x00000000);
                nvkm_mask(device, 0x61653c + hoff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x616520 + hoff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x616500 + hoff, 0x00000001, 0x00000000);
-               return 0;
+               return;
        }
 
        /* AVI InfoFrame */
        nvkm_mask(device, 0x616520 + hoff, 0x00000001, 0x00000000);
-       if (args->v0.avi_infoframe_length) {
+       if (avi_size) {
                nvkm_wr32(device, 0x616528 + hoff, avi_infoframe.header);
                nvkm_wr32(device, 0x61652c + hoff, avi_infoframe.subpack0_low);
                nvkm_wr32(device, 0x616530 + hoff, avi_infoframe.subpack0_high);
@@ -99,7 +67,7 @@ g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* Vendor InfoFrame */
        nvkm_mask(device, 0x61653c + hoff, 0x00010001, 0x00010000);
-       if (args->v0.vendor_infoframe_length) {
+       if (vendor_size) {
                nvkm_wr32(device, 0x616544 + hoff, vendor_infoframe.header);
                nvkm_wr32(device, 0x616548 + hoff, vendor_infoframe.subpack0_low);
                nvkm_wr32(device, 0x61654c + hoff, vendor_infoframe.subpack0_high);
@@ -120,5 +88,4 @@ g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* HDMI_CTRL */
        nvkm_mask(device, 0x6165a4 + hoff, 0x5f1f007f, ctrl);
-       return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
index 8dc6a79..6cac0e7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
@@ -23,64 +23,32 @@
  */
 #include "hdmi.h"
 
-#include <core/client.h>
-
-#include <nvif/cl5070.h>
-#include <nvif/unpack.h>
-
-int
-gf119_hdmi_ctrl(NV50_DISP_MTHD_V1)
+void
+gf119_hdmi_ctrl(struct nvkm_ior *ior, int head, bool enable, u8 max_ac_packet,
+               u8 rekey, u8 *avi, u8 avi_size, u8 *vendor, u8 vendor_size)
 {
-       struct nvkm_device *device = disp->base.engine.subdev.device;
-       const u32 hoff = (head * 0x800);
-       union {
-               struct nv50_disp_sor_hdmi_pwr_v0 v0;
-       } *args = data;
+       struct nvkm_device *device = ior->disp->engine.subdev.device;
+       const u32 ctrl = 0x40000000 * enable |
+                        max_ac_packet << 16 |
+                        rekey;
+       const u32 hoff = head * 0x800;
        struct packed_hdmi_infoframe avi_infoframe;
        struct packed_hdmi_infoframe vendor_infoframe;
-       u32 ctrl;
-       int ret = -ENOSYS;
-
-       nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
-               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;
-               ctrl |= args->v0.max_ac_packet << 16;
-               ctrl |= args->v0.rekey;
-       } else
-               return ret;
-
-       if ((args->v0.avi_infoframe_length
-            + args->v0.vendor_infoframe_length) > size)
-               return -ENOSYS;
-       else if ((args->v0.avi_infoframe_length
-                   + args->v0.vendor_infoframe_length) < size)
-               return -E2BIG;
-
-       pack_hdmi_infoframe(&avi_infoframe,
-                           data,
-                           args->v0.avi_infoframe_length);
 
-       pack_hdmi_infoframe(&vendor_infoframe,
-                           data + args->v0.avi_infoframe_length,
-                           args->v0.vendor_infoframe_length);
+       pack_hdmi_infoframe(&avi_infoframe, avi, avi_size);
+       pack_hdmi_infoframe(&vendor_infoframe, vendor, vendor_size);
 
        if (!(ctrl & 0x40000000)) {
                nvkm_mask(device, 0x616798 + hoff, 0x40000000, 0x00000000);
                nvkm_mask(device, 0x616730 + hoff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x6167a4 + hoff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x616714 + hoff, 0x00000001, 0x00000000);
-               return 0;
+               return;
        }
 
        /* AVI InfoFrame */
        nvkm_mask(device, 0x616714 + hoff, 0x00000001, 0x00000000);
-       if (args->v0.avi_infoframe_length) {
+       if (avi_size) {
                nvkm_wr32(device, 0x61671c + hoff, avi_infoframe.header);
                nvkm_wr32(device, 0x616720 + hoff, avi_infoframe.subpack0_low);
                nvkm_wr32(device, 0x616724 + hoff, avi_infoframe.subpack0_high);
@@ -91,7 +59,7 @@ gf119_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* GENERIC(?) / Vendor InfoFrame? */
        nvkm_mask(device, 0x616730 + hoff, 0x00010001, 0x00010000);
-       if (args->v0.vendor_infoframe_length) {
+       if (vendor_size) {
                /*
                 * These appear to be the audio infoframe registers,
                 * but no other set of infoframe registers has yet
@@ -111,5 +79,4 @@ gf119_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* HDMI_CTRL */
        nvkm_mask(device, 0x616798 + hoff, 0x401f007f, ctrl);
-       return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
index 1be2ecb..ed0a610 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
@@ -23,65 +23,33 @@
  */
 #include "hdmi.h"
 
-#include <core/client.h>
-
-#include <nvif/cl5070.h>
-#include <nvif/unpack.h>
-
-int
-gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
+void
+gk104_hdmi_ctrl(struct nvkm_ior *ior, int head, bool enable, u8 max_ac_packet,
+               u8 rekey, u8 *avi, u8 avi_size, u8 *vendor, u8 vendor_size)
 {
-       struct nvkm_device *device = disp->base.engine.subdev.device;
-       const u32 hoff = (head * 0x800);
-       const u32 hdmi = (head * 0x400);
-       union {
-               struct nv50_disp_sor_hdmi_pwr_v0 v0;
-       } *args = data;
+       struct nvkm_device *device = ior->disp->engine.subdev.device;
+       const u32 ctrl = 0x40000000 * enable |
+                        max_ac_packet << 16 |
+                        rekey;
+       const u32 hoff = head * 0x800;
+       const u32 hdmi = head * 0x400;
        struct packed_hdmi_infoframe avi_infoframe;
        struct packed_hdmi_infoframe vendor_infoframe;
-       u32 ctrl;
-       int ret = -ENOSYS;
-
-       nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
-               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;
-               ctrl |= args->v0.max_ac_packet << 16;
-               ctrl |= args->v0.rekey;
-       } else
-               return ret;
-
-       if ((args->v0.avi_infoframe_length
-            + args->v0.vendor_infoframe_length) > size)
-               return -ENOSYS;
-       else if ((args->v0.avi_infoframe_length
-                   + args->v0.vendor_infoframe_length) < size)
-               return -E2BIG;
-
-       pack_hdmi_infoframe(&avi_infoframe,
-                           data,
-                           args->v0.avi_infoframe_length);
 
-       pack_hdmi_infoframe(&vendor_infoframe,
-                           data + args->v0.avi_infoframe_length,
-                           args->v0.vendor_infoframe_length);
+       pack_hdmi_infoframe(&avi_infoframe, avi, avi_size);
+       pack_hdmi_infoframe(&vendor_infoframe, vendor, vendor_size);
 
        if (!(ctrl & 0x40000000)) {
                nvkm_mask(device, 0x616798 + hoff, 0x40000000, 0x00000000);
                nvkm_mask(device, 0x690100 + hdmi, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x6900c0 + hdmi, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x690000 + hdmi, 0x00000001, 0x00000000);
-               return 0;
+               return;
        }
 
        /* AVI InfoFrame */
        nvkm_mask(device, 0x690000 + hdmi, 0x00000001, 0x00000000);
-       if (args->v0.avi_infoframe_length) {
+       if (avi_size) {
                nvkm_wr32(device, 0x690008 + hdmi, avi_infoframe.header);
                nvkm_wr32(device, 0x69000c + hdmi, avi_infoframe.subpack0_low);
                nvkm_wr32(device, 0x690010 + hdmi, avi_infoframe.subpack0_high);
@@ -92,7 +60,7 @@ gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* GENERIC(?) / Vendor InfoFrame? */
        nvkm_mask(device, 0x690100 + hdmi, 0x00010001, 0x00000000);
-       if (args->v0.vendor_infoframe_length) {
+       if (vendor_size) {
                nvkm_wr32(device, 0x690108 + hdmi, vendor_infoframe.header);
                nvkm_wr32(device, 0x69010c + hdmi, vendor_infoframe.subpack0_low);
                nvkm_wr32(device, 0x690110 + hdmi, vendor_infoframe.subpack0_high);
@@ -111,5 +79,4 @@ gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* HDMI_CTRL */
        nvkm_mask(device, 0x616798 + hoff, 0x401f007f, ctrl);
-       return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
index 16c63fe..0993d22 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
@@ -22,67 +22,34 @@
  * Authors: Ben Skeggs
  */
 #include "hdmi.h"
-#include "outp.h"
 
-#include <core/client.h>
-
-#include <nvif/cl5070.h>
-#include <nvif/unpack.h>
-
-int
-gt215_hdmi_ctrl(NV50_DISP_MTHD_V1)
+void
+gt215_hdmi_ctrl(struct nvkm_ior *ior, int head, bool enable, u8 max_ac_packet,
+               u8 rekey, u8 *avi, u8 avi_size, u8 *vendor, u8 vendor_size)
 {
-       struct nvkm_device *device = disp->base.engine.subdev.device;
-       const u32 soff = outp->or * 0x800;
-       union {
-               struct nv50_disp_sor_hdmi_pwr_v0 v0;
-       } *args = data;
+       struct nvkm_device *device = ior->disp->engine.subdev.device;
+       const u32 ctrl = 0x40000000 * enable |
+                        0x1f000000 /* ??? */ |
+                        max_ac_packet << 16 |
+                        rekey;
+       const u32 soff = nv50_ior_base(ior);
        struct packed_hdmi_infoframe avi_infoframe;
        struct packed_hdmi_infoframe vendor_infoframe;
-       u32 ctrl;
-       int ret = -ENOSYS;
-
-       nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
-               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;
-               ctrl |= args->v0.max_ac_packet << 16;
-               ctrl |= args->v0.rekey;
-               ctrl |= 0x1f000000; /* ??? */
-       } else
-               return ret;
-
-       if ((args->v0.avi_infoframe_length
-            + args->v0.vendor_infoframe_length) > size)
-               return -ENOSYS;
-       else if ((args->v0.avi_infoframe_length
-                   + args->v0.vendor_infoframe_length) < size)
-               return -E2BIG;
-
-       pack_hdmi_infoframe(&avi_infoframe,
-                           data,
-                           args->v0.avi_infoframe_length);
 
-       pack_hdmi_infoframe(&vendor_infoframe,
-                           data + args->v0.avi_infoframe_length,
-                           args->v0.vendor_infoframe_length);
+       pack_hdmi_infoframe(&avi_infoframe, avi, avi_size);
+       pack_hdmi_infoframe(&vendor_infoframe, vendor, vendor_size);
 
        if (!(ctrl & 0x40000000)) {
                nvkm_mask(device, 0x61c5a4 + soff, 0x40000000, 0x00000000);
                nvkm_mask(device, 0x61c53c + soff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x61c520 + soff, 0x00000001, 0x00000000);
                nvkm_mask(device, 0x61c500 + soff, 0x00000001, 0x00000000);
-               return 0;
+               return;
        }
 
        /* AVI InfoFrame */
        nvkm_mask(device, 0x61c520 + soff, 0x00000001, 0x00000000);
-       if (args->v0.avi_infoframe_length) {
+       if (avi_size) {
                nvkm_wr32(device, 0x61c528 + soff, avi_infoframe.header);
                nvkm_wr32(device, 0x61c52c + soff, avi_infoframe.subpack0_low);
                nvkm_wr32(device, 0x61c530 + soff, avi_infoframe.subpack0_high);
@@ -100,7 +67,7 @@ gt215_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* Vendor InfoFrame */
        nvkm_mask(device, 0x61c53c + soff, 0x00010001, 0x00010000);
-       if (args->v0.vendor_infoframe_length) {
+       if (vendor_size) {
                nvkm_wr32(device, 0x61c544 + soff, vendor_infoframe.header);
                nvkm_wr32(device, 0x61c548 + soff, vendor_infoframe.subpack0_low);
                nvkm_wr32(device, 0x61c54c + soff, vendor_infoframe.subpack0_high);
@@ -121,5 +88,4 @@ gt215_hdmi_ctrl(NV50_DISP_MTHD_V1)
 
        /* HDMI_CTRL */
        nvkm_mask(device, 0x61c5a4 + soff, 0x5f1f007f, ctrl);
-       return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
index ea80e7f..0b5115d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
@@ -43,6 +43,12 @@ struct nvkm_ior_func {
        void (*power)(struct nvkm_ior *, bool normal, bool pu,
                      bool data, bool vsync, bool hsync);
        int (*sense)(struct nvkm_ior *, u32 loadval);
+
+       struct {
+               void (*ctrl)(struct nvkm_ior *, int head, bool enable,
+                            u8 max_ac_packet, u8 rekey, u8 *avi, u8 avi_size,
+                            u8 *vendor, u8 vendor_size);
+       } hdmi;
 };
 
 int nvkm_ior_new_(const struct nvkm_ior_func *func, struct nvkm_disp *,
@@ -65,6 +71,11 @@ void nv50_sor_power(struct nvkm_ior *, bool, bool, bool, bool, bool);
 void g94_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);
 void gf119_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);
 
+void g84_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
+void gt215_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
+void gf119_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
+void gk104_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
+
 #define IOR_MSG(i,l,f,a...) do {                                               \
        struct nvkm_ior *_ior = (i);                                           \
        nvkm_##l(&_ior->disp->engine.subdev, "%s: "f, _ior->name, ##a);        \

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
index d707d8f..4f4e4e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
@@ -38,9 +38,7 @@ mcp77_disp = {
        .outp.external.tmds = nv50_pior_output_new,
        .outp.external.dp = nv50_pior_dp_new,
        .dac = { .nr = 3, .new = nv50_dac_new },
-       .sor.nr = 4,
-       .sor.new = mcp77_sor_new,
-       .sor.hdmi = g84_hdmi_ctrl,
+       .sor = { .nr = 4, .new = mcp77_sor_new },
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
index 24f4670..11ec296 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
@@ -41,7 +41,6 @@ mcp89_disp = {
        .sor.nr = 4,
        .sor.new = mcp89_sor_new,
        .sor.hda_eld = gt215_hda_eld,
-       .sor.hdmi = gt215_hdmi_ctrl,
        .pior = { .nr = 3, .new = nv50_pior_new },
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index 263c3a7..aa7b073 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -34,11 +34,6 @@ void nv50_disp_super_1(struct nv50_disp *);
 int gt215_hda_eld(NV50_DISP_MTHD_V1);
 int gf119_hda_eld(NV50_DISP_MTHD_V1);
 
-int g84_hdmi_ctrl(NV50_DISP_MTHD_V1);
-int gt215_hdmi_ctrl(NV50_DISP_MTHD_V1);
-int gf119_hdmi_ctrl(NV50_DISP_MTHD_V1);
-int gk104_hdmi_ctrl(NV50_DISP_MTHD_V1);
-
 int nv50_disp_new_(const struct nv50_disp_func *, struct nvkm_device *,
                   int index, int heads, struct nvkm_disp **);
 int gf119_disp_new_(const struct nv50_disp_func *, struct nvkm_device *,
@@ -84,7 +79,6 @@ struct nv50_disp_func {
                int nr;
                int (*new)(struct nvkm_disp *, int id);
                int (*hda_eld)(NV50_DISP_MTHD_V1);
-               int (*hdmi)(NV50_DISP_MTHD_V1);
                void (*magic)(struct nvkm_output *);
        } sor;
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
index 7ebea3e..a81928d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
@@ -116,10 +116,46 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
                if (!func->sor.hda_eld)
                        return -ENODEV;
                return func->sor.hda_eld(object, disp, data, size, hidx, outp);
-       case NV50_DISP_MTHD_V1_SOR_HDMI_PWR:
-               if (!func->sor.hdmi)
+       case NV50_DISP_MTHD_V1_SOR_HDMI_PWR: {
+               union {
+                       struct nv50_disp_sor_hdmi_pwr_v0 v0;
+               } *args = data;
+               u8 *vendor, vendor_size;
+               u8 *avi, avi_size;
+               int ret = -ENOSYS;
+
+               nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
+               if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
+                       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;
+                       if ((args->v0.avi_infoframe_length
+                            + args->v0.vendor_infoframe_length) > size)
+                               return -EINVAL;
+                       else
+                       if ((args->v0.avi_infoframe_length
+                            + args->v0.vendor_infoframe_length) < size)
+                               return -E2BIG;
+                       avi = data;
+                       avi_size = args->v0.avi_infoframe_length;
+                       vendor = avi + avi_size;
+                       vendor_size = args->v0.vendor_infoframe_length;
+               } else
+                       return ret;
+
+               if (!outp->ior->func->hdmi.ctrl)
                        return -ENODEV;
-               return func->sor.hdmi(object, disp, data, size, hidx, outp);
+
+               outp->ior->func->hdmi.ctrl(outp->ior, hidx, args->v0.state,
+                                          args->v0.max_ac_packet,
+                                          args->v0.rekey, avi, avi_size,
+                                          vendor, vendor_size);
+               return 0;
+       }
+               break;
        case NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT: {
                union {
                        struct nv50_disp_sor_lvds_script_v0 v0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c
index bb0f503..8913b5f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c
@@ -25,6 +25,9 @@ static const struct nvkm_ior_func
 g84_sor = {
        .state = nv50_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = g84_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
index dcab72a..c3ce42e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
@@ -157,6 +157,9 @@ static const struct nvkm_ior_func
 gf119_sor = {
        .state = gf119_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gf119_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
index ac7a594..9f71f94 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
@@ -25,6 +25,9 @@ static const struct nvkm_ior_func
 gk104_sor = {
        .state = gf119_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gk104_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
index 8bca4dc..acffeff 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
@@ -57,6 +57,9 @@ static const struct nvkm_ior_func
 gm107_sor = {
        .state = gf119_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gk104_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
index 0a4b9b9..c8773d0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
@@ -134,6 +134,9 @@ static const struct nvkm_ior_func
 gm200_sor = {
        .state = gf119_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gk104_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
index bec04ad..7036eee 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
@@ -25,6 +25,9 @@ static const struct nvkm_ior_func
 gt215_sor = {
        .state = g94_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gt215_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
index fc14e48..a074a47 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
@@ -25,6 +25,9 @@ static const struct nvkm_ior_func
 mcp77_sor = {
        .state = g94_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = g84_hdmi_ctrl,
+       },
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
index 37c1dac..56cf11f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
@@ -25,6 +25,9 @@ static const struct nvkm_ior_func
 mcp89_sor = {
        .state = g94_sor_state,
        .power = nv50_sor_power,
+       .hdmi = {
+               .ctrl = gt215_hdmi_ctrl,
+       },
 };
 
 int