diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:46:58 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:46:58 -0400 |
| commit | 6f3b79fb1084e9c90b3c7582d0ad0ae0b5fee42d (patch) | |
| tree | b0ff4e207176367b741d2cac23ad1179cc51a6da | |
| parent | 3dff3fb82fa9059f40eb61427d40719ba0f211e4 (diff) | |
| download | longterm-queue-4.12-6f3b79fb1084e9c90b3c7582d0ad0ae0b5fee42d.tar.gz | |
drm: drop amd patch n/a for 4.12.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-amdgpu-bypass-lru-touch-for-KIQ-ring-submission.patch | 38 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/queue/drm-amdgpu-bypass-lru-touch-for-KIQ-ring-submission.patch b/queue/drm-amdgpu-bypass-lru-touch-for-KIQ-ring-submission.patch deleted file mode 100644 index 9b53cb9..0000000 --- a/queue/drm-amdgpu-bypass-lru-touch-for-KIQ-ring-submission.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dce1e131dd4dc68099ff1b70aa03cd2d0acf8639 Mon Sep 17 00:00:00 2001 -From: Pixel Ding <Pixel.Ding@amd.com> -Date: Wed, 8 Nov 2017 10:20:01 +0800 -Subject: [PATCH] drm/amdgpu: bypass lru touch for KIQ ring submission -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit dce1e131dd4dc68099ff1b70aa03cd2d0acf8639 upstream. - -KIQ ring submission is used for register accessing on SRIOV -VF that could happen both in irq enabled and irq disabled cases. -Inversion lock could happen on adev->ring_lru_list_lock, while -this operation is useless and just adds overhead in this use -case. - -Signed-off-by: Pixel Ding <Pixel.Ding@amd.com> -Reviewed-by: Monk Liu <Monk.Liu@amd.com> -Reviewed-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/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -index e5ece1fae149..a98fbbb4739f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -@@ -136,7 +136,8 @@ void amdgpu_ring_commit(struct amdgpu_ring *ring) - if (ring->funcs->end_use) - ring->funcs->end_use(ring); - -- amdgpu_ring_lru_touch(ring->adev, ring); -+ if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) -+ amdgpu_ring_lru_touch(ring->adev, ring); - } - - /** --- -2.15.0 - diff --git a/queue/series b/queue/series index 4c4ec55..573f111 100644 --- a/queue/series +++ b/queue/series @@ -28,7 +28,6 @@ video-fbdev-au1200fb-Release-some-resources-if-a-mem.patch video-fbdev-au1200fb-Return-an-error-code-if-a-memor.patch rtc-pcf8563-fix-output-clock-rate.patch scsi-aacraid-use-timespec64-instead-of-timeval.patch -drm-amdgpu-bypass-lru-touch-for-KIQ-ring-submission.patch PM-s2idle-Clear-the-events_check_enabled-flag.patch ASoC-Intel-Skylake-Fix-uuid_module-memory-leak-in-fa.patch dmaengine-ti-dma-crossbar-Correct-am335x-am43xx-mux-.patch |