lkml.org 
[lkml]   [2016]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 021/137] drm/amdgpu/gmc: move vram type fetching into sw_init
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Alex Deucher <alexander.deucher@amd.com>

    commit d1518a1db31a25682ea09c4b135fa72d9883be42 upstream.

    early_init gets called before atom asic init so on non-posted
    cards, the vram type is not initialized.

    Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@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/gmc_v7_0.c | 16 ++++++++--------
    drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 16 ++++++++--------
    2 files changed, 16 insertions(+), 16 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    @@ -898,14 +898,6 @@ static int gmc_v7_0_early_init(void *han
    gmc_v7_0_set_gart_funcs(adev);
    gmc_v7_0_set_irq_funcs(adev);

    - if (adev->flags & AMD_IS_APU) {
    - adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
    - } else {
    - u32 tmp = RREG32(mmMC_SEQ_MISC0);
    - tmp &= MC_SEQ_MISC0__MT__MASK;
    - adev->mc.vram_type = gmc_v7_0_convert_vram_type(tmp);
    - }
    -
    return 0;
    }

    @@ -926,6 +918,14 @@ static int gmc_v7_0_sw_init(void *handle
    if (r)
    return r;

    + if (adev->flags & AMD_IS_APU) {
    + adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
    + } else {
    + u32 tmp = RREG32(mmMC_SEQ_MISC0);
    + tmp &= MC_SEQ_MISC0__MT__MASK;
    + adev->mc.vram_type = gmc_v7_0_convert_vram_type(tmp);
    + }
    +
    r = amdgpu_irq_add_id(adev, 146, &adev->mc.vm_fault);
    if (r)
    return r;
    --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
    @@ -852,14 +852,6 @@ static int gmc_v8_0_early_init(void *han
    gmc_v8_0_set_gart_funcs(adev);
    gmc_v8_0_set_irq_funcs(adev);

    - if (adev->flags & AMD_IS_APU) {
    - adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
    - } else {
    - u32 tmp = RREG32(mmMC_SEQ_MISC0);
    - tmp &= MC_SEQ_MISC0__MT__MASK;
    - adev->mc.vram_type = gmc_v8_0_convert_vram_type(tmp);
    - }
    -
    return 0;
    }

    @@ -880,6 +872,14 @@ static int gmc_v8_0_sw_init(void *handle
    if (r)
    return r;

    + if (adev->flags & AMD_IS_APU) {
    + adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
    + } else {
    + u32 tmp = RREG32(mmMC_SEQ_MISC0);
    + tmp &= MC_SEQ_MISC0__MT__MASK;
    + adev->mc.vram_type = gmc_v8_0_convert_vram_type(tmp);
    + }
    +
    r = amdgpu_irq_add_id(adev, 146, &adev->mc.vm_fault);
    if (r)
    return r;

    \
     
     \ /
      Last update: 2016-04-18 05:21    [W:4.165 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site