diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4361-drm-amdgpu-register-gpu-instance-before-fan-boost-fe.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4361-drm-amdgpu-register-gpu-instance-before-fan-boost-fe.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4361-drm-amdgpu-register-gpu-instance-before-fan-boost-fe.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4361-drm-amdgpu-register-gpu-instance-before-fan-boost-fe.patch new file mode 100644 index 00000000..2593c094 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4361-drm-amdgpu-register-gpu-instance-before-fan-boost-fe.patch @@ -0,0 +1,50 @@ +From e284bbcf32d1b56f3a271dedf13859f0d66e5208 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Tue, 5 Nov 2019 18:13:49 +0800 +Subject: [PATCH 4361/4736] drm/amdgpu: register gpu instance before fan boost + feature enablment + +Otherwise, the feature enablement will be skipped due to wrong count. +Caused by "drm/amdgpu: fix a race in GPU reset with IB test (v2)". + +Change-Id: Id576090d7ce7645a5c98ac160e0af730a51526b0 +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 - + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index beeae2573cb0..edc11fb2bf24 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -3036,6 +3036,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, + DRM_INFO("amdgpu: acceleration disabled, skipping benchmarks\n"); + } + ++ /* ++ * Register gpu instance before amdgpu_device_enable_mgpu_fan_boost. ++ * Otherwise the mgpu fan boost feature will be skipped due to the ++ * gpu instance is counted less. ++ */ ++ amdgpu_register_gpu_instance(adev); ++ + /* enable clockgating, etc. after ib tests, etc. since some blocks require + * explicit gating rather than handling it automatically. + */ +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +index 5abbfc488022..488258f1138d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +@@ -187,7 +187,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) + pm_runtime_put_autosuspend(dev->dev); + } + +- amdgpu_register_gpu_instance(adev); + out: + if (r) { + /* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */ +-- +2.17.1 + |