1 files changed, 21 insertions, 23 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 5805ec1aba12..4a03b7f67dd5 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -103,7 +103,6 @@ struct intel_sdvo {
 
         bool has_hdmi_monitor;
         bool has_hdmi_audio;
-        bool rgb_quant_range_selectable;
 
         /* DDC bus used by this SDVO encoder */
         uint8_t ddc_bus;
@@ -981,29 +980,30 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
 }
 
 static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
-                                         const struct intel_crtc_state *pipe_config)
+                                         const struct intel_crtc_state *pipe_config,
+                                         const struct drm_connector_state *conn_state)
 {
+        const struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
         uint8_t sdvo_data[HDMI_INFOFRAME_SIZE(AVI)];
         union hdmi_infoframe frame;
         int ret;
         ssize_t len;
 
         ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
-                                                       &pipe_config->base.adjusted_mode,
-                                                       false);
+                                                       conn_state->connector,
+                                                       adjusted_mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return false;
         }
 
-        if (intel_sdvo->rgb_quant_range_selectable) {
-                if (pipe_config->limited_color_range)
-                        frame.avi.quantization_range =
-                                HDMI_QUANTIZATION_RANGE_LIMITED;
-                else
-                        frame.avi.quantization_range =
-                                HDMI_QUANTIZATION_RANGE_FULL;
-        }
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           conn_state->connector,
+                                           adjusted_mode,
+                                           pipe_config->limited_color_range ?
+                                           HDMI_QUANTIZATION_RANGE_LIMITED :
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         len = hdmi_infoframe_pack(&frame, sdvo_data, sizeof(sdvo_data));
         if (len < 0)
@@ -1108,9 +1108,9 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
         pipe_config->clock_set = true;
 }
 
-static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
-                                      struct intel_crtc_state *pipe_config,
-                                      struct drm_connector_state *conn_state)
+static int intel_sdvo_compute_config(struct intel_encoder *encoder,
+                                     struct intel_crtc_state *pipe_config,
+                                     struct drm_connector_state *conn_state)
 {
         struct intel_sdvo *intel_sdvo = to_sdvo(encoder);
         struct intel_sdvo_connector_state *intel_sdvo_state =
@@ -1135,7 +1135,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
          */
         if (IS_TV(intel_sdvo_connector)) {
                 if (!intel_sdvo_set_output_timings_from_mode(intel_sdvo, mode))
-                        return false;
+                        return -EINVAL;
 
                 (void) intel_sdvo_get_preferred_input_mode(intel_sdvo,
                                                            intel_sdvo_connector,
@@ -1145,7 +1145,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         } else if (IS_LVDS(intel_sdvo_connector)) {
                 if (!intel_sdvo_set_output_timings_from_mode(intel_sdvo,
                                                              intel_sdvo_connector->base.panel.fixed_mode))
-                        return false;
+                        return -EINVAL;
 
                 (void) intel_sdvo_get_preferred_input_mode(intel_sdvo,
                                                            intel_sdvo_connector,
@@ -1154,7 +1154,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         }
 
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return false;
+                return -EINVAL;
 
         /*
          * Make the CRTC code factor in the SDVO pixel multiplier.  The
@@ -1194,7 +1194,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
         if (intel_sdvo_connector->is_hdmi)
                 adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;
 
-        return true;
+        return 0;
 }
 
 #define UPDATE_PROPERTY(input, NAME) \
@@ -1316,7 +1316,8 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
                 intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);
                 intel_sdvo_set_colorimetry(intel_sdvo,
                                            SDVO_COLORIMETRY_RGB256);
-                intel_sdvo_set_avi_infoframe(intel_sdvo, crtc_state);
+                intel_sdvo_set_avi_infoframe(intel_sdvo,
+                                             crtc_state, conn_state);
         } else
                 intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_DVI);
 
@@ -1802,8 +1803,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                         if (intel_sdvo_connector->is_hdmi) {
                                 intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);
                                 intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);
-                                intel_sdvo->rgb_quant_range_selectable =
-                                        drm_rgb_quant_range_selectable(edid);
                         }
                 } else
                         status = connector_status_disconnected;
@@ -1852,7 +1851,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
 
         intel_sdvo->has_hdmi_monitor = false;
         intel_sdvo->has_hdmi_audio = false;
-        intel_sdvo->rgb_quant_range_selectable = false;
 
         if ((intel_sdvo_connector->output_flag & response) == 0)
                 ret = connector_status_disconnected;