aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch89
1 files changed, 89 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch
new file mode 100644
index 00000000..091c2dc7
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0921-drm-amdgpu-move-amdgpu_ttm_tt_-declarations-into-amd.patch
@@ -0,0 +1,89 @@
+From 6391a0af5da5fe2259ff5e4265cb9aa28219453b Mon Sep 17 00:00:00 2001
+From: Christian Koenig <christian.koenig@amd.com>
+Date: Fri, 8 Sep 2017 17:19:19 +0200
+Subject: [PATCH 0921/4131] drm/amdgpu: move amdgpu_ttm_tt_* declarations into
+ amdgpu_ttm.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Just some cleanup.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 15 ---------------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 3 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 ++++++++++++++++
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index 547fc1a..e2c97b6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -1865,21 +1865,6 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,
+ u64 num_vis_bytes);
+ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain);
+ bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);
+-int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);
+-void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages);
+-void amdgpu_ttm_tt_mark_user_pages(struct ttm_tt *ttm);
+-int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
+- uint32_t flags);
+-bool amdgpu_ttm_tt_has_userptr(struct ttm_tt *ttm);
+-struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm);
+-bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
+- unsigned long end);
+-bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm,
+- int *last_invalidated);
+-bool amdgpu_ttm_tt_userptr_needs_pages(struct ttm_tt *ttm);
+-bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);
+-uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
+- struct ttm_mem_reg *mem);
+ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base);
+ void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc);
+ void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+index 89d45aa..d25ec38 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+@@ -254,8 +254,7 @@ static const struct mmu_notifier_ops amdgpu_mn_ops = {
+ *
+ * Creates a notifier context for current->mm.
+ */
+-struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev,
+- enum amdgpu_mn_type type)
++struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev)
+ {
+ struct mm_struct *mm = current->mm;
+ struct amdgpu_mn *rmn;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+index 07dc856..d065700 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+@@ -89,4 +89,20 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
+ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
+ int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
+
++int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);
++void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages);
++void amdgpu_ttm_tt_mark_user_pages(struct ttm_tt *ttm);
++int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
++ uint32_t flags);
++bool amdgpu_ttm_tt_has_userptr(struct ttm_tt *ttm);
++struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm);
++bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
++ unsigned long end);
++bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm,
++ int *last_invalidated);
++bool amdgpu_ttm_tt_userptr_needs_pages(struct ttm_tt *ttm);
++bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);
++uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
++ struct ttm_mem_reg *mem);
++
+ #endif
+--
+2.7.4
+