Commit 4d6bdbad authored by Alex Deucher's avatar Alex Deucher

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.
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8dd31d74
...@@ -1490,6 +1490,7 @@ ...@@ -1490,6 +1490,7 @@
#define UVD_GPCOM_VCPU_DATA0 0xef10 #define UVD_GPCOM_VCPU_DATA0 0xef10
#define UVD_GPCOM_VCPU_DATA1 0xef14 #define UVD_GPCOM_VCPU_DATA1 0xef14
#define UVD_ENGINE_CNTL 0xef18 #define UVD_ENGINE_CNTL 0xef18
#define UVD_NO_OP 0xeffc
#define UVD_SEMA_CNTL 0xf400 #define UVD_SEMA_CNTL 0xf400
#define UVD_RB_ARB_CTRL 0xf480 #define UVD_RB_ARB_CTRL 0xf480
......
...@@ -94,9 +94,10 @@ ...@@ -94,9 +94,10 @@
* 2.44.0 - SET_APPEND_CNT packet3 support * 2.44.0 - SET_APPEND_CNT packet3 support
* 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI
* 2.46.0 - Add PFP_SYNC_ME support on evergreen * 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_MAJOR 2
#define KMS_DRIVER_MINOR 46 #define KMS_DRIVER_MINOR 47
#define KMS_DRIVER_PATCHLEVEL 0 #define KMS_DRIVER_PATCHLEVEL 0
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
int radeon_driver_unload_kms(struct drm_device *dev); int radeon_driver_unload_kms(struct drm_device *dev);
......
...@@ -669,6 +669,7 @@ static int radeon_uvd_cs_reg(struct radeon_cs_parser *p, ...@@ -669,6 +669,7 @@ static int radeon_uvd_cs_reg(struct radeon_cs_parser *p,
return r; return r;
break; break;
case UVD_ENGINE_CNTL: case UVD_ENGINE_CNTL:
case UVD_NO_OP:
break; break;
default: default:
DRM_ERROR("Invalid reg 0x%X!\n", DRM_ERROR("Invalid reg 0x%X!\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment