drm/i915: rename some HDMI bit definitions

Bits used only on HDMI mode now have HDMI_ prefix instead of SDVO_.
The COLOR_FORMAT bits now have prefixes (and the 12bpc bit is for HDMI
only).

Notice that this patch uncovers a bug on the SDVO code: the
COLOR_RANGE_16_235 bit can only be used if the port is in TMDS mode,
not SDVO mode. This will have to be fixed in a later patch.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index eef073114f7a..63dcb760b004 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1076,9 +1076,11 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
 
         if (intel_sdvo->color_range_auto) {
                 /* See CEA-861-E - 5.1 Default Encoding Parameters */
+                /* FIXME: This bit is only valid when using TMDS encoding and 8
+                 * bit per color mode. */
                 if (intel_sdvo->has_hdmi_monitor &&
                     drm_mode_cea_vic(adjusted_mode) > 1)
-                        intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
+                        intel_sdvo->color_range = HDMI_COLOR_RANGE_16_235;
                 else
                         intel_sdvo->color_range = 0;
         }
@@ -1926,7 +1928,9 @@ intel_sdvo_set_property(struct drm_connector *connector,
                         break;
                 case INTEL_BROADCAST_RGB_LIMITED:
                         intel_sdvo->color_range_auto = false;
-                        intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
+                        /* FIXME: this bit is only valid when using TMDS
+                         * encoding and 8 bit per color mode. */
+                        intel_sdvo->color_range = HDMI_COLOR_RANGE_16_235;
                         break;
                 default:
                         return -EINVAL;