diff options
| author | Sonny Jiang <[email protected]> | 2016-04-18 20:05:04 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2016-04-22 00:03:47 +0000 |
| commit | 562e2689baebaa2ac25b7ec934385480ed1cb7d6 (patch) | |
| tree | b6e24061944d62b19392d8648548f2b6c714e8d3 /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
| parent | drm/amdgpu: forbid mapping of userptr bo through radeon device file (diff) | |
| download | kernel-562e2689baebaa2ac25b7ec934385480ed1cb7d6.tar.gz kernel-562e2689baebaa2ac25b7ec934385480ed1cb7d6.zip | |
amdgpu/uvd: add uvd fw version for amdgpu
Was previously always hardcoded to 0.
Signed-off-by: Sonny Jiang <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Cc: [email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index 8d035b65d967..871018c634e0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -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, |