Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+4 -1
+2 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
··· 54 54 * at the end of IBs. 55 55 * - 3.3.0 - Add VM support for UVD on supported hardware. 56 56 * - 3.4.0 - Add AMDGPU_INFO_NUM_EVICTIONS. 57 + * - 3.5.0 - Add support for new UVD_NO_OP register. 57 58 */ 58 59 #define KMS_DRIVER_MAJOR 3 59 - #define KMS_DRIVER_MINOR 4 60 + #define KMS_DRIVER_MINOR 5 60 61 #define KMS_DRIVER_PATCHLEVEL 0 61 62 62 63 int amdgpu_vram_limit = 0;
+1
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
··· 818 818 return r; 819 819 break; 820 820 case mmUVD_ENGINE_CNTL: 821 + case mmUVD_NO_OP: 821 822 break; 822 823 default: 823 824 DRM_ERROR("Invalid reg 0x%X!\n", reg);
+1
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h
··· 34 34 #define mmUVD_UDEC_ADDR_CONFIG 0x3bd3 35 35 #define mmUVD_UDEC_DB_ADDR_CONFIG 0x3bd4 36 36 #define mmUVD_UDEC_DBW_ADDR_CONFIG 0x3bd5 37 + #define mmUVD_NO_OP 0x3bff 37 38 #define mmUVD_SEMA_CNTL 0x3d00 38 39 #define mmUVD_LMI_EXT40_ADDR 0x3d26 39 40 #define mmUVD_CTX_INDEX 0x3d28