lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 018/306] drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs
    Date
    From: Evan Quan <evan.quan@amd.com>

    commit 355d991cb6ff6ae76b5e28b8edae144124c730e4 upstream.

    Otherwise, the error message prompted will confuse user.

    Signed-off-by: Evan Quan <evan.quan@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 23 ++++++++++++++++++-----
    1 file changed, 18 insertions(+), 5 deletions(-)

    --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
    +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
    @@ -3472,18 +3472,31 @@ static int smu7_get_pp_table_entry(struc

    static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, u32 *query)
    {
    + struct amdgpu_device *adev = hwmgr->adev;
    int i;
    u32 tmp = 0;

    if (!query)
    return -EINVAL;

    - smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetCurrPkgPwr, 0);
    - tmp = cgs_read_register(hwmgr->device, mmSMC_MSG_ARG_0);
    - *query = tmp;
    + /*
    + * PPSMC_MSG_GetCurrPkgPwr is not supported on:
    + * - Hawaii
    + * - Bonaire
    + * - Fiji
    + * - Tonga
    + */
    + if ((adev->asic_type != CHIP_HAWAII) &&
    + (adev->asic_type != CHIP_BONAIRE) &&
    + (adev->asic_type != CHIP_FIJI) &&
    + (adev->asic_type != CHIP_TONGA)) {
    + smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetCurrPkgPwr, 0);
    + tmp = cgs_read_register(hwmgr->device, mmSMC_MSG_ARG_0);
    + *query = tmp;

    - if (tmp != 0)
    - return 0;
    + if (tmp != 0)
    + return 0;
    + }

    smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogStart);
    cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,

    \
     
     \ /
      Last update: 2019-11-27 22:31    [W:4.348 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site