diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 8 | 
1 files changed, 6 insertions, 2 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h index 3553b92bf69a..32ea20b99e53 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h @@ -31,6 +31,10 @@  #define AMDGPU_UVD_SESSION_SIZE		(50*1024)  #define AMDGPU_UVD_FIRMWARE_OFFSET	256 +#define AMDGPU_UVD_FIRMWARE_SIZE(adev)    \ +	(AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(((const struct common_firmware_header *)(adev)->uvd.fw->data)->ucode_size_bytes) + \ +			       8) - AMDGPU_UVD_FIRMWARE_OFFSET) +  struct amdgpu_uvd {  	struct amdgpu_bo	*vcpu_bo;  	void			*cpu_addr; @@ -47,8 +51,8 @@ struct amdgpu_uvd {  	struct amdgpu_irq_src	irq;  	bool			address_64_bit;  	bool			use_ctx_buf; -	struct amd_sched_entity entity; -	struct amd_sched_entity entity_enc; +	struct drm_sched_entity entity; +	struct drm_sched_entity entity_enc;  	uint32_t                srbm_soft_reset;  	unsigned		num_enc_rings;  }; |