drm/amd/powerplay: maximum code sharing on sensor reading

Move the common code to amdgpu_smu.c instead of having one
copy in both smu_v11_0.c and smu_v12_0.c.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index c032680c52b000ec849a01af076b36ffe3e52a3e..8415b383e7ae3473823b7ba341e09e9a300850f5 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -2322,6 +2322,10 @@ int smu_read_sensor(struct smu_context *smu,
                *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ? 0 : 1;
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_MIN_FAN_RPM:
+               *(uint32_t *)data = 0;
+               *size = 4;
+               break;
        default:
                if (smu->ppt_funcs->read_sensor)
                        ret = smu->ppt_funcs->read_sensor(smu, sensor, data, size);

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 9dcb0a3988d102b484b210c4987ba479f9a2e79d..f24983a8876df3ca276daeab5919666c1e7de4aa 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -1193,10 +1193,6 @@ int smu_v11_0_read_sensor(struct smu_context *smu,
                ret = smu_v11_0_get_gfx_vdd(smu, (uint32_t *)data);
                *size = 4;
                break;
-       case AMDGPU_PP_SENSOR_MIN_FAN_RPM:
-               *(uint32_t *)data = 0;
-               *size = 4;
-               break;
        default:
                ret = -EOPNOTSUPP;
                break;

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
index ae1035575808c55618732635e880aef2260522a0..b03127273d5636d462ccfaa732ddc2f751bde03f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
@@ -221,10 +221,6 @@ int smu_v12_0_read_sensor(struct smu_context *smu,
                ret = smu_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);
                *size = 4;
                break;
-       case AMDGPU_PP_SENSOR_MIN_FAN_RPM:
-               *(uint32_t *)data = 0;
-               *size = 4;
-               break;
        default:
                ret = -EOPNOTSUPP;
                break;