lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [46/223] drm/radeon/kms: make sure blit addr masks are 64 bit
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

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

    commit 2126d0a4a205e2d6b763434f892524cd60f74228 upstream.

    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_blit_kms.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    Index: linux/drivers/gpu/drm/radeon/r600_blit_kms.c
    ===================================================================
    --- linux.orig/drivers/gpu/drm/radeon/r600_blit_kms.c
    +++ linux/drivers/gpu/drm/radeon/r600_blit_kms.c
    @@ -623,8 +623,8 @@ void r600_kms_blit_copy(struct radeon_de
    int src_x = src_gpu_addr & 255;
    int dst_x = dst_gpu_addr & 255;
    int h = 1;
    - src_gpu_addr = src_gpu_addr & ~255;
    - dst_gpu_addr = dst_gpu_addr & ~255;
    + src_gpu_addr = src_gpu_addr & ~255ULL;
    + dst_gpu_addr = dst_gpu_addr & ~255ULL;

    if (!src_x && !dst_x) {
    h = (cur_size / max_bytes);
    @@ -717,8 +717,8 @@ void r600_kms_blit_copy(struct radeon_de
    int src_x = (src_gpu_addr & 255);
    int dst_x = (dst_gpu_addr & 255);
    int h = 1;
    - src_gpu_addr = src_gpu_addr & ~255;
    - dst_gpu_addr = dst_gpu_addr & ~255;
    + src_gpu_addr = src_gpu_addr & ~255ULL;
    + dst_gpu_addr = dst_gpu_addr & ~255ULL;

    if (!src_x && !dst_x) {
    h = (cur_size / max_bytes);

    \
     
     \ /
      Last update: 2010-12-13 01:27    [W:4.027 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site