drm/radeon: Use drm_hdmi_avi_infoframe_quant_range()

Fill out the AVI infoframe quantization range bits using
drm_hdmi_avi_infoframe_quant_range() instead of hand rolling it.

This changes the behaviour slightly as
drm_hdmi_avi_infoframe_quant_range() will set a non-zero Q bit
even when QS==0 iff the Q bit matched the default quantization
range for the given mode. This matches the recommendation in
HDMI 2.0 and is allowed even before that.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108172828.15184-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 5a7d48339b32c7cd09525f99270753a76d87e793..708765bf9e66c7d0db362ff0b6a9ee405113c20d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -523,14 +523,11 @@ static int radeon_audio_set_avi_packet(struct drm_encoder *encoder,
        }
 
        if (radeon_encoder->output_csc != RADEON_OUTPUT_CSC_BYPASS) {
-               if (drm_rgb_quant_range_selectable(radeon_connector_edid(connector))) {
-                       if (radeon_encoder->output_csc == RADEON_OUTPUT_CSC_TVRGB)
-                               frame.quantization_range = HDMI_QUANTIZATION_RANGE_LIMITED;
-                       else
-                               frame.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;
-               } else {
-                       frame.quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT;
-               }
+               drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode,
+                                                  radeon_encoder->output_csc == RADEON_OUTPUT_CSC_TVRGB ?
+                                                  HDMI_QUANTIZATION_RANGE_LIMITED :
+                                                  HDMI_QUANTIZATION_RANGE_FULL,
+                                                  drm_rgb_quant_range_selectable(radeon_connector_edid(connector)));
        }
 
        err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));