radeon: add si tiling support
PATCH 1/1 radeon: add si tiling support
From: Jerome Glisse <[email protected]>
--- include/drm/radeon_drm.h | 61 +++++ radeon/radeon_surface.c | 663 +++++++++++++++++++++++++++++++++++++++++++---- radeon/radeon_surface.h | 30 +++ 3 files changed, 709 insertions(+), 45 deletions(-)
include/drm/radeon_drm.h +61 -0
@@ -509,6 +509,7 @@ typedef struct {#define DRM_RADEON_GEM_SET_TILING 0x28#define DRM_RADEON_GEM_GET_TILING 0x29#define DRM_RADEON_GEM_BUSY 0x2a +#define DRM_RADEON_GEM_VA 0x2b#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)
@@ -550,6 +551,7 @@ typedef struct {#define DRM_IOCTL_RADEON_SET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_TILING, struct drm_radeon_gem_set_tiling)#define DRM_IOCTL_RADEON_GET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_GET_TILING, struct drm_radeon_gem_get_tiling)#define DRM_IOCTL_RADEON_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy) +#define DRM_IOCTL_RADEON_GEM_VA DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_VA, struct drm_radeon_gem_va) typedef struct drm_radeon_init { enum {
@@ -882,6 +884,27 @@ struct drm_radeon_gem_pwrite {uint64_t data_ptr; }; +#define RADEON_VA_MAP 1 +#define RADEON_VA_UNMAP 2 + +#define RADEON_VA_RESULT_OK 0 +#define RADEON_VA_RESULT_ERROR 1 +#define RADEON_VA_RESULT_VA_EXIST 2 + +#define RADEON_VM_PAGE_VALID (1 << 0) +#define RADEON_VM_PAGE_READABLE (1 << 1) +#define RADEON_VM_PAGE_WRITEABLE (1 << 2) +#define RADEON_VM_PAGE_SYSTEM (1 << 3) +#define RADEON_VM_PAGE_SNOOPED (1 << 4) + +struct drm_radeon_gem_va { +uint32_t handle; +uint32_t operation; +uint32_t vm_id; +uint32_t flags; +uint64_t offset; +}; +#define RADEON_CHUNK_ID_RELOCS 0x01#define RADEON_CHUNK_ID_IB 0x02
@@ -916,6 +939,26 @@ struct drm_radeon_cs {#define RADEON_INFO_ACCEL_WORKING2 0x05#define RADEON_INFO_TILING_CONFIG 0x06#define RADEON_INFO_WANT_HYPERZ 0x07 +#define RADEON_INFO_WANT_CMASK 0x08/* get access to CMASK on r300 */ +#define RADEON_INFO_CLOCK_CRYSTAL_FREQ 0x09/* clock crystal frequency */ +#define RADEON_INFO_NUM_BACKENDS 0x0a/* DB/backends for r600+ - need for OQ */ +#define RADEON_INFO_NUM_TILE_PIPES 0x0b/* tile pipes for r600+ */ +#define RADEON_INFO_FUSION_GART_WORKING 0x0c/* fusion writes to GTT were broken before this */ +#define RADEON_INFO_BACKEND_MAP 0x0d/* pipe to backend map, needed by mesa */ +/* virtual address start, va < start are reserved by the kernel */ +#define RADEON_INFO_VA_START 0x0e +/* maximum size of ib using the virtual memory cs */ +#define RADEON_INFO_IB_VM_MAX_SIZE 0x0f +/* max pipes - needed for compute shaders */ +#define RADEON_INFO_MAX_PIPES 0x10 +/* timestamp for GL_ARB_timer_query (OpenGL), returns the current GPU clock */ +#define RADEON_INFO_TIMESTAMP 0x11 +/* max shader engines (SE) - needed for geometry shaders, etc. */ +#define RADEON_INFO_MAX_SE 0x12 +/* max SH per SE */ +#define RADEON_INFO_MAX_SH_PER_SE 0x13 +/* SI tile mode array */ +#define RADEON_INFO_SI_TILE_MODE_ARRAY 0x14struct drm_radeon_info {uint32_t request;
@@ -923,4 +966,22 @@ struct drm_radeon_info { uint64_t value; }; +/* Those correspond to the tile index to use, this is to explicitly state +* the API that is implicitly defined by the tile mode array. +*/ +#define SI_TILE_MODE_COLOR_LINEAR_ALIGNED 8 +#define SI_TILE_MODE_COLOR_1D 13 +#define SI_TILE_MODE_COLOR_1D_SCANOUT 9 +#define SI_TILE_MODE_COLOR_2D_8BPP 14 +#define SI_TILE_MODE_COLOR_2D_16BPP 15 +#define SI_TILE_MODE_COLOR_2D_32BPP 16 +#define SI_TILE_MODE_COLOR_2D_64BPP 17 +#define SI_TILE_MODE_COLOR_2D_SCANOUT_16BPP 11 +#define SI_TILE_MODE_COLOR_2D_SCANOUT_32BPP 12 +#define SI_TILE_MODE_DEPTH_STENCIL_1D 4 +#define SI_TILE_MODE_DEPTH_STENCIL_2D 0 +#define SI_TILE_MODE_DEPTH_STENCIL_2D_2AA 3 +#define SI_TILE_MODE_DEPTH_STENCIL_2D_4AA 3 +#define SI_TILE_MODE_DEPTH_STENCIL_2D_8AA 2 +#endif
radeon/radeon_surface.c +618 -45
770 lines not on this page · raw message
radeon/radeon_surface.h +30 -0
@@ -76,6 +76,34 @@ struct radeon_surface_level {uint32_t mode; }; +enum si_tiling_mode { +SI_TILING_AUTO =0 , + +SI_TILING_COLOR_1D , +SI_TILING_COLOR_1D_SCANOUT , +SI_TILING_COLOR_2D_8BPP , +SI_TILING_COLOR_2D_16BPP , +SI_TILING_COLOR_2D_32BPP , +SI_TILING_COLOR_2D_64BPP , +SI_TILING_COLOR_2D_SCANOUT_16BPP , +SI_TILING_COLOR_2D_SCANOUT_32BPP , +SI_TILING_COLOR_LINEAR , + +SI_TILING_STENCIL_1D , +SI_TILING_STENCIL_2D , +SI_TILING_STENCIL_2D_2AA , +SI_TILING_STENCIL_2D_4AA , +SI_TILING_STENCIL_2D_8AA , + +SI_TILING_DEPTH_1D , +SI_TILING_DEPTH_2D , +SI_TILING_DEPTH_2D_2AA , +SI_TILING_DEPTH_2D_4AA , +SI_TILING_DEPTH_2D_8AA , + +SI_TILING_LAST_MODE , +}; +struct radeon_surface {uint32_t npix_x;uint32_t npix_y;
@@ -104,6 +132,8 @@ struct radeon_surface {uint64_t stencil_offset;struct radeon_surface_level level[RADEON_SURF_MAX_LEVEL ];struct radeon_surface_level stencil_level[RADEON_SURF_MAX_LEVEL ]; +uint32_t tiling_index[RADEON_SURF_MAX_LEVEL ]; +uint32_t stencil_tiling_index[RADEON_SURF_MAX_LEVEL ]; };struct radeon_surface_manager *radeon_surface_manager_new (int fd);
Signature · 1 line
1.8.1.4
Quoted 14 lines · On Mit, 2013-04-03 at 17:22 -0400, [email protected] wrote:
From: Jerome Glisse <[email protected]>
Signed-off-by Jerome Glisse <[email protected]>--- include/drm/radeon_drm.h | 61 +++++ radeon/radeon_surface.c | 663 +++++++++++++++++++++++++++++++++++++++++++---- radeon/radeon_surface.h | 30 +++ 3 files changed, 709 insertions(+), 45 deletions(-)include/drm/radeon_drm.h +0
-0
include/drm/radeon_drm.h typedef struct { · line 515
Quoted 7 lines
include/drm/radeon_drm.h +1
-0@@ -509,6 +509,7 @@ typedef struct {#define DRM_RADEON_GEM_SET_TILING 0x28#define DRM_RADEON_GEM_GET_TILING 0x29#define DRM_RADEON_GEM_BUSY 0x2a +#define DRM_RADEON_GEM_VA 0x2b#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)
Changes which aren't related to SI tiling should go in separate patches.
Quoted 21 lines
radeon/radeon_surface.c +12
-0@@ -1198,6 +1742,33 @@ static int si_surface_init(struct radeon_surface_manager *surf_man,return r; } +/* +* depending on surface +*/ +static int si_surface_best (struct radeon_surface_manager *surf_man, +struct radeon_surface *surf) +{ +unsigned mode, tile_mode, stencil_tile_mode; + +/* tiling mode */ + mode = (surf->flags >>RADEON_SURF_MODE_SHIFT ) &RADEON_SURF_MODE_MASK ; + +if (surf->flags &RADEON_SURF_SBUFFER ) {
radeon/radeon_surface.c static int si_surface_init(struct radeon_surface_manager *surf_man, · line 1766
Quoted 10 lines
radeon/radeon_surface.c +10
-0+/* stencil force 2d tiling */ + surf->flags =RADEON_SURF_CLR (surf->flags,MODE ); + surf->flags |=RADEON_SURF_SET (RADEON_SURF_MODE_1D ,MODE ); + } + +if (surf->flags & (RADEON_SURF_ZBUFFER |RADEON_SURF_SBUFFER )) { +/* depth force 2d tiling */ + surf->flags =RADEON_SURF_CLR (surf->flags,MODE ); + surf->flags |=RADEON_SURF_SET (RADEON_SURF_MODE_1D ,MODE ); + }
The comments say 2D, but the code says 1D.
radeon/radeon_surface.c struct radeon_surface { · line 138
Quoted 8 lines
radeon/radeon_surface.c +2
-0@@ -104,6 +132,8 @@ struct radeon_surface {uint64_t stencil_offset;struct radeon_surface_level level[RADEON_SURF_MAX_LEVEL ];struct radeon_surface_level stencil_level[RADEON_SURF_MAX_LEVEL ]; +uint32_t tiling_index[RADEON_SURF_MAX_LEVEL ]; +uint32_t stencil_tiling_index[RADEON_SURF_MAX_LEVEL ]; };
Either these new fields need to be guarded the same way stencil_level is guarded by RADEON_SURF_SBUFFER, or the libdrm_radeon SONAME needs to be bumped. Otherwise, radeonsi built against libdrm_radeon without this patch will probably crash when running against libdrm_radeon with it.
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel