lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.13 18/36] drm/amdgpu: allow harvesting check for Polaris VCE
    Date
    4.13-stable review patch.  If anyone has any objections, please let me know.

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

    From: Leo Liu <leo.liu@amd.com>

    commit 32bec2afa525149288e6696079bc85f747fa2138 upstream.

    Fixes init failures on Polaris cards with harvested
    VCE blocks.

    Signed-off-by: Leo Liu <leo.liu@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/vce_v3_0.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
    @@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_con
    {
    u32 tmp;

    - /* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */
    if ((adev->asic_type == CHIP_FIJI) ||
    - (adev->asic_type == CHIP_STONEY) ||
    - (adev->asic_type == CHIP_POLARIS10) ||
    - (adev->asic_type == CHIP_POLARIS11) ||
    - (adev->asic_type == CHIP_POLARIS12))
    + (adev->asic_type == CHIP_STONEY))
    return AMDGPU_VCE_HARVEST_VCE1;

    - /* Tonga and CZ are dual or single pipe */
    if (adev->flags & AMD_IS_APU)
    tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) &
    VCE_HARVEST_FUSE_MACRO__MASK) >>
    @@ -391,6 +386,11 @@ static unsigned vce_v3_0_get_harvest_con
    case 3:
    return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;
    default:
    + if ((adev->asic_type == CHIP_POLARIS10) ||
    + (adev->asic_type == CHIP_POLARIS11) ||
    + (adev->asic_type == CHIP_POLARIS12))
    + return AMDGPU_VCE_HARVEST_VCE1;
    +
    return 0;
    }
    }

    \
     
     \ /
      Last update: 2017-11-06 10:25    [W:4.449 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site