amdgpu/dc: Fix enum mismatch in calls to program_color_matrix()

The driver passes GRAPHICS_CSC_ADJUST_TYPE_SW of type enum
graphics_csc_adjust_type to program_color_matrix(), however the function
expects a parameter of type enum grph_color_adjust_option. Supposedly
the intention was to pass GRPH_COLOR_MATRIX_SW, which has the same value
as GRAPHICS_CSC_ADJUST_TYPE_SW, so the mismatch didn't cause any trouble.

Pass GRPH_COLOR_MATRIX_SW to program_color_matrix() instead of
GRAPHICS_CSC_ADJUST_TYPE_SW, this also fixes the following warning when
building the kernel with clang:

drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.c:1129:24:
  error: implicit conversion from enumeration type
  'enum graphics_csc_adjust_type' to different enumeration type
  'enum grph_color_adjust_option' [-Werror,-Wenum-conversion]
    xfm_dce, tbl_entry, GRAPHICS_CSC_ADJUST_TYPE_SW);

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
index 2e5524f09ff4e71af2251837cb35d3796a03c050..6357546b49cd07313302c011b47f57cc3f1f4af4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
@@ -1115,7 +1115,7 @@ void dce110_opp_set_csc_adjustment(
                        CSC_COLOR_MODE_GRAPHICS_OUTPUT_CSC;
 
        program_color_matrix(
-                       xfm_dce, tbl_entry, GRAPHICS_CSC_ADJUST_TYPE_SW);
+                       xfm_dce, tbl_entry, GRPH_COLOR_MATRIX_SW);
 
        /*  We did everything ,now program DxOUTPUT_CSC_CONTROL */
        configure_graphics_mode(xfm_dce, config, GRAPHICS_CSC_ADJUST_TYPE_SW,

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
index feb397b5c1a37ac11dc0a36272c29a835aa77a8f..4245e1f818a3d0d84138e3edd33a7c4d4a9d887d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
@@ -727,7 +727,7 @@ void dce110_opp_v_set_csc_adjustment(
                        CSC_COLOR_MODE_GRAPHICS_OUTPUT_CSC;
 
        program_color_matrix_v(
-                       xfm_dce, tbl_entry, GRAPHICS_CSC_ADJUST_TYPE_SW);
+                       xfm_dce, tbl_entry, GRPH_COLOR_MATRIX_SW);
 
        /*  We did everything ,now program DxOUTPUT_CSC_CONTROL */
        configure_graphics_mode_v(xfm_dce, config, GRAPHICS_CSC_ADJUST_TYPE_SW,