diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3981-drm-amd-powerplay-add-sensor-lock-support-for-smu.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3981-drm-amd-powerplay-add-sensor-lock-support-for-smu.patch | 118 |
1 files changed, 118 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3981-drm-amd-powerplay-add-sensor-lock-support-for-smu.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3981-drm-amd-powerplay-add-sensor-lock-support-for-smu.patch new file mode 100644 index 00000000..59e032b2 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3981-drm-amd-powerplay-add-sensor-lock-support-for-smu.patch @@ -0,0 +1,118 @@ +From 0fc035a37385c60b7e2df87e29fb517a4f047a88 Mon Sep 17 00:00:00 2001 +From: Kevin Wang <kevin1.wang@amd.com> +Date: Thu, 26 Sep 2019 16:22:13 +0800 +Subject: [PATCH 3981/4256] drm/amd/powerplay: add sensor lock support for smu + +when multithreading access sysfs of amdgpu_pm_info at the sametime. +the swsmu driver cause smu firmware hang. + +eg: +single thread access: +Message A + Param A ==> right +Message B + Param B ==> right +Message C + Param C ==> right +multithreading access: +Message A + Param B ==> error +Message B + Param A ==> error +Message C + Param C ==> right + +the patch will add sensor lock(mutex) to avoid this error. + +Signed-off-by: Kevin Wang <kevin1.wang@amd.com> +Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 ++ + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 ++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 2 ++ + 5 files changed, 9 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index 0237e4d06aca..3d1bfa8ea7c2 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -840,6 +840,8 @@ static int smu_sw_init(void *handle) + smu->smu_baco.state = SMU_BACO_STATE_EXIT; + smu->smu_baco.platform_support = false; + ++ mutex_init(&smu->sensor_lock); ++ + smu->watermarks_bitmap = 0; + smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT; + smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT; +diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +index 1433bd3129a4..37ac01d37ae8 100644 +--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +@@ -1025,6 +1025,7 @@ 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; +@@ -1051,6 +1052,7 @@ static int arcturus_read_sensor(struct smu_context *smu, + default: + ret = smu_smc_read_sensor(smu, sensor, data, size); + } ++ mutex_unlock(&smu->sensor_lock); + + return ret; + } +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index 5c898444ff97..bc4b73e0718e 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -350,6 +350,7 @@ struct smu_context + const struct smu_funcs *funcs; + const struct pptable_funcs *ppt_funcs; + struct mutex mutex; ++ struct mutex sensor_lock; + uint64_t pool_size; + + struct smu_table_context smu_table; +diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +index f9147655d115..7c0c5bc28fcc 100644 +--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +@@ -1386,6 +1386,7 @@ 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; +@@ -1409,6 +1410,7 @@ static int navi10_read_sensor(struct smu_context *smu, + default: + ret = smu_smc_read_sensor(smu, sensor, data, size); + } ++ mutex_unlock(&smu->sensor_lock); + + return ret; + } +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index e9ecc3f7aab1..99effde33ac1 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -3017,6 +3017,7 @@ static int vega20_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; +@@ -3042,6 +3043,7 @@ static int vega20_read_sensor(struct smu_context *smu, + default: + ret = smu_smc_read_sensor(smu, sensor, data, size); + } ++ mutex_unlock(&smu->sensor_lock); + + return ret; + } +-- +2.17.1 + |