radeon: add RADEON_SURF_FMASK flag which disables 2D->1D tiling transition
PATCH 1/1 radeon: add RADEON_SURF_FMASK flag which disables 2D->1D tiling transition
I will release a new version of libdrm after this is committed.
--- radeon/radeon_surface.c | 9 ++++++--- radeon/radeon_surface.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)
radeon/radeon_surface.c +6 -3
@@ -158,7 +158,8 @@ static void surf_minify(struct radeon_surface *surf, surflevel->nblk_x = (surflevel->npix_x + surf->blk_w -1 ) / surf->blk_w; surflevel->nblk_y = (surflevel->npix_y + surf->blk_h -1 ) / surf->blk_h; surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < xalign || surflevel->nblk_y < yalign) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;
@@ -564,7 +565,8 @@ static void eg_surf_minify(struct radeon_surface *surf, surflevel->nblk_x = (surflevel->npix_x + surf->blk_w -1 ) / surf->blk_w; surflevel->nblk_y = (surflevel->npix_y + surf->blk_h -1 ) / surf->blk_h; surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < mtilew || surflevel->nblk_y < mtileh) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;
@@ -1458,7 +1460,8 @@ static void si_surf_minify_2d(struct radeon_surface *surf, surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; } -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < xalign || surflevel->nblk_y < yalign) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;
radeon/radeon_surface.h +1 -0
@@ -56,6 +56,7 @@#define RADEON_SURF_SBUFFER (1 << 18)#define RADEON_SURF_HAS_SBUFFER_MIPTREE (1 << 19)#define RADEON_SURF_HAS_TILE_MODE_INDEX (1 << 20) +#define RADEON_SURF_FMASK (1 << 21)#define RADEON_SURF_GET (v, field) (((v) >> RADEON_SURF_ ## field ## _SHIFT) & RADEON_SURF_ ## field ## _MASK)#define RADEON_SURF_SET (v, field) (((v) & RADEON_SURF_ ## field ## _MASK) << RADEON_SURF_ ## field ## _SHIFT)
Signature · 1 line
1.7.10.4
Quoted 1 line · Marek Olšák
I will release a new version of libdrm after this is committed.
Reviewed-by Alex Deucher <[email protected]>
Quoted 54 lines
--- radeon/radeon_surface.c | 9 ++++++--- radeon/radeon_surface.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)radeon/radeon_surface.c +6
-3@@ -158,7 +158,8 @@ static void surf_minify(struct radeon_surface *surf, surflevel->nblk_x = (surflevel->npix_x + surf->blk_w -1 ) / surf->blk_w; surflevel->nblk_y = (surflevel->npix_y + surf->blk_h -1 ) / surf->blk_h; surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < xalign || surflevel->nblk_y < yalign) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;@@ -564,7 +565,8 @@ static void eg_surf_minify(struct radeon_surface *surf, surflevel->nblk_x = (surflevel->npix_x + surf->blk_w -1 ) / surf->blk_w; surflevel->nblk_y = (surflevel->npix_y + surf->blk_h -1 ) / surf->blk_h; surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < mtilew || surflevel->nblk_y < mtileh) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;@@ -1458,7 +1460,8 @@ static void si_surf_minify_2d(struct radeon_surface *surf, surflevel->nblk_z = (surflevel->npix_z + surf->blk_d -1 ) / surf->blk_d; } -if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D ) { +if (surf->nsamples ==1 && surflevel->mode ==RADEON_SURF_MODE_2D && + !(surf->flags &RADEON_SURF_FMASK )) {if (surflevel->nblk_x < xalign || surflevel->nblk_y < yalign) { surflevel->mode =RADEON_SURF_MODE_1D ;return ;radeon/radeon_surface.h +1
-1@@ -56,6 +56,7 @@#define RADEON_SURF_SBUFFER (1 << 18)#define RADEON_SURF_HAS_SBUFFER_MIPTREE (1 << 19)#define RADEON_SURF_HAS_TILE_MODE_INDEX (1 << 20) +#define RADEON_SURF_FMASK (1 << 21)#define RADEON_SURF_GET (v, field) (((v) >> RADEON_SURF_ ## field ## _SHIFT) & RADEON_SURF_ ## field ## _MASK)#define RADEON_SURF_SET (v, field) (((v) & RADEON_SURF_ ## field ## _MASK) << RADEON_SURF_ ## field ## _SHIFT) --1.7.10.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel