drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST
Subsystems (2)
PATCH 1/2 drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST
the voltage showed in debugfs and hwmon should be in mV
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +3 -2
@@ -244,6 +244,7 @@ static int smu8_initialize_dpm_defaults(struct pp_hwmgr *hwmgr)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) {
@@ -1707,13 +1708,13 @@ static int smu8_read_sensor(struct pp_hwmgr *hwmgr, int idx,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 :
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1532494993-23009-1-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: fix a reversed condition
This test was reversed so it would end up leading to vddnb value can't be read on APU.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1 -1
@@ -1185,7 +1185,7 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,int r, size =sizeof (vddnb);/* only APUs have vddnb */ -if (adev->flags &AMD_IS_APU ) +if (!(adev->flags &AMD_IS_APU ))return -EINVAL ;/* Can't get voltage when the card is off */
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1532494993-23009-2-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 2/2] drm/amdgpu: fix a reversed condition
Series is Reviewed-by: Evan Quan <[email protected]>
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Wednesday, July 25, 2018 1:03:13 PM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 2/2] drm/amdgpu: fix a reversed condition
This test was reversed so it would end up leading to vddnb value can't be read on APU.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1 -1
@@ -1185,7 +1185,7 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,int r, size =sizeof (vddnb);/* only APUs have vddnb */ -if (adev->flags &AMD_IS_APU ) +if (!(adev->flags &AMD_IS_APU ))return -EINVAL ;/* Can't get voltage when the card is off */
--
1.9.1
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byRe: [PATCH 2/2] drm/amdgpu: fix a reversed condition
In reply to a message not in the archiveQuoted 4 lines · Rex Zhu
This test was reversed so it would end up leading to vddnb value can't be read on APU.
Signed-off-by Rex Zhu <[email protected]>
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-2@@ -1185,7 +1185,7 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,int r, size =sizeof (vddnb);/* only APUs have vddnb */ -if (adev->flags &AMD_IS_APU ) +if (!(adev->flags &AMD_IS_APU ))return -EINVAL ;/* Can't get voltage when the card is off */ --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Acked-by________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Wednesday, July 25, 2018 1:03:12 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 1/2] drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST
the voltage showed in debugfs and hwmon should be in mV
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +3 -2
@@ -244,6 +244,7 @@ static int smu8_initialize_dpm_defaults(struct pp_hwmgr *hwmgr)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) {
@@ -1707,13 +1708,13 @@ static int smu8_read_sensor(struct pp_hwmgr *hwmgr, int idx,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 :
--
1.9.1
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx