drm/amd/swsmu: allow asic to handle sensor type by itself
Subsystems (2)
PATCH 1/2 drm/amd/swsmu: allow asic to handle sensor type by itself
1. allow asic to handle sensor type by itself.
2. if not, use smu common sensor to handle it.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7 -2
@@ -1948,6 +1948,10 @@ int smu_read_sensor(struct smu_context *smu,mutex_lock (&smu->mutex); +if (smu->ppt_funcs->read_sensor) +if (!smu->ppt_funcs->read_sensor (smu, sensor, data, size)) + goto unlock; +switch (sensor) {case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : *((uint32_t *)data) = pstate_table->gfxclk_pstate.standard *100 ;
@@ -1978,11 +1982,12 @@ int smu_read_sensor(struct smu_context *smu, *size =4 ;break ;default : -if (smu->ppt_funcs->read_sensor) - ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size); + *size =0 ; + ret = -EOPNOTSUPP ;break ; } +unlock:mutex_unlock (&smu->mutex);return ret;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/swsmu: correct smu lock type on smu_read_sensor()
instead "mutex" with "sensor_lock" on smu_read_sensor().
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -2
@@ -1946,7 +1946,7 @@ int smu_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->mutex); +mutex_lock (&smu->sensor_lock);if (smu->ppt_funcs->read_sensor)if (!smu->ppt_funcs->read_sensor (smu, sensor, data, size))
@@ -1988,7 +1988,7 @@ int smu_read_sensor(struct smu_context *smu, } unlock: -mutex_unlock (&smu->mutex); +mutex_unlock (&smu->sensor_lock);return ret; }
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -2
@@ -1066,7 +1066,6 @@ static int arcturus_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm;
@@ -1109,7 +1108,6 @@ static int arcturus_read_sensor(struct smu_context *smu, ret = -EOPNOTSUPP ;break ; } -mutex_unlock (&smu->sensor_lock);return ret; }
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -2
@@ -1710,7 +1710,6 @@ static int navi10_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm;
@@ -1749,7 +1748,6 @@ static int navi10_read_sensor(struct smu_context *smu, ret = -EOPNOTSUPP ;break ; } -mutex_unlock (&smu->sensor_lock);return ret; }
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0 -2
@@ -950,7 +950,6 @@ static int renoir_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_GPU_LOAD : ret =renoir_get_current_activity_percent (smu, sensor, (uint32_t *)data);
@@ -974,7 +973,6 @@ static int renoir_read_sensor(struct smu_context *smu, ret = -EOPNOTSUPP ;break ; } -mutex_unlock (&smu->sensor_lock);return ret; }
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +0 -2
@@ -1521,7 +1521,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm;
@@ -1560,7 +1559,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu, ret = -EOPNOTSUPP ;break ; } -mutex_unlock (&smu->sensor_lock);return ret; }
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amd/swsmu: correct smu lock type on smu_read_sensor()
[AMD Official Use Only - Internal Distribution Only]
It's OK to drop sensor_lock. But please keep smu->mutex in smu_read_sensor. All top APIs from amdgpu_smu.c come with smu->mutex to avoid potential race issue.
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Kevin Wang
Sent: Monday, July 27, 2020 11:05 AM
To: [email protected]
Cc: Wang, Kevin(Yang) <[email protected]>; Feng, Kenneth <[email protected]>
Subject: [PATCH 2/2] drm/amd/swsmu: correct smu lock type on smu_read_sensor()
instead "mutex" with "sensor_lock" on smu_read_sensor().
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
@@ -1946,7 +1946,7 @@ int smu_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->mutex); +mutex_lock (&smu->sensor_lock);if (smu->ppt_funcs->read_sensor) if (!smu->ppt_funcs->read_sensor(smu, sensor, data, size)) @@ -1988,7 +1988,7 @@ int smu_read_sensor(struct smu_context *smu,
}
unlock:
-mutex_unlock(&smu->mutex);
+mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -1
@@ -1066,7 +1066,6 @@ static int arcturus_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1109,7 +1108,6 @@ static int arcturus_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -1
@@ -1710,7 +1710,6 @@ static int navi10_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1749,7 +1748,6 @@ static int navi10_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0 -1
@@ -950,7 +950,6 @@ static int renoir_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_GPU_LOAD : ret = renoir_get_current_activity_percent(smu, sensor, (uint32_t *)data); @@ -974,7 +973,6 @@ static int renoir_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +0 -1
@@ -1521,7 +1521,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1560,7 +1559,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
--
2.27.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cevan.quan%40amd.com%7C59903ad7916e46d3996908d831d9c8fc%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637314158764254291&sdata=4oXm1j7KHefIx73tvURU627HeY8FNw0N5IjBRfzEmFQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/swsmu: correct smu lock type on smu_read_sensor()
[AMD Official Use Only - Internal Distribution Only]
yes, i know what you want to say.
the "smu->mutex" as a global lock in smu driver, and it seems that the lock grain size is a little big. and it's better to rename it, eg: smu->api_lock, ...
Best Regards,
Kevin
________________________________
From: Quan, Evan <[email protected]>
Sent: Monday, July 27, 2020 12:01 PM
To: Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>
Cc: Wang, Kevin(Yang) <[email protected]>; Feng, Kenneth <[email protected]>
Subject: RE: [PATCH 2/2] drm/amd/swsmu: correct smu lock type on smu_read_sensor()
[AMD Official Use Only - Internal Distribution Only]
It's OK to drop sensor_lock. But please keep smu->mutex in smu_read_sensor. All top APIs from amdgpu_smu.c come with smu->mutex to avoid potential race issue.
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Kevin Wang
Sent: Monday, July 27, 2020 11:05 AM
To: [email protected]
Cc: Wang, Kevin(Yang) <[email protected]>; Feng, Kenneth <[email protected]>
Subject: [PATCH 2/2] drm/amd/swsmu: correct smu lock type on smu_read_sensor()
instead "mutex" with "sensor_lock" on smu_read_sensor().
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 -- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
@@ -1946,7 +1946,7 @@ int smu_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->mutex); +mutex_lock (&smu->sensor_lock);if (smu->ppt_funcs->read_sensor) if (!smu->ppt_funcs->read_sensor(smu, sensor, data, size)) @@ -1988,7 +1988,7 @@ int smu_read_sensor(struct smu_context *smu,
}
unlock:
-mutex_unlock(&smu->mutex);
+mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -1
@@ -1066,7 +1066,6 @@ static int arcturus_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1109,7 +1108,6 @@ static int arcturus_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -1
@@ -1710,7 +1710,6 @@ static int navi10_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1749,7 +1748,6 @@ static int navi10_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0 -1
@@ -950,7 +950,6 @@ static int renoir_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_GPU_LOAD : ret = renoir_get_current_activity_percent(smu, sensor, (uint32_t *)data); @@ -974,7 +973,6 @@ static int renoir_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +0 -1
@@ -1521,7 +1521,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,if (!data || !size)return -EINVAL ; -mutex_lock (&smu->sensor_lock);switch (sensor) {case AMDGPU_PP_SENSOR_MAX_FAN_RPM : *(uint32_t *)data = pptable->FanMaximumRpm; @@ -1560,7 +1559,6 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu,
ret = -EOPNOTSUPP;
break;
}
-mutex_unlock(&smu->sensor_lock);
return ret;
}
--
2.27.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cevan.quan%40amd.com%7C59903ad7916e46d3996908d831d9c8fc%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637314158764254291&sdata=4oXm1j7KHefIx73tvURU627HeY8FNw0N5IjBRfzEmFQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Wang, Kevin(Yang) <[email protected]>
Sent: Monday, July 27, 2020 11:05 AM
To: [email protected]
Cc: Feng, Kenneth <[email protected]>; Wang, Kevin(Yang) <[email protected]>
Subject: [PATCH 1/2] drm/amd/swsmu: allow asic to handle sensor type by itself
1. allow asic to handle sensor type by itself.
2. if not, use smu common sensor to handle it.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -0
@@ -1948,6 +1948,10 @@ int smu_read_sensor(struct smu_context *smu,mutex_lock (&smu->mutex); +if (smu->ppt_funcs->read_sensor) +if (!smu->ppt_funcs->read_sensor (smu, sensor, data, size)) + goto unlock; +switch (sensor) {case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : *((uint32_t *)data) = pstate_table->gfxclk_pstate.standard * 100; @@ -1978,11 +1982,12 @@ int smu_read_sensor(struct smu_context *smu,
*size = 4;
break;
default:
- if (smu->ppt_funcs->read_sensor)
- ret = smu->ppt_funcs->read_sensor(smu, sensor, data, size);
+ *size = 0;
+ ret = -EOPNOTSUPP;
break;
}
+unlock:
mutex_unlock(&smu->mutex);
return ret;
--
2.27.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx