lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 066/163] amdgpu/uvd: add uvd fw version for amdgpu
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sonny Jiang <sonny.jiang@amd.com>

    commit 562e2689baebaa2ac25b7ec934385480ed1cb7d6 upstream.

    Was previously always hardcoded to 0.

    Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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(-)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
    @@ -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;
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
    @@ -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:
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
    @@ -156,6 +156,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_dev
    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,

    \
     
     \ /
      Last update: 2016-05-03 02:41    [W:3.743 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site