Commit 587f577e authored by Ben Skeggs's avatar Ben Skeggs

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: default avatarBen Skeggs <bskeggs@redhat.com>
parent 13a86519
...@@ -22,6 +22,7 @@ struct nvkm_ior { ...@@ -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,
......
...@@ -62,6 +62,7 @@ nvkm_outp_xlat(struct nvkm_outp *outp, enum nvkm_ior_type *type) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment