radeon: fix mipmap level 0 and 1 alignment for SI and CIK
PATCH 1/2 radeon: fix mipmap level 0 and 1 alignment for SI and CIK
From: Michel Dänzer <[email protected]>
--- radeon/radeon_surface.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
radeon/radeon_surface.c +13 -14
@@ -1540,6 +1540,7 @@ static int si_surface_init_1d(struct radeon_surface_manager *surf_man, uint64_t offset, unsigned start_level) { uint32_t xalign, yalign, zalign, slice_align; +unsigned alignment =MAX2 (256 , surf_man->hw_info.group_bytes);unsigned i;/* compute alignment */
@@ -1551,11 +1552,11 @@ static int si_surface_init_1d(struct radeon_surface_manager *surf_man, xalign =MAX2 ((bpe ==1 ) ?64 :32 , xalign); } -if (!start_level) { - surf->bo_alignment =MAX2 (256 , surf_man->hw_info.group_bytes); +if (start_level <=1 ) { + surf->bo_alignment =MAX2 (surf->bo_alignment, alignment);if (offset) { - offset =ALIGN (offset, surf->bo_alignment); + offset =ALIGN (offset, alignment); } }
@@ -1566,7 +1567,7 @@ static int si_surface_init_1d(struct radeon_surface_manager *surf_man,/* level0 and first mipmap need to have alignment */ offset = surf->bo_size;if ((i ==0 )) { - offset =ALIGN (offset, surf->bo_alignment); + offset =ALIGN (offset, alignment); }if (surf->flags &RADEON_SURF_HAS_TILE_MODE_INDEX ) {if (surf->level == level) {
@@ -1608,6 +1609,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,uint64_t offset, unsigned start_level) { + uint64_t aligned_offset = offset;unsigned tilew, tileh, tileb;unsigned mtilew, mtileh, mtileb;unsigned slice_pt;
@@ -1631,19 +1633,19 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,/* macro tile bytes */ mtileb = (mtilew / tilew) * (mtileh / tileh) * tileb; -if (!start_level) { +if (start_level <=1 ) {unsigned alignment =MAX2 (256 , mtileb); surf->bo_alignment =MAX2 (surf->bo_alignment, alignment); -if (offset) { - offset =ALIGN (offset, alignment); +if (aligned_offset) { + aligned_offset =ALIGN (aligned_offset, alignment); } }/* build mipmap tree */ for (i = start_level; i <= surf->last_level; i++) { level[i].mode =RADEON_SURF_MODE_2D ; -si_surf_minify_2d (surf, level+i, bpe, i, slice_pt, mtilew, mtileh,1 , mtileb, offset); +si_surf_minify_2d (surf, level+i, bpe, i, slice_pt, mtilew, mtileh,1 , mtileb, aligned_offset);if (level[i].mode ==RADEON_SURF_MODE_1D ) {switch (tile_mode) {case SI_TILE_MODE_COLOR_2D_8BPP :
@@ -1657,10 +1659,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man, tile_mode =SI_TILE_MODE_COLOR_1D_SCANOUT ;break ;case SI_TILE_MODE_DEPTH_STENCIL_2D : -if (surf_man->family >=CHIP_BONAIRE ) - tile_mode =CIK_TILE_MODE_DEPTH_STENCIL_1D ; -else - tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; + tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ;break ;default :return -EINVAL ;
@@ -1668,9 +1667,9 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,return si_surface_init_1d (surf_man, surf, level, bpe, tile_mode, offset, i); }/* level0 and first mipmap need to have alignment */ - offset = surf->bo_size; + aligned_offset = surf->bo_size;if ((i ==0 )) { - offset =ALIGN (offset, surf->bo_alignment); + aligned_offset =ALIGN (aligned_offset, surf->bo_alignment); }if (surf->flags &RADEON_SURF_HAS_TILE_MODE_INDEX ) {if (surf->level == level) {
Signature · 6 lines
1.8.3.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 radeon: implement 2D tiling for CIK
From: Michel Dänzer <[email protected]>
Bug fixes and simplification by Marek.
We have to use the tile index of 0 for non-MSAA depth-stencil after all.
--- include/drm/radeon_drm.h | 11 + radeon/radeon_surface.c | 620 ++++++++++++++++++++++++++++++++++++++++++++++- radeon/radeon_surface.h | 1 + 3 files changed, 623 insertions(+), 9 deletions(-)
include/drm/radeon_drm.h +11 -0
@@ -979,6 +979,10 @@ struct drm_radeon_cs {#define RADEON_INFO_RING_WORKING 0x15/* SI tile mode array */ #define RADEON_INFO_SI_TILE_MODE_ARRAY 0x16 +/* query if CP DMA is supported on the compute ring */ +#define RADEON_INFO_SI_CP_DMA_COMPUTE 0x17 +/* CIK macrotile mode array */ +#define RADEON_INFO_CIK_MACROTILE_MODE_ARRAY 0x18struct drm_radeon_info {uint32_t request;
@@ -1004,6 +1008,13 @@ struct drm_radeon_info {#define SI_TILE_MODE_DEPTH_STENCIL_2D_4AA 3#define SI_TILE_MODE_DEPTH_STENCIL_2D_8AA 2 +#define CIK_TILE_MODE_COLOR_2D 14 +#define CIK_TILE_MODE_COLOR_2D_SCANOUT 10 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_64 0 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_128 1 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_256 2 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_512 3 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_ROW_SIZE 4#define CIK_TILE_MODE_DEPTH_STENCIL_1D 5#endif
radeon/radeon_surface.c +611 -9
657 lines not on this page · raw message
radeon/radeon_surface.h +1 -0
@@ -54,6 +54,7 @@#define RADEON_SURF_SCANOUT (1 << 16)#define RADEON_SURF_ZBUFFER (1 << 17)#define RADEON_SURF_SBUFFER (1 << 18) +#define RADEON_SURF_Z_OR_SBUFFER (RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER)#define RADEON_SURF_HAS_SBUFFER_MIPTREE (1 << 19)#define RADEON_SURF_HAS_TILE_MODE_INDEX (1 << 20)#define RADEON_SURF_FMASK (1 << 21)
Signature · 6 lines
1.8.3.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] radeon: implement 2D tiling for CIK
Quoted 91 lines · Marek Olšák
From: Michel Dänzer <[email protected]>
Bug fixes and simplification by Marek.
We have to use the tile index of 0 for non-MSAA depth-stencil after all.Signed-off-by Marek Olšák <[email protected]>--- include/drm/radeon_drm.h | 11 + radeon/radeon_surface.c | 620 ++++++++++++++++++++++++++++++++++++++++++++++- radeon/radeon_surface.h | 1 + 3 files changed, 623 insertions(+), 9 deletions(-)include/drm/radeon_drm.h +11
-0@@ -979,6 +979,10 @@ struct drm_radeon_cs {#define RADEON_INFO_RING_WORKING 0x15/* SI tile mode array */ #define RADEON_INFO_SI_TILE_MODE_ARRAY 0x16 +/* query if CP DMA is supported on the compute ring */ +#define RADEON_INFO_SI_CP_DMA_COMPUTE 0x17 +/* CIK macrotile mode array */ +#define RADEON_INFO_CIK_MACROTILE_MODE_ARRAY 0x18struct drm_radeon_info {uint32_t request;@@ -1004,6 +1008,13 @@ struct drm_radeon_info {#define SI_TILE_MODE_DEPTH_STENCIL_2D_4AA 3#define SI_TILE_MODE_DEPTH_STENCIL_2D_8AA 2 +#define CIK_TILE_MODE_COLOR_2D 14 +#define CIK_TILE_MODE_COLOR_2D_SCANOUT 10 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_64 0 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_128 1 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_256 2 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_512 3 +#define CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_ROW_SIZE 4#define CIK_TILE_MODE_DEPTH_STENCIL_1D 5#endif radeon/radeon_surface.c +11
-8@@ -26,6 +26,8 @@* Authors: * Jérôme Glisse <[email protected]> */ +#include <stdbool.h> +#include <assert.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -95,6 +97,8 @@ struct radeon_hw_info {unsigned allow_2d;/* apply to si */ uint32_t tile_mode_array[32 ]; +/* apply to cik */ +uint32_t macrotile_mode_array[16 ]; };struct radeon_surface_manager {@@ -1382,16 +1386,10 @@ static int si_surface_sanity(struct radeon_surface_manager *surf_man,break ;case RADEON_SURF_MODE_1D :if (surf->flags &RADEON_SURF_SBUFFER ) { -if (surf_man->family >=CHIP_BONAIRE ) - *stencil_tile_mode =CIK_TILE_MODE_DEPTH_STENCIL_1D ; -else - *stencil_tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; + *stencil_tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; }if (surf->flags &RADEON_SURF_ZBUFFER ) { -if (surf_man->family >=CHIP_BONAIRE ) - *tile_mode =CIK_TILE_MODE_DEPTH_STENCIL_1D ; -else - *tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; + *tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; }else if (surf->flags &RADEON_SURF_SCANOUT ) { *tile_mode =SI_TILE_MODE_COLOR_1D_SCANOUT ; }else {@@ -1788,6 +1786,604 @@ static int si_surface_best(struct radeon_surface_manager *surf_man,/* =========================================================================== +* Sea Islands family +*/ +#define CIK__GB_TILE_MODE__PIPE_CONFIG (x) (((x) >> 6) & 0x1f) +#define CIK__PIPE_CONFIG__ADDR_SURF_P2 0 +#define CIK__PIPE_CONFIG__ADDR_SURF_P4_8x16 4
radeon/radeon_surface.c static int si_surface_best(struct radeon_surface_manager *surf_man, · line 1803
Quoted 10 lines
radeon/radeon_surface.c +10
-0+#define CIK__PIPE_CONFIG__ADDR_SURF_P4_16x16 5 +#define CIK__PIPE_CONFIG__ADDR_SURF_P4_16x32 6 +#define CIK__PIPE_CONFIG__ADDR_SURF_P4_32x32 7 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_16x16_8x16 8 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_16x32_8x16 9 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_32x32_8x16 10 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_16x32_16x16 11 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_32x32_16x16 12 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_32x32_16x32 13 +#define CIK__PIPE_CONFIG__ADDR_SURF_P8_32x64_32x32 14
Hawaii adds 2 P16 pipe formats:
#define ADDR_SURF_P16_32X32_8X16 0x10 #define ADDR_SURF_P16_32X32_16X16 0x11
Might be worth handling them in this patch or a follow up patch so we don't forget. Other than that both patches are:
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 3 lines · Marek Olšák
From: Michel Dänzer <[email protected]>
Signed-off-by Marek Olšák <[email protected]>
[...]
radeon/radeon_surface.c static int si_surface_init_2d(struct radeon_surface_manager *surf_man, · line 1665
Quoted 12 lines
radeon/radeon_surface.c +1
-4@@ -1657,10 +1659,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man, tile_mode =SI_TILE_MODE_COLOR_1D_SCANOUT ;break ;case SI_TILE_MODE_DEPTH_STENCIL_2D : -if (surf_man->family >=CHIP_BONAIRE ) - tile_mode =CIK_TILE_MODE_DEPTH_STENCIL_1D ; -else - tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; + tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ;break ;default :return -EINVAL ;
This hunk should be in patch 2.
Other than that, the series is
However, patch 2 also depends on the corresponding kernel support, which I just submitted.
Thanks for ironing out the kinks of this, Marek!
Signature · 7 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Sorry, the autorship of the other patch changed when I moved the hunk there and didn't notice it. :(
Marek
Quoted 31 lines · Michel Dänzer
Quoted 3 lines · Marek Olšák
From: Michel Dänzer <[email protected]>
Signed-off-by Marek Olšák <[email protected]>[...]
radeon/radeon_surface.c static int si_surface_init_2d(struct radeon_surface_manager *surf_man, · line 1665
Quoted 12 lines
radeon/radeon_surface.c +1
-4@@ -1657,10 +1659,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man, tile_mode =SI_TILE_MODE_COLOR_1D_SCANOUT ;break ;case SI_TILE_MODE_DEPTH_STENCIL_2D : -if (surf_man->family >=CHIP_BONAIRE ) - tile_mode =CIK_TILE_MODE_DEPTH_STENCIL_1D ; -else - tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ; + tile_mode =SI_TILE_MODE_DEPTH_STENCIL_1D ;break ;default :return -EINVAL ;This hunk should be in patch 2.
Other than that, the series is
Reviewed-and-Tested-by Michel Dänzer <[email protected]>However, patch 2 also depends on the corresponding kernel support, which I just submitted.
Quoted 7 lines
Thanks for ironing out the kinks of this, Marek!
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 2 lines · Marek Olšák
Sorry, the autorship of the other patch changed when I moved the hunk there and didn't notice it. :(
No worries.
Signature · 7 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel