[PATCH v6 13/13] drm/amd/display: Refactor avi_info_frame colorimetry determination

[Harry Wentland]

From: Joshua Ashton <jos...@froggi.es>

Replace the messy two if-else chains here that were
on the same value with a switch on the enum.

Signed-off-by: Joshua Ashton <jos...@froggi.es>
Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Reviewed-by: Harry Wentland <harry.wentl...@amd.com>

Cc: Pekka Paalanen <ppaala...@gmail.com>
Cc: Sebastian Wick <sebastian.w...@redhat.com>
Cc: vitaly.pros...@amd.com
Cc: Joshua Ashton <jos...@froggi.es>
Cc: Simon Ser <cont...@emersion.fr>
Cc: Melissa Wen <m...@igalia.com>
Cc: dri-devel@lists.freedesktop.org
Cc: amd-...@lists.freedesktop.org
---
 .../gpu/drm/amd/display/dc/core/dc_resource.c | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c 
b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index c72540d37aef..2f3d9a698486 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -3035,23 +3035,29 @@ static void set_avi_info_frame(
        hdmi_info.bits.S0_S1 = scan_type;
 
        /* C0, C1 : Colorimetry */
-       if (color_space == COLOR_SPACE_YCBCR709 ||
-                       color_space == COLOR_SPACE_YCBCR709_LIMITED)
+       switch (color_space) {
+       case COLOR_SPACE_YCBCR709:
+       case COLOR_SPACE_YCBCR709_LIMITED:
                hdmi_info.bits.C0_C1 = COLORIMETRY_ITU709;
-       else if (color_space == COLOR_SPACE_YCBCR601 ||
-                       color_space == COLOR_SPACE_YCBCR601_LIMITED)
+               break;
+       case COLOR_SPACE_YCBCR601:
+       case COLOR_SPACE_YCBCR601_LIMITED:
                hdmi_info.bits.C0_C1 = COLORIMETRY_ITU601;
-       else {
-               hdmi_info.bits.C0_C1 = COLORIMETRY_NO_DATA;
-       }
-       if (color_space == COLOR_SPACE_2020_RGB_FULLRANGE ||
-                       color_space == COLOR_SPACE_2020_RGB_LIMITEDRANGE ||
-                       color_space == COLOR_SPACE_2020_YCBCR) {
+               break;
+       case COLOR_SPACE_2020_RGB_FULLRANGE:
+       case COLOR_SPACE_2020_RGB_LIMITEDRANGE:
+       case COLOR_SPACE_2020_YCBCR:
                hdmi_info.bits.EC0_EC2 = COLORIMETRYEX_BT2020RGBYCBCR;
                hdmi_info.bits.C0_C1   = COLORIMETRY_EXTENDED;
-       } else if (color_space == COLOR_SPACE_ADOBERGB) {
+               break;
+       case COLOR_SPACE_ADOBERGB:
                hdmi_info.bits.EC0_EC2 = COLORIMETRYEX_ADOBERGB;
                hdmi_info.bits.C0_C1   = COLORIMETRY_EXTENDED;
+               break;
+       case COLOR_SPACE_SRGB:
+       default:
+               hdmi_info.bits.C0_C1 = COLORIMETRY_NO_DATA;
+               break;
        }
 
        if (pixel_encoding && color_space == COLOR_SPACE_2020_YCBCR &&
-- 
2.41.0