drm/amdgpu: add support for UVD_NO_OP register
Subsystems (2)
PATCH 1/4 drm/amdgpu: add support for UVD_NO_OP register
Writes to this register are the preferred way to do NOPs.
Bump the driver version as well.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 1 + drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -54,9 +54,10 @@* at the end of IBs. * - 3.3.0 - Add VM support for UVD on supported hardware. * - 3.4.0 - Add AMDGPU_INFO_NUM_EVICTIONS. +* - 3.5.0 - Add support for new UVD_NO_OP register. */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 4 +#define KMS_DRIVER_MINOR 5#define KMS_DRIVER_PATCHLEVEL 0int amdgpu_vram_limit =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -0
@@ -818,6 +818,7 @@ static int amdgpu_uvd_cs_reg(struct amdgpu_uvd_cs_ctx *ctx,return r;break ;case mmUVD_ENGINE_CNTL: +case mmUVD_NO_OP:break ;default :DRM_ERROR ("Invalid reg 0x%X!\n" , reg);
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h +1 -0
@@ -34,6 +34,7 @@#define mmUVD_UDEC_ADDR_CONFIG 0x3bd3#define mmUVD_UDEC_DB_ADDR_CONFIG 0x3bd4#define mmUVD_UDEC_DBW_ADDR_CONFIG 0x3bd5 +#define mmUVD_NO_OP 0x3bff#define mmUVD_SEMA_CNTL 0x3d00#define mmUVD_LMI_EXT40_ADDR 0x3d26#define mmUVD_CTX_INDEX 0x3d28
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1471983486-21453-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/4 drm/radeon: add support for UVD_NO_OP register
Writes to this register are the preferred way to do NOPs.
Bump the driver version as well.
--- drivers/gpu/drm/radeon/r600d.h | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/radeon_uvd.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/r600d.h +1 -0
@@ -1490,6 +1490,7 @@#define UVD_GPCOM_VCPU_DATA0 0xef10#define UVD_GPCOM_VCPU_DATA1 0xef14#define UVD_ENGINE_CNTL 0xef18 +#define UVD_NO_OP 0xeffc#define UVD_SEMA_CNTL 0xf400#define UVD_RB_ARB_CTRL 0xf480
drivers/gpu/drm/radeon/radeon_drv.c +2 -1
@@ -94,9 +94,10 @@* 2.44.0 - SET_APPEND_CNT packet3 support * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.46.0 - Add PFP_SYNC_ME support on evergreen +* 2.47.0 - Add UVD_NO_OP register support */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 46 +#define KMS_DRIVER_MINOR 47#define KMS_DRIVER_PATCHLEVEL 0int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);int radeon_driver_unload_kms (struct drm_device *dev);
drivers/gpu/drm/radeon/radeon_uvd.c +1 -0
@@ -669,6 +669,7 @@ static int radeon_uvd_cs_reg(struct radeon_cs_parser *p,return r;break ;case UVD_ENGINE_CNTL : +case UVD_NO_OP :break ;default : DRM_ERROR("Invalid reg 0x%X!\n",
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amdgpu: switch UVD code to use UVD_NO_OP for padding
In reply to a message not in the archiveReplace packet2's with packet0 writes to UVD_NO_OP. The value written to UVD_NO_OP does not matter.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 1 + drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 + 6 files changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +4 -2
@@ -957,8 +957,10 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, ib->ptr[3 ] = addr >>32 ; ib->ptr[4 ] =PACKET0 (mmUVD_GPCOM_VCPU_CMD,0 ); ib->ptr[5 ] =0 ; -for (i =6 ; i <16 ; ++i) - ib->ptr[i] =PACKET2 (0 ); +for (i =6 ; i <16 ; i +=2 ) { + ib->ptr[i] =PACKET0 (mmUVD_NO_OP,0 ); + ib->ptr[i+1 ] =0 ; + } ib->length_dw =16 ;if (direct) {
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -1
@@ -116,7 +116,7 @@ static int uvd_v4_2_sw_init(void *handle) ring = &adev->uvd.ring;sprintf (ring->name,"uvd" ); - r =amdgpu_ring_init (adev, ring,512 ,CP_PACKET2 ,0xf , + r =amdgpu_ring_init (adev, ring,512 ,PACKET0 (mmUVD_NO_OP,0 ),0xf , &adev->uvd.irq,0 ,AMDGPU_RING_TYPE_UVD );return r;
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -1
@@ -112,7 +112,7 @@ static int uvd_v5_0_sw_init(void *handle) ring = &adev->uvd.ring;sprintf (ring->name,"uvd" ); - r =amdgpu_ring_init (adev, ring,512 ,CP_PACKET2 ,0xf , + r =amdgpu_ring_init (adev, ring,512 ,PACKET0 (mmUVD_NO_OP,0 ),0xf , &adev->uvd.irq,0 ,AMDGPU_RING_TYPE_UVD );return r;
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
@@ -116,7 +116,7 @@ static int uvd_v6_0_sw_init(void *handle) ring = &adev->uvd.ring;sprintf (ring->name,"uvd" ); - r =amdgpu_ring_init (adev, ring,512 ,CP_PACKET2 ,0xf , + r =amdgpu_ring_init (adev, ring,512 ,PACKET0 (mmUVD_NO_OP,0 ),0xf , &adev->uvd.irq,0 ,AMDGPU_RING_TYPE_UVD );return r;
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h +1 -0
@@ -34,6 +34,7 @@#define mmUVD_UDEC_ADDR_CONFIG 0x3bd3#define mmUVD_UDEC_DB_ADDR_CONFIG 0x3bd4#define mmUVD_UDEC_DBW_ADDR_CONFIG 0x3bd5 +#define mmUVD_NO_OP 0x3bff#define mmUVD_LMI_RBC_RB_64BIT_BAR_LOW 0x3c69#define mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH 0x3c68#define mmUVD_LMI_RBC_IB_64BIT_BAR_LOW 0x3c67
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h +1 -0
@@ -35,6 +35,7 @@#define mmUVD_UDEC_DB_ADDR_CONFIG 0x3bd4#define mmUVD_UDEC_DBW_ADDR_CONFIG 0x3bd5#define mmUVD_POWER_STATUS_U 0x3bfd +#define mmUVD_NO_OP 0x3bff#define mmUVD_LMI_RBC_RB_64BIT_BAR_LOW 0x3c69#define mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH 0x3c68#define mmUVD_LMI_RBC_IB_64BIT_BAR_LOW 0x3c67
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/radeon: switch UVD code to use UVD_NO_OP for padding
In reply to a message not in the archiveReplace packet2's with packet0 writes to UVD_NO_OP. The value written to UVD_NO_OP does not matter.
--- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/cikd.h | 1 + drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/nid.h | 1 + drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 6 ++++-- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/rv770d.h | 1 + drivers/gpu/drm/radeon/si.c | 2 +- drivers/gpu/drm/radeon/sid.h | 1 + 12 files changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -1
@@ -8207,7 +8207,7 @@ static void cik_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/cikd.h +1 -0
@@ -2069,6 +2069,7 @@#define UVD_UDEC_ADDR_CONFIG 0xef4c#define UVD_UDEC_DB_ADDR_CONFIG 0xef50#define UVD_UDEC_DBW_ADDR_CONFIG 0xef54 +#define UVD_NO_OP 0xeffc#define UVD_LMI_EXT40_ADDR 0xf498#define UVD_GP_SCRATCH4 0xf4e0
drivers/gpu/drm/radeon/evergreen.c +1 -1
@@ -5579,7 +5579,7 @@ static void evergreen_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -1523,6 +1523,7 @@#define UVD_UDEC_ADDR_CONFIG 0xef4c#define UVD_UDEC_DB_ADDR_CONFIG 0xef50#define UVD_UDEC_DBW_ADDR_CONFIG 0xef54 +#define UVD_NO_OP 0xeffc#define UVD_RBC_RB_RPTR 0xf690#define UVD_RBC_RB_WPTR 0xf694#define UVD_STATUS 0xf6bc
drivers/gpu/drm/radeon/ni.c +1 -1
@@ -2062,7 +2062,7 @@ static void cayman_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/nid.h +1 -0
@@ -1137,6 +1137,7 @@#define UVD_UDEC_ADDR_CONFIG 0xEF4C#define UVD_UDEC_DB_ADDR_CONFIG 0xEF50#define UVD_UDEC_DBW_ADDR_CONFIG 0xEF54 +#define UVD_NO_OP 0xEFFC#define UVD_RBC_RB_RPTR 0xF690#define UVD_RBC_RB_WPTR 0xF694#define UVD_STATUS 0xf6bc
drivers/gpu/drm/radeon/r600.c +1 -1
@@ -3097,7 +3097,7 @@ static void r600_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/radeon_uvd.c +4 -2
@@ -754,8 +754,10 @@ static int radeon_uvd_send_msg(struct radeon_device *rdev, ib.ptr[3 ] = addr >>32 ; ib.ptr[4 ] =PACKET0 (UVD_GPCOM_VCPU_CMD ,0 ); ib.ptr[5 ] =0 ; -for (i =6 ; i <16 ; ++i) - ib.ptr[i] =PACKET2 (0 ); +for (i =6 ; i <16 ; i +=2 ) { + ib.ptr[i] =PACKET0 (UVD_NO_OP ,0 ); + ib.ptr[i+1 ] =0 ; + } ib.length_dw =16 ; r =radeon_ib_schedule (rdev, &ib,NULL , false);
drivers/gpu/drm/radeon/rv770.c +1 -1
@@ -1738,7 +1738,7 @@ static void rv770_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/rv770d.h +1 -0
@@ -387,6 +387,7 @@#define UVD_UDEC_TILING_CONFIG 0xef40#define UVD_UDEC_DB_TILING_CONFIG 0xef44#define UVD_UDEC_DBW_TILING_CONFIG 0xef48 +#define UVD_NO_OP 0xeffc#define GC_USER_SHADER_PIPE_CONFIG 0x8954#define INACTIVE_QD_PIPES (x) ((x) << 8)
drivers/gpu/drm/radeon/si.c +1 -1
@@ -6920,7 +6920,7 @@ static void si_uvd_resume(struct radeon_device *rdev)return ; ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX ]; - r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,RADEON_CP_PACKET2 ); + r =radeon_ring_init (rdev, ring, ring->ring_size,0 ,PACKET0 (UVD_NO_OP ,0 ));if (r) {dev_err (rdev->dev,"failed initializing UVD ring (%d).\n" , r);return ;
drivers/gpu/drm/radeon/sid.h +1 -0
@@ -1559,6 +1559,7 @@#define UVD_UDEC_ADDR_CONFIG 0xEF4C#define UVD_UDEC_DB_ADDR_CONFIG 0xEF50#define UVD_UDEC_DBW_ADDR_CONFIG 0xEF54 +#define UVD_NO_OP 0xEFFC#define UVD_RBC_RB_RPTR 0xF690#define UVD_RBC_RB_WPTR 0xF694#define UVD_STATUS 0xf6bc
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx