amdgpu/dc: Fix enum mismatch in calls to program_color_matrix()
Subsystems (3)
PATCH 1/1 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);
--- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 2 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_transform.c +1 -1
@@ -1126,7 +1126,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,
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c +1 -1
@@ -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,
Signature · 6 lines
2.16.0.rc1.238.g530d649a79-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Matthias Kaehlcke
The driver passes
GRAPHICS_CSC_ADJUST_TYPE_SWof type enumgraphics_csc_adjust_typetoprogram_color_matrix(), however the function expects a parameter of type enumgrph_color_adjust_option. Supposedly the intention was to passGRPH_COLOR_MATRIX_SW, which has the same value asGRAPHICS_CSC_ADJUST_TYPE_SW, so the mismatch didn't cause any trouble.Pass
GRPH_COLOR_MATRIX_SWtoprogram_color_matrix()instead ofGRAPHICS_CSC_ADJUST_TYPE_SW, this also fixes the following warning when building the kernel with clang:
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_transform.c:1129:24:
error: implicit conversion from enumeration type
'enumgraphics_csc_adjust_type' to different enumeration type 'enumgrph_color_adjust_option' [-Werror,-Wenum-conversion]xfm_dce, tbl_entry, GRAPHICS_CSC_ADJUST_TYPE_SW);Signed-off-by Matthias Kaehlcke <[email protected]>
Harry
Quoted 24 lines
--- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 2 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/dc/dce/dce_transform.c +1
-1@@ -1126,7 +1126,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,drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c +0
-0
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c void dce110_opp_v_set_csc_adjustment( · line 733
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c +1
-1@@ -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,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel