xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ebebfdb4fadada157d1369f35a8610c0fa72e02
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 29 15:03:43 2012 +0100

    radeon: fix conflict with fix in master.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index f5699a2..61d6419 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1453,7 +1453,7 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
             radeon_bo_set_tiling(info->front_bo, tiling_flags, pitch);
     }
 
-    info->CurrentLayout.displayWidth = pScrn->displayWidth = pitch / cpp;
+    pScrn->displayWidth = pitch / cpp;
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK\n", info->front_bo->size/1024);
     radeon_kms_update_vram_limit(pScrn, screen_size);