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, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 0b42ba31d402..4d222ec58b81 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -609,9 +609,9 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
                 hdmi_val |= SDVO_HSYNC_ACTIVE_HIGH;
 
         if (intel_crtc->bpp > 24)
-                hdmi_val |= COLOR_FORMAT_12bpc;
+                hdmi_val |= HDMI_COLOR_FORMAT_12bpc;
         else
-                hdmi_val |= COLOR_FORMAT_8bpc;
+                hdmi_val |= SDVO_COLOR_FORMAT_8bpc;
 
         /* Required on CPT */
         if (intel_hdmi->has_hdmi_sink && HAS_PCH_CPT(dev))
@@ -778,7 +778,7 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,
                 /* See CEA-861-E - 5.1 Default Encoding Parameters */
                 if (intel_hdmi->has_hdmi_sink &&
                     drm_mode_cea_vic(adjusted_mode) > 1)
-                        intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235;
+                        intel_hdmi->color_range = HDMI_COLOR_RANGE_16_235;
                 else
                         intel_hdmi->color_range = 0;
         }
@@ -941,7 +941,7 @@ intel_hdmi_set_property(struct drm_connector *connector,
                         break;
                 case INTEL_BROADCAST_RGB_LIMITED:
                         intel_hdmi->color_range_auto = false;
-                        intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235;
+                        intel_hdmi->color_range = HDMI_COLOR_RANGE_16_235;
                         break;
                 default:
                         return -EINVAL;