drm/amd/display: Fix logical vs bitwise bug in get_embedded_panel_info_v2_1()
PATCH 1/1 drm/amd/display: Fix logical vs bitwise bug in get_embedded_panel_info_v2_1()
The .H_SYNC_POLARITY and .V_SYNC_POLARITY variables are 1 bit bitfields of a u32. The ATOM_HSYNC_POLARITY define is 0x2 and the ATOM_VSYNC_POLARITY is 0x4. When we do a bitwise negate of 0, 2, or 4 then the last bit is always 1 so this code always sets .H_SYNC_POLARITY and .V_SYNC_POLARITY to true.
This code is instead intended to check if the ATOM_HSYNC_POLARITY or ATOM_VSYNC_POLARITY flags are set and reverse the result. In other words, it's supposed to be a logical negate instead of a bitwise negate.
---
Please note that I have not tested this. It's straight forward enough to see that logical negate was intended, but it's always good to test things as well.
Harshit and I only recently created this static checker warning.
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +4 -4
@@ -1480,10 +1480,10 @@ static enum bp_result get_embedded_panel_info_v2_1(/* not provided by VBIOS */ info->lcd_timing.misc_info.HORIZONTAL_CUT_OFF =0 ; - info->lcd_timing.misc_info.H_SYNC_POLARITY = ~(uint32_t ) (lvds->lcd_timing.miscinfo - &ATOM_HSYNC_POLARITY ); - info->lcd_timing.misc_info.V_SYNC_POLARITY = ~(uint32_t ) (lvds->lcd_timing.miscinfo - &ATOM_VSYNC_POLARITY ); + info->lcd_timing.misc_info.H_SYNC_POLARITY = !(lvds->lcd_timing.miscinfo & +ATOM_HSYNC_POLARITY ); + info->lcd_timing.misc_info.V_SYNC_POLARITY = !(lvds->lcd_timing.miscinfo & +ATOM_VSYNC_POLARITY );/* not provided by VBIOS */ info->lcd_timing.misc_info.VERTICAL_CUT_OFF =0 ;
Signature · 1 line
2.51.0
This patch passes this week's promotion test.
Quoted 41 lines · Dan Carpenter
The .H_SYNC_POLARITY and .V_SYNC_POLARITY variables are 1 bit bitfields of a u32. The
ATOM_HSYNC_POLARITYdefine is0x2and theATOM_VSYNC_POLARITYis0x4. When we do a bitwise negate of 0, 2, or 4 then the last bit is always 1 so this code always sets .H_SYNC_POLARITY and .V_SYNC_POLARITY to true.This code is instead intended to check if the
ATOM_HSYNC_POLARITYorATOM_VSYNC_POLARITYflags are set and reverse the result. In other words, it's supposed to be a logical negate instead of a bitwise negate.Fixes ae79c310b1a6 ("drm/amd/display: Add DCE12 bios parser support")Signed-off-by Dan Carpenter <[email protected]>---
Please note that I have not tested this. It's straight forward enough to see that logical negate was intended, but it's always good to test things as well.Harshit and I only recently created this static checker warning.
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +4
-4@@ -1480,10 +1480,10 @@ static enum bp_result get_embedded_panel_info_v2_1(/* not provided by VBIOS */ info->lcd_timing.misc_info.HORIZONTAL_CUT_OFF =0 ; - info->lcd_timing.misc_info.H_SYNC_POLARITY = ~(uint32_t ) (lvds->lcd_timing.miscinfo - &ATOM_HSYNC_POLARITY ); - info->lcd_timing.misc_info.V_SYNC_POLARITY = ~(uint32_t ) (lvds->lcd_timing.miscinfo - &ATOM_VSYNC_POLARITY ); + info->lcd_timing.misc_info.H_SYNC_POLARITY = !(lvds->lcd_timing.miscinfo & +ATOM_HSYNC_POLARITY ); + info->lcd_timing.misc_info.V_SYNC_POLARITY = !(lvds->lcd_timing.miscinfo & +ATOM_VSYNC_POLARITY );/* not provided by VBIOS */ info->lcd_timing.misc_info.VERTICAL_CUT_OFF =0 ;