From: Aurabindo Pillai Date: Tue, 21 Jun 2022 15:23:40 +0000 (-0400) Subject: drm/amd/display: fix incorrect comparison in DML X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eec53143b7fe1ccaace434e03b5959c9117bf9c5;p=linux.git drm/amd/display: fix incorrect comparison in DML [Why&How] GCC 12 catches the following incorrect comparison in the if arm drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dml/dcn32/display_mode_vba_32.c: In function ‘dml32_ModeSupportAndSystemConfigurationFull’: drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dml/dcn32/display_mode_vba_32.c:3740:33: error: the comparison will always evaluate as ‘true’ for the address of ‘USRRetrainingSupport’ will never be NULL [-Werror=address] 3740 | || &mode_lib->vba.USRRetrainingSupport[i][j])) { | ^~ In file included from ./drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dml/display_mode_lib.h:32, from ./drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dc.h:45, from drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dml/dcn32/display_mode_vba_32.c:30: ./drivers/gpu/drm/amd/amdgpu/../dal-dev/dc/dml/display_mode_vba.h:1175:14: note: ‘USRRetrainingSupport’ declared here 1175 | bool USRRetrainingSupport[DC__VOLTAGE_STATES][2]; | Fix this by remove preceding & so that value is compared instead of address Fixes: dda4fb85e433 ("drm/amd/display: DML changes for DCN32/321") Acked-by: Alex Deucher Signed-off-by: Aurabindo Pillai Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c index c920d71fbd560..510b7a81ee124 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c @@ -3725,7 +3725,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l && (!mode_lib->vba.FCLKChangeRequirementFinal || i == v->soc.num_states - 1 || mode_lib->vba.FCLKChangeSupport[i][j] != dm_fclock_change_unsupported) && (!mode_lib->vba.USRRetrainingRequiredFinal - || &mode_lib->vba.USRRetrainingSupport[i][j])) { + || mode_lib->vba.USRRetrainingSupport[i][j])) { mode_lib->vba.ModeSupport[i][j] = true; } else { mode_lib->vba.ModeSupport[i][j] = false;