Patch "amdgpu/uvd: add uvd fw version for amdgpu" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
amdgpu/uvd: add uvd fw version for amdgpu
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
amdgpu-uvd-add-uvd-fw-version-for-amdgpu.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
562e2689baebaa2ac25b7ec934385480ed1cb7d6Mon Sep 17 00:00:00 2001
From: Sonny Jiang <[email protected]>
Date: Mon, 18 Apr 2016 16:05:04 -0400
Subject: amdgpu/uvd: add uvd fw version for amdgpu
From: Sonny Jiang <[email protected]>
commit 562e2689baebaa2ac25b7ec934385480ed1cb7d6 upstream.
Was previously always hardcoded to 0.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1673,6 +1673,7 @@ struct amdgpu_uvd {struct amdgpu_bo *vcpu_bo;void *cpu_addr;uint64_t gpu_addr; +unsigned fw_version;atomic_t handles[AMDGPU_MAX_UVD_HANDLES ];struct drm_file *filp[AMDGPU_MAX_UVD_HANDLES ];struct delayed_work idle_work;
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -303,7 +303,7 @@ static int amdgpu_info_ioctl(struct drm_ 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
@@ -156,6 +156,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_devDRM_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,
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/amdgpu-uvd-add-uvd-fw-version-for-amdgpu.patch