diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1808-drm-amdgpu-KFD-Fix-for-amdgpu_mn_get-arguments-chang.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1808-drm-amdgpu-KFD-Fix-for-amdgpu_mn_get-arguments-chang.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1808-drm-amdgpu-KFD-Fix-for-amdgpu_mn_get-arguments-chang.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1808-drm-amdgpu-KFD-Fix-for-amdgpu_mn_get-arguments-chang.patch new file mode 100644 index 00000000..855b6a38 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1808-drm-amdgpu-KFD-Fix-for-amdgpu_mn_get-arguments-chang.patch @@ -0,0 +1,77 @@ +From 704113edf39e65cce39e97b62a6fbd27a89612a6 Mon Sep 17 00:00:00 2001 +From: "Le.Ma" <Le.Ma@amd.com> +Date: Wed, 20 Sep 2017 13:49:25 +0800 +Subject: [PATCH 1808/4131] drm/amdgpu: [KFD] Fix for amdgpu_mn_get() arguments + changed + +Change-Id: If4f2dae0a02b5498ff6bfe2982cfce1c7950e382 +Signed-off-by: Le.Ma <Le.Ma@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 5 ----- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 11 +++++++++-- + 3 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 447a423..7b8004e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -533,7 +533,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + p->bo_list->num_entries; + amdgpu_bo_list_get_list(p->bo_list, &p->validated); + if (p->bo_list->first_userptr != p->bo_list->num_entries) +- p->mn = amdgpu_mn_get(p->adev); ++ p->mn = amdgpu_mn_get(p->adev, AMDGPU_MN_TYPE_GFX); + } + + INIT_LIST_HEAD(&duplicates); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +index f8093c8..e21172ee 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +@@ -38,11 +38,6 @@ + #include "amdgpu.h" + #include "amdgpu_amdkfd.h" + +-enum amdgpu_mn_type { +- AMDGPU_MN_TYPE_GFX, +- AMDGPU_MN_TYPE_HSA, +-}; +- + struct amdgpu_mn { + /* constant after initialisation */ + struct amdgpu_device *adev; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h +index d0095a3..eb0f432 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h +@@ -29,16 +29,23 @@ + */ + struct amdgpu_mn; + ++enum amdgpu_mn_type { ++ AMDGPU_MN_TYPE_GFX, ++ AMDGPU_MN_TYPE_HSA, ++}; ++ + #if defined(CONFIG_MMU_NOTIFIER) + void amdgpu_mn_lock(struct amdgpu_mn *mn); + void amdgpu_mn_unlock(struct amdgpu_mn *mn); +-struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev); ++struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev, ++ enum amdgpu_mn_type type); + int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr); + void amdgpu_mn_unregister(struct amdgpu_bo *bo); + #else + static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {} + static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {} +-static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) ++static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev, ++ enum amdgpu_mn_type type) + { + return NULL; + } +-- +2.7.4 + |