linux-kernel - Re: [PATCH] amdgpu/dc: Fix enum mismatch in calls to program_color

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <dd39ea9d-5bf7-cca1-f805-f16cb5c2bf94@amd.com>
Date:   Wed, 7 Feb 2018 16:52:55 -0500
From:   Harry Wentland <harry.wentland@....com>
To:     Matthias Kaehlcke <mka@...omium.org>,
        Alex Deucher <alexander.deucher@....com>,
        Christian König <christian.koenig@....com>,
        David Zhou <David1.Zhou@....com>,
        David Airlie <airlied@...ux.ie>,
        Tony Cheng <tony.cheng@....com>,
        Dmytro Laktyushkin <Dmytro.Laktyushkin@....com>,
        Anthony Koo <Anthony.Koo@....com>,
        Yue Hin Lau <Yuehin.Lau@....com>,
        Zeyu Fan <Zeyu.Fan@....com>,
        Charlene Liu <charlene.liu@....com>
Cc:     amd-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org,
        linux-kernel@...r.kernel.org, Guenter Roeck <groeck@...omium.org>,
        Justin TerAvest <teravest@...omium.org>,
        Craig Bergstrom <craigb@...omium.org>
Subject: Re: [PATCH] amdgpu/dc: Fix enum mismatch in calls to
 program_color_matrix()

On 2018-02-07 04:43 PM, Matthias Kaehlcke wrote:
> 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@...omium.org>

Reviewed-by: Harry Wentland <harry.wentland@....com>

Harry

> ---
>  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(-)
> 
> 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 0f662e6ee9bd..ac28113c4d67 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
> @@ -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,
> 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 feb397b5c1a3..4245e1f818a3 100644
> --- 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,
>