lkml.org 
[lkml]   [2023]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 04/45] drm/amd: Convert SMUv13 microcode to use `amdgpu_ucode_ip_version_decode`
    Date
    The special case for the one dGPU has been moved into
    `amdgpu_ucode_ip_version_decode`, so simplify this code.

    Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
    Acked-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    ---
    drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
    index 0ac9cac805f9..506a49a4b425 100644
    --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
    +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
    @@ -88,7 +88,6 @@ static const int link_speed[] = {25, 50, 80, 160};
    int smu_v13_0_init_microcode(struct smu_context *smu)
    {
    struct amdgpu_device *adev = smu->adev;
    - const char *chip_name;
    char fw_name[30];
    char ucode_prefix[30];
    int err = 0;
    @@ -100,16 +99,9 @@ int smu_v13_0_init_microcode(struct smu_context *smu)
    if (amdgpu_sriov_vf(adev))
    return 0;

    - switch (adev->ip_versions[MP1_HWIP][0]) {
    - case IP_VERSION(13, 0, 2):
    - chip_name = "aldebaran_smc";
    - break;
    - default:
    - amdgpu_ucode_ip_version_decode(adev, MP1_HWIP, ucode_prefix, sizeof(ucode_prefix));
    - chip_name = ucode_prefix;
    - }
    + amdgpu_ucode_ip_version_decode(adev, MP1_HWIP, ucode_prefix, sizeof(ucode_prefix));

    - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", chip_name);
    + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);

    err = request_firmware(&adev->pm.fw, fw_name, adev->dev);
    if (err)
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:6.454 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site