drm/nouveau/disp: Silence DCB warnings.

Most of these errors seem to be WFD related. Official documentation
says dcb type 8 is reserved. It's probably used for WFD. Silence
the warning in either case.

Connector type 70 is stated to be a virtual connector for WiFi
display. Since we know this, don't warn that we don't.

Signed-off by: Rosen Penev <rosenp@gmail.com>

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
index e8e77ee24776826e129a03fecab2cda21fbf652d..deb477282dde370d47cd396627e53252eaf1ddcf 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
@@ -18,6 +18,7 @@ enum dcb_connector_type {
        DCB_CONNECTOR_HDMI_C = 0x63,
        DCB_CONNECTOR_DMS59_DP0 = 0x64,
        DCB_CONNECTOR_DMS59_DP1 = 0x65,
+       DCB_CONNECTOR_WFD       = 0x70,
        DCB_CONNECTOR_NONE = 0xff
 };
 

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
index 4892a65ddd48b7d714f79903439f596d9a980a73..903d117603d82602d4865394bb6f6d861d24733b 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
@@ -6,6 +6,7 @@ enum dcb_output_type {
        DCB_OUTPUT_TMDS         = 0x2,
        DCB_OUTPUT_LVDS         = 0x3,
        DCB_OUTPUT_DP           = 0x6,
+       DCB_OUTPUT_WFD          = 0x8,
        DCB_OUTPUT_EOL          = 0xe,
        DCB_OUTPUT_UNUSED       = 0xf,
        DCB_OUTPUT_ANY = -1,

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 5137155bf3c0ab7954865108834525e126124b51..70d8e0d69ad56df38ae504fa8f8779b6fc4af61b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1184,6 +1184,7 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
        case DCB_CONNECTOR_HDMI_0   :
        case DCB_CONNECTOR_HDMI_1   :
        case DCB_CONNECTOR_HDMI_C   : return DRM_MODE_CONNECTOR_HDMIA;
+       case DCB_CONNECTOR_WFD      : return DRM_MODE_CONNECTOR_VIRTUAL;
        default:
                break;
        }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
index 88582af8bd89745b7c78332cf415dd0bc9f24e23..93a75e5b27911a33d1df9bb085bbf173f1b2c154 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
@@ -285,6 +285,10 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
                case DCB_OUTPUT_DP:
                        ret = nvkm_dp_new(disp, i, &dcbE, &outp);
                        break;
+               case DCB_OUTPUT_WFD:
+                       /* No support for WFD yet. */
+                       ret = -ENODEV;
+                       continue;
                default:
                        nvkm_warn(subdev, "dcb %d type %d unknown\n",
                                  i, dcbE.type);