diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0254-drm-amdgpu-cleanup-comments-in-VM-code.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0254-drm-amdgpu-cleanup-comments-in-VM-code.patch | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0254-drm-amdgpu-cleanup-comments-in-VM-code.patch b/common/recipes-kernel/linux/files/0254-drm-amdgpu-cleanup-comments-in-VM-code.patch new file mode 100644 index 00000000..b03b9650 --- /dev/null +++ b/common/recipes-kernel/linux/files/0254-drm-amdgpu-cleanup-comments-in-VM-code.patch @@ -0,0 +1,142 @@ +From 240f49a4476ee24585442d8c0ed2a5880be62acc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 26 Jan 2016 12:17:11 +0100 +Subject: [PATCH 0254/1110] drm/amdgpu: cleanup comments in VM code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Neither the global nor the local mutex exists any more and +amdgpu doesn't support cayman. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Kayan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 +++++++++++------------------- + 1 file changed, 11 insertions(+), 19 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 6bf839f..21d918a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -55,7 +55,7 @@ + * + * @adev: amdgpu_device pointer + * +- * Calculate the number of page directory entries (cayman+). ++ * Calculate the number of page directory entries. + */ + static unsigned amdgpu_vm_num_pdes(struct amdgpu_device *adev) + { +@@ -67,7 +67,7 @@ static unsigned amdgpu_vm_num_pdes(struct amdgpu_device *adev) + * + * @adev: amdgpu_device pointer + * +- * Calculate the size of the page directory in bytes (cayman+). ++ * Calculate the size of the page directory in bytes. + */ + static unsigned amdgpu_vm_directory_size(struct amdgpu_device *adev) + { +@@ -162,8 +162,6 @@ void amdgpu_vm_move_pt_bos_in_lru(struct amdgpu_device *adev, + * @fence: fence protecting ID from reuse + * + * Allocate an id for the vm, adding fences to the sync obj as necessary. +- * +- * Global mutex must be locked! + */ + int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, + struct amdgpu_sync *sync, struct fence *fence) +@@ -223,9 +221,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, + * @vm: vm we want to flush + * @updates: last vm update that we waited for + * +- * Flush the vm (cayman+). +- * +- * Global and local mutex must be locked! ++ * Flush the vm. + */ + void amdgpu_vm_flush(struct amdgpu_ring *ring, + struct amdgpu_vm *vm, +@@ -260,7 +256,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, + * @vm: requested vm + * @bo: requested buffer object + * +- * Find @bo inside the requested vm (cayman+). ++ * Find @bo inside the requested vm. + * Search inside the @bos vm list for the requested vm + * Returns the found bo_va or NULL if none is found + * +@@ -432,10 +428,8 @@ uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr) + * @end: end of GPU address range + * + * Allocates new page tables if necessary +- * and updates the page directory (cayman+). ++ * and updates the page directory. + * Returns 0 for success, error for failure. +- * +- * Global and local mutex must be locked! + */ + int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, + struct amdgpu_vm *vm) +@@ -627,9 +621,7 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_device *adev, + * @dst: destination address to map to + * @flags: mapping flags + * +- * Update the page tables in the range @start - @end (cayman+). +- * +- * Global and local mutex must be locked! ++ * Update the page tables in the range @start - @end. + */ + static void amdgpu_vm_update_ptes(struct amdgpu_device *adev, + struct amdgpu_gart *gtt, +@@ -1013,7 +1005,7 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, + * @vm: requested vm + * @bo: amdgpu buffer object + * +- * Add @bo into the requested vm (cayman+). ++ * Add @bo into the requested vm. + * Add @bo to the list of bos associated with the vm + * Returns newly added bo_va or NULL for failure + * +@@ -1245,7 +1237,7 @@ int amdgpu_vm_bo_unmap(struct amdgpu_device *adev, + * @adev: amdgpu_device pointer + * @bo_va: requested bo_va + * +- * Remove @bo_va->bo from the requested vm (cayman+). ++ * Remove @bo_va->bo from the requested vm. + * + * Object have to be reserved! + */ +@@ -1290,7 +1282,7 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, + * @vm: requested vm + * @bo: amdgpu buffer object + * +- * Mark @bo as invalid (cayman+). ++ * Mark @bo as invalid. + */ + void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, + struct amdgpu_bo *bo) +@@ -1311,7 +1303,7 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, + * @adev: amdgpu_device pointer + * @vm: requested vm + * +- * Init @vm fields (cayman+). ++ * Init @vm fields. + */ + int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) + { +@@ -1372,7 +1364,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) + * @adev: amdgpu_device pointer + * @vm: requested vm + * +- * Tear down @vm (cayman+). ++ * Tear down @vm. + * Unbind the VM and remove all bos from the vm bo list + */ + void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) +-- +2.7.4 + |