lkml.org 
[lkml]   [2019]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 46/47] drm/radeon: fix r1xx/r2xx register checker for POT textures
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    commit 008037d4d972c9c47b273e40e52ae34f9d9e33e7 upstream.

    Shift and mask were reversed. Noticed by chance.

    Tested-by: Meelis Roos <mroos@linux.ee>
    Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/r100.c | 4 ++--
    drivers/gpu/drm/radeon/r200.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/radeon/r100.c
    +++ b/drivers/gpu/drm/radeon/r100.c
    @@ -1820,8 +1820,8 @@ static int r100_packet0_check(struct rad
    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;
    --- a/drivers/gpu/drm/radeon/r200.c
    +++ b/drivers/gpu/drm/radeon/r200.c
    @@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_
    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;

    \
     
     \ /
      Last update: 2019-12-19 20:00    [W:4.953 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site