diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0659-drm-amdgpu-remove-AMDGPU_FENCE_OWNER_MOVE.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0659-drm-amdgpu-remove-AMDGPU_FENCE_OWNER_MOVE.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0659-drm-amdgpu-remove-AMDGPU_FENCE_OWNER_MOVE.patch b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0659-drm-amdgpu-remove-AMDGPU_FENCE_OWNER_MOVE.patch new file mode 100644 index 00000000..3fe67076 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0659-drm-amdgpu-remove-AMDGPU_FENCE_OWNER_MOVE.patch @@ -0,0 +1,62 @@ +From 5525c7987c59beb301e6472df5404e4d453eba1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 27 Oct 2015 17:28:24 +0100 +Subject: [PATCH 0659/1050] drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Moves are exclusive operations anyway, just use the undefined owner for those. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index a93f6cb..81766db7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -405,7 +405,6 @@ struct amdgpu_fence_driver { + /* some special values for the owner field */ + #define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul) + #define AMDGPU_FENCE_OWNER_VM ((void*)1ul) +-#define AMDGPU_FENCE_OWNER_MOVE ((void*)2ul) + + #define AMDGPU_FENCE_FLAG_64BIT (1 << 0) + #define AMDGPU_FENCE_FLAG_INT (1 << 1) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +index c6489b1..a6697fd 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +@@ -191,8 +191,8 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, + * for other VM updates and moves. + */ + fence_owner = amdgpu_sync_get_owner(f); +- if ((owner != AMDGPU_FENCE_OWNER_MOVE) && +- (fence_owner != AMDGPU_FENCE_OWNER_MOVE) && ++ if ((owner != AMDGPU_FENCE_OWNER_UNDEFINED) && ++ (fence_owner != AMDGPU_FENCE_OWNER_UNDEFINED) && + ((owner == AMDGPU_FENCE_OWNER_VM) != + (fence_owner == AMDGPU_FENCE_OWNER_VM))) + continue; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index a089e69..81bb8e9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -1041,7 +1041,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, + WARN_ON(ib->length_dw > num_dw); + r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, + &amdgpu_vm_free_job, +- AMDGPU_FENCE_OWNER_MOVE, ++ AMDGPU_FENCE_OWNER_UNDEFINED, + fence); + if (r) + goto error_free; +-- +1.9.1 + |