lkml.org 
[lkml]   [2011]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [9/139] drm/radeon/kms: fix vram base calculation on rs780/rs880
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Alex Deucher <alexdeucher@gmail.com>

    commit 8961d52d4cc52edf5672f8f2712c57162b736793 upstream.

    Avoid overflowing a 32 bit value.

    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/gpu/drm/radeon/r600.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    Index: linux-2.6.35.y/drivers/gpu/drm/radeon/r600.c
    ===================================================================
    --- linux-2.6.35.y.orig/drivers/gpu/drm/radeon/r600.c
    +++ linux-2.6.35.y/drivers/gpu/drm/radeon/r600.c
    @@ -1189,8 +1189,10 @@ void r600_vram_gtt_location(struct radeo
    mc->vram_end, mc->real_vram_size >> 20);
    } else {
    u64 base = 0;
    - if (rdev->flags & RADEON_IS_IGP)
    - base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
    + if (rdev->flags & RADEON_IS_IGP) {
    + base = RREG32(MC_VM_FB_LOCATION) & 0xFFFF;
    + base <<= 24;
    + }
    radeon_vram_location(rdev, &rdev->mc, base);
    rdev->mc.gtt_base_align = 0;
    radeon_gtt_location(rdev, mc);

    \
     
     \ /
      Last update: 2011-02-02 02:13    [W:0.021 / U:64.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site