openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rosen Penev 2017-07-25 17:21:43 -07:00 committed by Ben Skeggs
parent 8190493244
commit df00d5da60
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
View File

@ -18,6 +18,7 @@ enum dcb_connector_type {
DCB_CONNECTOR_HDMI_C = 0x63, DCB_CONNECTOR_HDMI_C = 0x63,
DCB_CONNECTOR_DMS59_DP0 = 0x64, DCB_CONNECTOR_DMS59_DP0 = 0x64,
DCB_CONNECTOR_DMS59_DP1 = 0x65, DCB_CONNECTOR_DMS59_DP1 = 0x65,
DCB_CONNECTOR_WFD = 0x70,
DCB_CONNECTOR_NONE = 0xff DCB_CONNECTOR_NONE = 0xff
}; };

1
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
View File

@ -6,6 +6,7 @@ enum dcb_output_type {
DCB_OUTPUT_TMDS = 0x2, DCB_OUTPUT_TMDS = 0x2,
DCB_OUTPUT_LVDS = 0x3, DCB_OUTPUT_LVDS = 0x3,
DCB_OUTPUT_DP = 0x6, DCB_OUTPUT_DP = 0x6,
DCB_OUTPUT_WFD = 0x8,
DCB_OUTPUT_EOL = 0xe, DCB_OUTPUT_EOL = 0xe,
DCB_OUTPUT_UNUSED = 0xf, DCB_OUTPUT_UNUSED = 0xf,
DCB_OUTPUT_ANY = -1, DCB_OUTPUT_ANY = -1,

1
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@ -1184,6 +1184,7 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
case DCB_CONNECTOR_HDMI_0 : case DCB_CONNECTOR_HDMI_0 :
case DCB_CONNECTOR_HDMI_1 : case DCB_CONNECTOR_HDMI_1 :
case DCB_CONNECTOR_HDMI_C : return DRM_MODE_CONNECTOR_HDMIA; case DCB_CONNECTOR_HDMI_C : return DRM_MODE_CONNECTOR_HDMIA;
case DCB_CONNECTOR_WFD : return DRM_MODE_CONNECTOR_VIRTUAL;
default: default:
break; break;
} }

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
View File

@ -285,6 +285,10 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
case DCB_OUTPUT_DP: case DCB_OUTPUT_DP:
ret = nvkm_dp_new(disp, i, &dcbE, &outp); ret = nvkm_dp_new(disp, i, &dcbE, &outp);
break; break;
case DCB_OUTPUT_WFD:
/* No support for WFD yet. */
ret = -ENODEV;
continue;
default: default:
nvkm_warn(subdev, "dcb %d type %d unknown\n", nvkm_warn(subdev, "dcb %d type %d unknown\n",
i, dcbE.type); i, dcbE.type);