lkml.org 
[lkml]   [2017]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH for v4.9 LTS 64/86] drm/radeon/si: load special ucode for certain MC configs
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    [ Upstream commit ef736d394e85b1bf1fd65ba5e5257b85f6c82325 ]

    Special MC ucode is required for these memory configurations.

    Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/gpu/drm/radeon/si.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
    index 3333e8a45933..b75d809c292e 100644
    --- a/drivers/gpu/drm/radeon/si.c
    +++ b/drivers/gpu/drm/radeon/si.c
    @@ -115,6 +115,8 @@ MODULE_FIRMWARE("radeon/hainan_rlc.bin");
    MODULE_FIRMWARE("radeon/hainan_smc.bin");
    MODULE_FIRMWARE("radeon/hainan_k_smc.bin");

    +MODULE_FIRMWARE("radeon/si58_mc.bin");
    +
    static u32 si_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh);
    static void si_pcie_gen3_enable(struct radeon_device *rdev);
    static void si_program_aspm(struct radeon_device *rdev);
    @@ -1650,6 +1652,7 @@ static int si_init_microcode(struct radeon_device *rdev)
    int err;
    int new_fw = 0;
    bool new_smc = false;
    + bool si58_fw = false;

    DRM_DEBUG("\n");

    @@ -1742,6 +1745,10 @@ static int si_init_microcode(struct radeon_device *rdev)
    default: BUG();
    }

    + /* this memory configuration requires special firmware */
    + if (((RREG32(MC_SEQ_MISC0) & 0xff000000) >> 24) == 0x58)
    + si58_fw = true;
    +
    DRM_INFO("Loading %s Microcode\n", new_chip_name);

    snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", new_chip_name);
    @@ -1845,7 +1852,10 @@ static int si_init_microcode(struct radeon_device *rdev)
    }
    }

    - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", new_chip_name);
    + if (si58_fw)
    + snprintf(fw_name, sizeof(fw_name), "radeon/si58_mc.bin");
    + else
    + snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", new_chip_name);
    err = request_firmware(&rdev->mc_fw, fw_name, rdev->dev);
    if (err) {
    snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc2.bin", chip_name);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-06-18 00:33    [W:3.065 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site