1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 2f276222e30f..051b61b62541 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -109,7 +109,6 @@ struct vc4_hdmi_encoder {
         struct vc4_encoder base;
         bool hdmi_monitor;
         bool limited_rgb_range;
-        bool rgb_range_selectable;
 };
 
 static inline struct vc4_hdmi_encoder *
@@ -280,11 +279,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
 
         vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid);
 
-        if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
-                vc4_encoder->rgb_range_selectable =
-                        drm_rgb_quant_range_selectable(edid);
-        }
-
         drm_connector_update_edid_property(connector, edid);
         ret = drm_add_edid_modes(connector, edid);
         kfree(edid);
@@ -424,18 +418,18 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
         union hdmi_infoframe frame;
         int ret;
 
-        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+                                                       hdmi->connector, mode);
         if (ret < 0) {
                 DRM_ERROR("couldn't fill AVI infoframe\n");
                 return;
         }
 
-        drm_hdmi_avi_infoframe_quant_range(&frame.avi, mode,
+        drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+                                           hdmi->connector, mode,
                                            vc4_encoder->limited_rgb_range ?
                                            HDMI_QUANTIZATION_RANGE_LIMITED :
-                                           HDMI_QUANTIZATION_RANGE_FULL,
-                                           vc4_encoder->rgb_range_selectable,
-                                           false);
+                                           HDMI_QUANTIZATION_RANGE_FULL);
 
         frame.avi.right_bar = cstate->tv.margins.right;
         frame.avi.left_bar = cstate->tv.margins.left;