drm/radeon: add support for UVD_NO_OP register
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 22 Aug 2016 22:03:22 +0000 (18:03 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 24 Aug 2016 20:25:04 +0000 (16:25 -0400)
Writes to this register are the preferred way to do NOPs.

Bump the driver version as well.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/r600d.h
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/radeon/radeon_uvd.c

index 1e8495cca41e9f5f611dfc3b84726104427969c7..2e00a5287bd2dbbe01cb5799e8541e49bb201f56 100644 (file)
 #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
index c01a7c6abb491c4227ad02fd6525813a7a9d3d55..8faa4d55d0600e534092bfb1dd87f4d034d6a932 100644 (file)
  *   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  0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
index 73dfe01435eaedcf0831ce8eb412057fb6f5ac64..1ae1f139f14e9ea085c77405ea60e557c6dbe40b 100644 (file)
@@ -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",