lkml.org 
[lkml]   [2018]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 159/197] drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Rex Zhu <rex.zhu@amd.com>

    commit 8a50bb47a863c3cb8950a2e810448c9a82a9d446 upstream.

    the voltage showed in debugfs and hwmon should be in mV

    Reviewed-by: Evan Quan <evan.quan@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Rex Zhu <Rex.Zhu@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/smu8_hwmgr.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
    +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
    @@ -244,6 +244,7 @@ static int smu8_initialize_dpm_defaults(
    return 0;
    }

    +/* convert form 8bit vid to real voltage in mV*4 */
    static uint32_t smu8_convert_8Bit_index_to_voltage(
    struct pp_hwmgr *hwmgr, uint16_t voltage)
    {
    @@ -1702,13 +1703,13 @@ static int smu8_read_sensor(struct pp_hw
    case AMDGPU_PP_SENSOR_VDDNB:
    tmp = (cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixSMUSVI_NB_CURRENTVID) &
    CURRENT_NB_VID_MASK) >> CURRENT_NB_VID__SHIFT;
    - vddnb = smu8_convert_8Bit_index_to_voltage(hwmgr, tmp);
    + vddnb = smu8_convert_8Bit_index_to_voltage(hwmgr, tmp) / 4;
    *((uint32_t *)value) = vddnb;
    return 0;
    case AMDGPU_PP_SENSOR_VDDGFX:
    tmp = (cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixSMUSVI_GFX_CURRENTVID) &
    CURRENT_GFX_VID_MASK) >> CURRENT_GFX_VID__SHIFT;
    - vddgfx = smu8_convert_8Bit_index_to_voltage(hwmgr, (u16)tmp);
    + vddgfx = smu8_convert_8Bit_index_to_voltage(hwmgr, (u16)tmp) / 4;
    *((uint32_t *)value) = vddgfx;
    return 0;
    case AMDGPU_PP_SENSOR_UVD_VCLK:

    \
     
     \ /
      Last update: 2018-09-13 16:03    [W:4.021 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site