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>

2 files changed, 2 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
index a24312fb0228..a1e8bf48b778 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
@@ -22,6 +22,7 @@ struct nvkm_ior {
                 unsigned proto_evo:4;
                 enum nvkm_ior_proto {
                         CRT,
+                        TV,
                         TMDS,
                         LVDS,
                         DP,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
index 85aff85394ac..be9e7f8c3b23 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
@@ -62,6 +62,7 @@ nvkm_outp_xlat(struct nvkm_outp *outp, enum nvkm_ior_type *type)
         case 0:
                 switch (outp->info.type) {
                 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_LVDS  : *type = SOR; return LVDS;
                 case DCB_OUTPUT_DP    : *type = SOR; return   DP;