From 987b3fa459d9522c87df8a21bfcdd7ee6e1ac691 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Tue, 27 Mar 2012 15:44:48 -0400 Subject: [PATCH] r6xx/r7xx/r8xx: fallback to linear aligned when tiling is not enabled Signed-off-by: Jerome Glisse --- src/evergreen_accel.c | 4 ++-- src/r6xx_accel.c | 4 ++-- src/radeon_exa.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/evergreen_accel.c b/src/evergreen_accel.c index 581aaf6..2e06a7b 100644 --- a/src/evergreen_accel.c +++ b/src/evergreen_accel.c @@ -219,7 +219,7 @@ evergreen_set_render_target(ScrnInfoPtr pScrn, cb_config_t *cb_conf, uint32_t do array_mode = 4; break; default: - array_mode = 0; + array_mode = 1; break; } w = cb_conf->surface->level[0].npix_x; @@ -708,7 +708,7 @@ evergreen_set_tex_resource(ScrnInfoPtr pScrn, tex_resource_t *tex_res, uint32_t array_mode = 4; break; default: - array_mode = 0; + array_mode = 1; break; } pitch = tex_res->surface->level[0].nblk_x >> 3; diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c index 8d25424..5151bb1 100644 --- a/src/r6xx_accel.c +++ b/src/r6xx_accel.c @@ -237,7 +237,7 @@ r600_set_render_target(ScrnInfoPtr pScrn, drmBufPtr ib, cb_config_t *cb_conf, ui array_mode = 4; break; default: - array_mode = 0; + array_mode = 1; break; } pitch = (cb_conf->surface->level[0].nblk_x >> 3) - 1; @@ -635,7 +635,7 @@ r600_set_tex_resource(ScrnInfoPtr pScrn, drmBufPtr ib, tex_resource_t *tex_res, array_mode = 4; break; default: - array_mode = 0; + array_mode = 1; break; } pitch = tex_res->surface->level[0].nblk_x >> 3; diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 99a5806..6f0e9f4 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -513,7 +513,7 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, surface.nsamples = 1; surface.flags = RADEON_SURF_SCANOUT; surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE); - surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE); + surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR_ALIGNED, MODE); if ((tiling & RADEON_TILING_MICRO)) { surface.flags = RADEON_SURF_CLR(surface.flags, MODE); surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE); -- 1.7.7.1