xf86-video-ati: Branch 'master' - 3 commits

[Michel Dänzer]

 src/radeon_kms.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit d78860ba53d9bfcf6c28e1cfd2d970709b5e20fa
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 12 11:21:33 2011 +0200

    Only call radeon_dri2_close_screen() if DRI2 was enabled.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e161552..32065fb 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -876,7 +876,8 @@ static Bool RADEONCloseScreen_KMS(int scrnIndex, ScreenPtr pScreen)
     if (info->cursor) xf86DestroyCursorInfoRec(info->cursor);
     info->cursor = NULL;
 
-    radeon_dri2_close_screen(pScreen);
+    if (info->dri2.enabled)
+	radeon_dri2_close_screen(pScreen);
 
     pScrn->vtSema = FALSE;
     xf86ClearPrimInitDone(info->pEnt->index);
commit 11330ca5dc61a70fe4507e63230f9133ca22d891
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 12 11:21:32 2011 +0200

    Remove dead variable remain_size_bytes.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index ccf1152..e161552 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1204,7 +1204,7 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
     int cpp = info->CurrentLayout.pixel_bytes;
     int screen_size;
     int pitch, base_align;
-    int total_size_bytes = 0, remain_size_bytes;
+    int total_size_bytes = 0;
     uint32_t tiling_flags = 0;
 
     if (info->accel_state->exa != NULL) {
@@ -1255,9 +1255,6 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
     /* keep area front front buffer - but don't allocate it yet */
     total_size_bytes += screen_size;
 
-    /* work out from the mm size what the exa / tex sizes need to be */
-    remain_size_bytes = info->vram_size - total_size_bytes;
-
     info->dri->textureSize = 0;
 
     if (info->front_bo == NULL) {
commit fcf0cca9c0ab0f692b222f619aee8f1cdad3b519
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Sep 20 12:34:05 2011 +0200

    KMS Color Tiling requires xserver which supports EXA_MIXED_PIXMAPS.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e163e99..ccf1152 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -480,6 +480,8 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
     return TRUE;
 }
 
+#ifdef EXA_MIXED_PIXMAPS
+
 static Bool r600_get_tile_config(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info   = RADEONPTR(pScrn);
@@ -591,13 +593,14 @@ static Bool r600_get_tile_config(ScrnInfoPtr pScrn)
     return TRUE;
 }
 
+#endif /* EXA_MIXED_PIXMAPS */
+
 Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 {
     RADEONInfoPtr     info;
     RADEONEntPtr pRADEONEnt;
     DevUnion* pPriv;
     Gamma  zeros = { 0.0, 0.0, 0.0 };
-    Bool colorTilingDefault;
     uint32_t tiling = 0;
     int cpp;
 
@@ -671,9 +674,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
     if (!RADEONPreInitAccel_KMS(pScrn))              goto fail;
 
+#ifdef EXA_MIXED_PIXMAPS
     /* don't enable tiling if accel is not enabled */
     if (!info->r600_shadow_fb) {
-	colorTilingDefault = info->ChipFamily >= CHIP_FAMILY_R300 &&
+	Bool colorTilingDefault = info->ChipFamily >= CHIP_FAMILY_R300 &&
 	    info->ChipFamily <= CHIP_FAMILY_CAYMAN;
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
@@ -697,6 +701,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 							  OPTION_COLOR_TILING, colorTilingDefault);
     } else
+#else
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	       "KMS Color Tiling requires xserver which supports EXA_MIXED_PIXMAPS\n");
+#endif
 	info->allowColorTiling = FALSE;
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,