summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-29 15:03:43 +0100
committerDave Airlie <airlied@redhat.com>2012-06-29 15:03:43 +0100
commit5ebebfdb4fadada157d1369f35a8610c0fa72e02 (patch)
tree2ad0596381f6024ef1463d6c8bfc9deef71f4d02
parentff12ddf613ad42e4566d6e10fc6cf33a4e445736 (diff)
radeon: fix conflict with fix in master.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/radeon_kms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index f5699a28..61d6419b 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);