Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 562e2689 authored by Sonny Jiang's avatar Sonny Jiang Committed by Alex Deucher
Browse files

amdgpu/uvd: add uvd fw version for amdgpu 



Was previously always hardcoded to 0.

Signed-off-by: default avatarSonny Jiang <sonny.jiang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 054892ed

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,7 @@ struct amdgpu_uvd { 
	struct amdgpu_bo	*vcpu_bo;

	void			*cpu_addr;

	uint64_t		gpu_addr;

	unsigned		fw_version;

	void			*saved_bo;

	atomic_t		handles[AMDGPU_MAX_UVD_HANDLES];

	struct drm_file		*filp[AMDGPU_MAX_UVD_HANDLES];

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			fw_info.feature = adev->vce.fb_version;

			break;

		case AMDGPU_INFO_FW_UVD:

			fw_info.ver = 0;

			fw_info.ver = adev->uvd.fw_version;

			fw_info.feature = 0;

			break;

		case AMDGPU_INFO_FW_GMC:

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 
	DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",

		version_major, version_minor, family_id);



	adev->uvd.fw_version = ((version_major << 24) | (version_minor << 16) |

				(family_id << 8));



	bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)

		 +  AMDGPU_UVD_STACK_SIZE + AMDGPU_UVD_HEAP_SIZE;

	r = amdgpu_bo_create(adev, bo_size, PAGE_SIZE, true,