diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 12:12:59 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 12:12:59 -0400 |
| commit | d5d32be9d8404b7c1371f7b67e4ad86e7afa9e7d (patch) | |
| tree | 6dd5349ced99ae8dc5c86ccd420ec693e3d1524c | |
| parent | f227dd8774c94a35c9b93b4a900213fd9796aac6 (diff) | |
| download | longterm-queue-5.2-d5d32be9d8404b7c1371f7b67e4ad86e7afa9e7d.tar.gz | |
drm: amd: no gfx_v10 driver in v5.2.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch | 54 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 55 deletions
diff --git a/queue/drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch b/queue/drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch deleted file mode 100644 index 9cf2cbaa..00000000 --- a/queue/drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7d65a577bb58d4f27a3398a4c0cb0b00ab7d0511 Mon Sep 17 00:00:00 2001 -From: Jack Xiao <Jack.Xiao@amd.com> -Date: Fri, 10 Jul 2020 12:18:22 +0800 -Subject: [PATCH] drm/amdgpu/gfx10: fix race condition for kiq -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 7d65a577bb58d4f27a3398a4c0cb0b00ab7d0511 upstream. - -During preemption test for gfx10, it uses kiq to trigger -gfx preemption, which would result in race condition -with flushing TLB for kiq. - -Signed-off-by: Jack Xiao <Jack.Xiao@amd.com> -Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> -Acked-by: Christian König <christian.koenig@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> - -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c -index bd5dd4f64311..fac77a86c04b 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c -@@ -7513,12 +7513,17 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) - struct amdgpu_device *adev = ring->adev; - struct amdgpu_kiq *kiq = &adev->gfx.kiq; - struct amdgpu_ring *kiq_ring = &kiq->ring; -+ unsigned long flags; - - if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues) - return -EINVAL; - -- if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->unmap_queues_size)) -+ spin_lock_irqsave(&kiq->ring_lock, flags); -+ -+ if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->unmap_queues_size)) { -+ spin_unlock_irqrestore(&kiq->ring_lock, flags); - return -ENOMEM; -+ } - - /* assert preemption condition */ - amdgpu_ring_set_preempt_cond_exec(ring, false); -@@ -7529,6 +7534,8 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) - ++ring->trail_seq); - amdgpu_ring_commit(kiq_ring); - -+ spin_unlock_irqrestore(&kiq->ring_lock, flags); -+ - /* poll the trailing fence */ - for (i = 0; i < adev->usec_timeout; i++) { - if (ring->trail_seq == --- -2.27.0 - diff --git a/queue/series b/queue/series index 109f13dc..35fd66b9 100644 --- a/queue/series +++ b/queue/series @@ -69,7 +69,6 @@ usb-dwc3-pci-add-support-for-the-Intel-Tiger-Lake-PC.patch usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch -drm-amdgpu-gfx10-fix-race-condition-for-kiq.patch drm-amdgpu-fix-preemption-unit-test.patch hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch platform-x86-ISST-Add-new-PCI-device-ids.patch |