diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3693-drm-amdgpu-give-warning-before-sleep-in-kiq_r-wreg.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3693-drm-amdgpu-give-warning-before-sleep-in-kiq_r-wreg.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3693-drm-amdgpu-give-warning-before-sleep-in-kiq_r-wreg.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3693-drm-amdgpu-give-warning-before-sleep-in-kiq_r-wreg.patch new file mode 100644 index 00000000..3bb2dacf --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3693-drm-amdgpu-give-warning-before-sleep-in-kiq_r-wreg.patch @@ -0,0 +1,46 @@ +From 9d21726f65ce9075fb7978ef2dbec3439d010584 Mon Sep 17 00:00:00 2001 +From: Monk Liu <Monk.Liu@amd.com> +Date: Mon, 5 Mar 2018 19:26:36 +0800 +Subject: [PATCH 3693/4131] drm/amdgpu: give warning before sleep in kiq_r/wreg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +to catch error that may schedule in atomic context early on + +Change-Id: I49dec7c55470011729b7fa7d3e1ecfe1f38ed89f +Signed-off-by: Monk Liu <Monk.Liu@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +index 42c1401..21adb1b6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +@@ -167,6 +167,9 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) + if (r < 1 && (adev->in_gpu_reset || in_interrupt())) + goto failed_kiq_read; + ++ if (in_interrupt()) ++ might_sleep(); ++ + while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { + msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); + r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT); +@@ -212,7 +215,11 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v) + if (r < 1 && (adev->in_gpu_reset || in_interrupt())) + goto failed_kiq_write; + ++ if (in_interrupt()) ++ might_sleep(); ++ + while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { ++ + msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); + r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT); + } +-- +2.7.4 + |