lkml.org 
[lkml]   [2016]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 066/273] drm/amdgpu: iceland use CI based MC IP
    Date
    4.2.8-ckt5 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Ken Wang <Qingqing.Wang@amd.com>

    commit 429c45deae6e57f1bb91bfb05b671063fb0cef60 upstream.

    Reviewed-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 +++++++++-
    drivers/gpu/drm/amd/amdgpu/vi.c | 7 ++++---
    2 files changed, 13 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    index c735b86..9557571 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
    @@ -42,6 +42,7 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);

    MODULE_FIRMWARE("radeon/boniare_mc.bin");
    MODULE_FIRMWARE("radeon/hawaii_mc.bin");
    +MODULE_FIRMWARE("amdgpu/topaz_mc.bin");

    /**
    * gmc8_mc_wait_for_idle - wait for MC idle callback.
    @@ -132,13 +133,20 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
    case CHIP_HAWAII:
    chip_name = "hawaii";
    break;
    + case CHIP_TOPAZ:
    + chip_name = "topaz";
    + break;
    case CHIP_KAVERI:
    case CHIP_KABINI:
    return 0;
    default: BUG();
    }

    - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name);
    + if(adev->asic_type == CHIP_TOPAZ)
    + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
    + else
    + snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name);
    +
    err = request_firmware(&adev->mc.fw, fw_name, adev->dev);
    if (err)
    goto out;
    diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
    index 9ffa56c..5acaefc 100644
    --- a/drivers/gpu/drm/amd/amdgpu/vi.c
    +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
    @@ -60,6 +60,7 @@
    #include "vi.h"
    #include "vi_dpm.h"
    #include "gmc_v8_0.h"
    +#include "gmc_v7_0.h"
    #include "gfx_v8_0.h"
    #include "sdma_v2_4.h"
    #include "sdma_v3_0.h"
    @@ -1027,10 +1028,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] =
    },
    {
    .type = AMD_IP_BLOCK_TYPE_GMC,
    - .major = 8,
    - .minor = 0,
    + .major = 7,
    + .minor = 4,
    .rev = 0,
    - .funcs = &gmc_v8_0_ip_funcs,
    + .funcs = &gmc_v7_0_ip_funcs,
    },
    {
    .type = AMD_IP_BLOCK_TYPE_IH,
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-08 02:21    [W:2.541 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site