aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch')
-rw-r--r--common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch b/common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch
deleted file mode 100644
index 26732963..00000000
--- a/common/recipes-kernel/linux/files/0270-drm-amdgpu-remove-adev-and-fence-from-amdgpu_sync_fr.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From fc26c19008cd8d48631d3088ce310951fb529327 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Wed, 3 Feb 2016 15:11:39 +0100
-Subject: [PATCH 0270/1110] drm/amdgpu: remove adev and fence from
- amdgpu_sync_free
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just leftovers from the semaphores.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +--
- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 6 +-----
- 3 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 473b447..7be8689 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -604,8 +604,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
- void *owner);
- struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync);
- int amdgpu_sync_wait(struct amdgpu_sync *sync);
--void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync,
-- struct fence *fence);
-+void amdgpu_sync_free(struct amdgpu_sync *sync);
-
- /*
- * GART structures, functions & helpers
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-index 40c9779..d7cd408 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-@@ -93,7 +93,7 @@ int amdgpu_ib_get(struct amdgpu_ring *ring, struct amdgpu_vm *vm,
- */
- void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)
- {
-- amdgpu_sync_free(adev, &ib->sync, &ib->fence->base);
-+ amdgpu_sync_free(&ib->sync);
- amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base);
- if (ib->fence)
- fence_put(&ib->fence->base);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-index 1d348f8..c15be00 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-@@ -240,15 +240,11 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync)
- /**
- * amdgpu_sync_free - free the sync object
- *
-- * @adev: amdgpu_device pointer
- * @sync: sync object to use
-- * @fence: fence to use for the free
- *
- * Free the sync object.
- */
--void amdgpu_sync_free(struct amdgpu_device *adev,
-- struct amdgpu_sync *sync,
-- struct fence *fence)
-+void amdgpu_sync_free(struct amdgpu_sync *sync)
- {
- struct amdgpu_sync_entry *e;
- struct hlist_node *tmp;
---
-2.7.4
-