UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/disp: add tv encoders to output resource mapping 

We don't support them on G80, but we need to add them to the mapping to
avoid triggering a WARN_ON() on GPUs where the ports are present.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-07-18 13:30:29 +10:00
parent 13a8651920
commit 587f577e0b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
View File

@ -22,6 +22,7 @@ struct nvkm_ior {
unsigned proto_evo:4; unsigned proto_evo:4;
enum nvkm_ior_proto { enum nvkm_ior_proto {
CRT, CRT,
TV,
TMDS, TMDS,
LVDS, LVDS,
DP, DP,

1
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
View File

@ -62,6 +62,7 @@ nvkm_outp_xlat(struct nvkm_outp *outp, enum nvkm_ior_type *type)
case 0: case 0:
switch (outp->info.type) { switch (outp->info.type) {
case DCB_OUTPUT_ANALOG: *type = DAC; return CRT; case DCB_OUTPUT_ANALOG: *type = DAC; return CRT;
case DCB_OUTPUT_TV : *type = DAC; return TV;
case DCB_OUTPUT_TMDS : *type = SOR; return TMDS; case DCB_OUTPUT_TMDS : *type = SOR; return TMDS;
case DCB_OUTPUT_LVDS : *type = SOR; return LVDS; case DCB_OUTPUT_LVDS : *type = SOR; return LVDS;
case DCB_OUTPUT_DP : *type = SOR; return DP; case DCB_OUTPUT_DP : *type = SOR; return DP;