drm/radeon/kms/evergreen: set the clear state to the blit state
Subsystems (2)
PATCH 1/1 drm/radeon/kms/evergreen: set the clear state to the blit state
The hw stores a default clear state for registers in the context range that can be initialized when the CP is set up. Set the blit state as the default clear state and use the CLEAR_STATE packet to load the blit state rather than loading it from an IB. This reduces overhead when doing bo moves using the 3D engine.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 38 ++++++++++++--- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 60 +++++++++++------------ drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 19 ++------ drivers/gpu/drm/radeon/evergreend.h | 2 + 4 files changed, 65 insertions(+), 54 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +31 -7
@@ -32,6 +32,7 @@#include "atom.h" #include "avivod.h" #include "evergreen_reg.h" +#include "evergreen_blit_shaders.h" #define EVERGREEN_PFP_UCODE_SIZE 1120#define EVERGREEN_PM4_UCODE_SIZE 1376
@@ -677,7 +678,7 @@ static int evergreen_cp_load_microcode(struct radeon_device *rdev)static int evergreen_cp_start (struct radeon_device *rdev) { -int r; +int r, i;uint32_t cp_me; r =radeon_ring_lock (rdev,7 );
@@ -697,16 +698,39 @@ static int evergreen_cp_start(struct radeon_device *rdev) cp_me =0xff ;WREG32 (CP_ME_CNTL , cp_me); - r =radeon_ring_lock (rdev,4 ); + r =radeon_ring_lock (rdev, evergreen_default_size +15 );if (r) {DRM_ERROR ("radeon: cp failed to lock ring (%d).\n" , r);return r; } -/* init some VGT regs */ -radeon_ring_write (rdev,PACKET3 (PACKET3_SET_CONTEXT_REG ,2 )); -radeon_ring_write (rdev, (VGT_VERTEX_REUSE_BLOCK_CNTL -PACKET3_SET_CONTEXT_REG_START ) >>2 ); -radeon_ring_write (rdev,0xe ); -radeon_ring_write (rdev,0x10 ); + +/* setup clear context state */ +radeon_ring_write (rdev,PACKET3 (PACKET3_PREAMBLE_CNTL ,0 )); +radeon_ring_write (rdev,PACKET3_PREAMBLE_BEGIN_CLEAR_STATE ); + +for (i =0 ; i < evergreen_default_size; i++) +radeon_ring_write (rdev, evergreen_default_state[i]); + +radeon_ring_write (rdev,PACKET3 (PACKET3_PREAMBLE_CNTL ,0 )); +radeon_ring_write (rdev,PACKET3_PREAMBLE_END_CLEAR_STATE ); + +/* set clear context state */ +radeon_ring_write (rdev,PACKET3 (PACKET3_CLEAR_STATE ,0 )); +radeon_ring_write (rdev,0 ); + +/* SQ_VTX_BASE_VTX_LOC */ +radeon_ring_write (rdev,0xc0026f00 ); +radeon_ring_write (rdev,0x00000000 ); +radeon_ring_write (rdev,0x00000000 ); +radeon_ring_write (rdev,0x00000000 ); + +/* Clear consts */ +radeon_ring_write (rdev,0xc0036f00 ); +radeon_ring_write (rdev,0x00000bc4 ); +radeon_ring_write (rdev,0xffffffff ); +radeon_ring_write (rdev,0xffffffff ); +radeon_ring_write (rdev,0xffffffff ); +radeon_ring_unlock_commit (rdev);return 0 ;
drivers/gpu/drm/radeon/evergreen_blit_kms.c +28 -32
115 lines not on this page · raw message
drivers/gpu/drm/radeon/evergreen_blit_shaders.c +4 -15
@@ -39,10 +39,6 @@const u32 evergreen_default_state[] = { -0xc0012800 ,/* CONTEXT_CONTROL */ -0x80000000 , -0x80000000 , -0xc0016900 ,0x0000023b ,0x00000000 ,/* SQ_LDS_ALLOC_PS */
@@ -63,17 +59,11 @@ const u32 evergreen_default_state[] =0x00000000 ,0x00000000 , -0xc0026f00 , -0x00000000 , -0x00000000 ,/* SQ_VTX_BASE_VTX_LOC */ -0x00000000 , -0xc0026900 ,0x00000010 ,0x00000000 ,/* DB_Z_INFO */ 0x00000000 ,/* DB_STENCIL_INFO */ -0xc0016900 ,0x00000200 , 0x00000000, /* DB_DEPTH_CONTROL */
@@ -303,11 +293,10 @@ const u32 evergreen_default_state[] =0x00000000 ,/* */ 0x00000000 ,/* */ -0xc0036e00 ,/* SET_SAMPLER */ -0x00000000 , -0x00000012 , -0x00000000 , - 0x00000000, +0xc0026900 , +0x00000316 , +0x0000000e ,/* VGT_VERTEX_REUSE_BLOCK_CNTL */ + 0x00000010, /* */ }; const u32 evergreen_vs[] =
drivers/gpu/drm/radeon/evergreend.h +2 -0
@@ -645,6 +645,8 @@#define PACKET3_EVENT_WRITE_EOP 0x47#define PACKET3_EVENT_WRITE_EOS 0x48#define PACKET3_PREAMBLE_CNTL 0x4A +# define PACKET3_PREAMBLE_BEGIN_CLEAR_STATE (2 << 28) +# define PACKET3_PREAMBLE_END_CLEAR_STATE (3 << 28)#define PACKET3_RB_OFFSET 0x4B#define PACKET3_ALU_PS_CONST_BUFFER_COPY 0x4C#define PACKET3_ALU_VS_CONST_BUFFER_COPY 0x4D
Signature · 1 line
1.7.1.1