drm/i915: add pipe_config->limited_color_range

Now that we have a useful struct for this, let's use it. Some neat
pointer-chasing required, but it's all there already.

v2: Rebased on top of the added Haswell limited color range support.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index b588e6c547e2..5508687ea2a6 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -333,6 +333,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
                                          struct drm_display_mode *adjusted_mode)
 {
         struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
         struct dip_infoframe avi_if = {
                 .type = DIP_TYPE_AVI,
                 .ver = DIP_VERSION_AVI,
@@ -343,7 +344,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
                 avi_if.body.avi.YQ_CN_PR |= DIP_AVI_PR_2;
 
         if (intel_hdmi->rgb_quant_range_selectable) {
-                if (adjusted_mode->private_flags & INTEL_MODE_LIMITED_COLOR_RANGE)
+                if (intel_crtc->config.limited_color_range)
                         avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_LIMITED;
                 else
                         avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL;
@@ -785,7 +786,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         }
 
         if (intel_hdmi->color_range)
-                adjusted_mode->private_flags |= INTEL_MODE_LIMITED_COLOR_RANGE;
+                pipe_config->limited_color_range = true;
 
         if (HAS_PCH_SPLIT(dev) && !HAS_DDI(dev))
                 pipe_config->has_pch_encoder = true;