radeon: fix tiling for weird resolution

Should also fix xv for some case.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>

1 files changed, 0 insertions, 29 deletions

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 47218d81..595248ad 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -195,9 +195,6 @@ R600PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
 	dst.bo = radeon_get_pixmap_bo(pPix);
 	dst.tiling_flags = radeon_get_pixmap_tiling(pPix);
 	dst.surface = radeon_get_pixmap_surface(pPix);
-	if (dst.surface->npix_x != pPix->drawable.width) {
-		dst.surface = NULL;
-	}
     } else
 #endif
     {
@@ -597,14 +594,6 @@ R600PrepareCopy(PixmapPtr pSrc,   PixmapPtr pDst,
 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
 	src_obj.surface = radeon_get_pixmap_surface(pSrc);
 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
-	if (dst_obj.surface->npix_x != pDst->drawable.width) {
-		dst_obj.surface = NULL;
-		dst_obj.tiling_flags = 0;
-	}
-	if (src_obj.surface->npix_x != pSrc->drawable.width) {
-		src_obj.surface = NULL;
-		src_obj.tiling_flags = 0;
-	}
 	if (radeon_get_pixmap_bo(pSrc) == radeon_get_pixmap_bo(pDst))
 	    accel_state->same_surface = TRUE;
     } else
@@ -1314,14 +1303,6 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
 	src_obj.surface = radeon_get_pixmap_surface(pSrc);
-	if (dst_obj.surface->npix_x != pDst->drawable.width) {
-		dst_obj.surface = NULL;
-		dst_obj.tiling_flags = 0;
-	}
-	if (src_obj.surface->npix_x != pSrc->drawable.width) {
-		src_obj.surface = NULL;
-		src_obj.tiling_flags = 0;
-	}
     } else
 #endif
     {
@@ -1350,9 +1331,6 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
 	    mask_obj.bo = radeon_get_pixmap_bo(pMask);
 	    mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
 	    mask_obj.surface = radeon_get_pixmap_surface(pMask);
-	    if (mask_obj.surface->npix_x != pMask->drawable.width) {
-		mask_obj.surface = NULL;
-	    }
 	} else
 #endif
 	{
@@ -1912,10 +1890,6 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
     dst_obj.bo = radeon_get_pixmap_bo(pDst);
     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
     dst_obj.surface = radeon_get_pixmap_surface(pDst);
-    if (dst_obj.surface->npix_x != pDst->drawable.width) {
-	dst_obj.surface = NULL;
-	dst_obj.tiling_flags = 0;
-    }
 
     if (!R600SetAccelState(pScrn,
 			   &src_obj,
@@ -2043,9 +2017,6 @@ R600DownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
     src_obj.bo = radeon_get_pixmap_bo(pSrc);
     src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
     src_obj.surface = radeon_get_pixmap_surface(pSrc);
-    if (src_obj.surface->npix_x != pSrc->drawable.width) {
-	src_obj.surface = NULL;
-    }
 
     dst_obj.pitch = scratch_pitch;
     dst_obj.width = w;