drm/amd/display: Add color depth helper function to BIOS parser

To improve consistency and avoid duplicating the same code.
Also, properly handle all enum values where they weren't
handled correctly before.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
index b692fa37402d9f791154f30c4305f77b80100c80..fdc699b8c7a5621f6fc2cd259a1dd87fb431c1e8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
@@ -226,6 +226,28 @@ static enum bp_result encoder_control_dig2_v1(
        return result;
 }
 
+static uint8_t dc_color_depth_to_atom(enum dc_color_depth color_depth)
+{
+       switch (color_depth) {
+       case COLOR_DEPTH_UNDEFINED:
+               return PANEL_BPC_UNDEFINE;
+       case COLOR_DEPTH_666:
+               return PANEL_6BIT_PER_COLOR;
+       default:
+       case COLOR_DEPTH_888:
+               return PANEL_8BIT_PER_COLOR;
+       case COLOR_DEPTH_101010:
+               return PANEL_10BIT_PER_COLOR;
+       case COLOR_DEPTH_121212:
+               return PANEL_12BIT_PER_COLOR;
+       case COLOR_DEPTH_141414:
+               dm_error("14-bit color not supported by ATOMBIOS\n");
+               return PANEL_BPC_UNDEFINE;
+       case COLOR_DEPTH_161616:
+               return PANEL_16BIT_PER_COLOR;
+       }
+}
+
 static enum bp_result encoder_control_digx_v3(
        struct bios_parser *bp,
        struct bp_encoder_control *cntl)
@@ -248,23 +270,7 @@ static enum bp_result encoder_control_digx_v3(
                                        cntl->signal,
                                        cntl->enable_dp_audio);
        params.ucLaneNum = (uint8_t)(cntl->lanes_number);
-
-       switch (cntl->color_depth) {
-       case COLOR_DEPTH_888:
-               params.ucBitPerColor = PANEL_8BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_101010:
-               params.ucBitPerColor = PANEL_10BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_121212:
-               params.ucBitPerColor = PANEL_12BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_161616:
-               params.ucBitPerColor = PANEL_16BIT_PER_COLOR;
-               break;
-       default:
-               break;
-       }
+       params.ucBitPerColor = dc_color_depth_to_atom(cntl->color_depth);
 
        if (EXEC_BIOS_CMD_TABLE(DIGxEncoderControl, params))
                result = BP_RESULT_OK;
@@ -294,23 +300,7 @@ static enum bp_result encoder_control_digx_v4(
                                        cntl->signal,
                                        cntl->enable_dp_audio));
        params.ucLaneNum = (uint8_t)(cntl->lanes_number);
-
-       switch (cntl->color_depth) {
-       case COLOR_DEPTH_888:
-               params.ucBitPerColor = PANEL_8BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_101010:
-               params.ucBitPerColor = PANEL_10BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_121212:
-               params.ucBitPerColor = PANEL_12BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_161616:
-               params.ucBitPerColor = PANEL_16BIT_PER_COLOR;
-               break;
-       default:
-               break;
-       }
+       params.ucBitPerColor = dc_color_depth_to_atom(cntl->color_depth);
 
        if (EXEC_BIOS_CMD_TABLE(DIGxEncoderControl, params))
                result = BP_RESULT_OK;
@@ -334,23 +324,7 @@ static enum bp_result encoder_control_digx_v5(
                                        cntl->signal,
                                        cntl->enable_dp_audio));
        params.ucLaneNum = (uint8_t)(cntl->lanes_number);
-
-       switch (cntl->color_depth) {
-       case COLOR_DEPTH_888:
-               params.ucBitPerColor = PANEL_8BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_101010:
-               params.ucBitPerColor = PANEL_10BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_121212:
-               params.ucBitPerColor = PANEL_12BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_161616:
-               params.ucBitPerColor = PANEL_16BIT_PER_COLOR;
-               break;
-       default:
-               break;
-       }
+       params.ucBitPerColor = dc_color_depth_to_atom(cntl->color_depth);
 
        if (cntl->signal == SIGNAL_TYPE_HDMI_TYPE_A)
                switch (cntl->color_depth) {
@@ -1797,30 +1771,7 @@ static enum bp_result select_crtc_source_v3(
                &params.ucEncodeMode))
                return BP_RESULT_BADINPUT;
 
-       switch (bp_params->color_depth) {
-       case COLOR_DEPTH_UNDEFINED:
-               params.ucDstBpc = PANEL_BPC_UNDEFINE;
-               break;
-       case COLOR_DEPTH_666:
-               params.ucDstBpc = PANEL_6BIT_PER_COLOR;
-               break;
-       default:
-       case COLOR_DEPTH_888:
-               params.ucDstBpc = PANEL_8BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_101010:
-               params.ucDstBpc = PANEL_10BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_121212:
-               params.ucDstBpc = PANEL_12BIT_PER_COLOR;
-               break;
-       case COLOR_DEPTH_141414:
-               dm_error("14-bit color not supported by SelectCRTC_Source v3\n");
-               break;
-       case COLOR_DEPTH_161616:
-               params.ucDstBpc = PANEL_16BIT_PER_COLOR;
-               break;
-       }
+       params.ucDstBpc = dc_color_depth_to_atom(bp_params->color_depth);
 
        if (EXEC_BIOS_CMD_TABLE(SelectCRTC_Source, params))
                result = BP_RESULT_OK;