Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54bf706 authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/radeon: fix r1xx/r2xx register checker for POT textures 



commit 008037d4d972c9c47b273e40e52ae34f9d9e33e7 upstream.

Shift and mask were reversed.  Noticed by chance.

Tested-by: default avatarMeelis Roos <mroos@linux.ee>
Reviewed-by: default avatarMichel Dänzer <mdaenzer@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7009b5bf

drivers/gpu/drm/radeon/r100.c

+2 −2
Original line number Diff line number Diff line
@@ -1820,8 +1820,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
Original line number Diff line number Diff line
@@ -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;