mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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>
This commit is contained in:
parent
81875979f0
commit
71d0a89812
2 changed files with 2 additions and 2 deletions
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue