drm/radeon: fix r1xx/r2xx register checker for POT textures
Subsystems (2)
PATCH 1/1 drm/radeon: fix r1xx/r2xx register checker for POT textures
Shift and mask were reversed. Noticed by chance.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/r100.c +2 -2
@@ -1826,8 +1826,8 @@ static int r100_packet0_check(struct radeon_cs_parser *p, track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &RADEON_TXFORMAT_CUBIC_MAP_ENABLE ) track->textures[i].tex_coord_type =2 ;
drivers/gpu/drm/radeon/r200.c +2 -2
@@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_parser *p, track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &R200_TXFORMAT_LOOKUP_DISABLE ) track->textures[i].lookup_disable = true;
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ping?
Alex
Quoted 40 lines · Alex Deucher
Shift and mask were reversed. Noticed by chance.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/radeon/r100.c +2
-2@@ -1826,8 +1826,8 @@ static int r100_packet0_check(struct radeon_cs_parser *p, track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &RADEON_TXFORMAT_CUBIC_MAP_ENABLE ) track->textures[i].tex_coord_type =2 ;drivers/gpu/drm/radeon/r200.c +2
-3@@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_parser *p, track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT ); + track->textures[i].height =1 << ((idx_value &RADEON_TXFORMAT_HEIGHT_MASK ) >>RADEON_TXFORMAT_HEIGHT_SHIFT ); }if (idx_value &R200_TXFORMAT_LOOKUP_DISABLE ) track->textures[i].lookup_disable = true; --
Quoted 2 lines
2.23.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 13 lines · Alex Deucher
Shift and mask were reversed. Noticed by chance.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/radeon/r100.c +0
-0
drivers/gpu/drm/radeon/r100.c static int r100_packet0_check(struct radeon_cs_parser *p, · line 1829
Quoted 6 lines
drivers/gpu/drm/radeon/r100.c +1
-2@@ -1826,8 +1826,8 @@ static int r100_packet0_check(struct radeon_cs_parser *p, track->textures[i].use_pitch =1 ; }else { track->textures[i].use_pitch =0 ; - track->textures[i].width =1 << ((idx_value >>RADEON_TXFORMAT_WIDTH_SHIFT ) &RADEON_TXFORMAT_WIDTH_MASK ); - track->textures[i].height =1 << ((idx_value >>RADEON_TXFORMAT_HEIGHT_SHIFT ) &RADEON_TXFORMAT_HEIGHT_MASK ); + track->textures[i].width =1 << ((idx_value &RADEON_TXFORMAT_WIDTH_MASK ) >>RADEON_TXFORMAT_WIDTH_SHIFT );
Indentation looks off for this line. With that fixed,
Reviewed-by Michel Dänzer <[email protected]>
Signature · 6 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx