diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5028-drm-amdgpu-move-bo_list-defines-to-amdgpu_bo_list.h.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5028-drm-amdgpu-move-bo_list-defines-to-amdgpu_bo_list.h.patch | 158 |
1 files changed, 158 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5028-drm-amdgpu-move-bo_list-defines-to-amdgpu_bo_list.h.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5028-drm-amdgpu-move-bo_list-defines-to-amdgpu_bo_list.h.patch new file mode 100644 index 00000000..94e029a7 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5028-drm-amdgpu-move-bo_list-defines-to-amdgpu_bo_list.h.patch @@ -0,0 +1,158 @@ +From e14abb0d9e3e5b0fdc4db51021a64b5cb5248c6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 30 Jul 2018 13:27:09 +0200 +Subject: [PATCH 5028/5725] drm/amdgpu: move bo_list defines to + amdgpu_bo_list.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Further demangle amdgpu.h + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Acked-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 40 +---------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 70 +++++++++++++++++++++++++++++ + 2 files changed, 71 insertions(+), 39 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 09d61b2..a6bde13 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -75,6 +75,7 @@ + #include "amdgpu_gart.h" + #include "amdgpu_debugfs.h" + #include "amdgpu_job.h" ++#include "amdgpu_bo_list.h" + + /* + * Modules parameters. +@@ -713,45 +714,6 @@ struct amdgpu_fpriv { + }; + + /* +- * residency list +- */ +-struct amdgpu_bo_list_entry { +- struct amdgpu_bo *robj; +- struct ttm_validate_buffer tv; +- struct amdgpu_bo_va *bo_va; +- uint32_t priority; +- struct page **user_pages; +- int user_invalidated; +-}; +- +-struct amdgpu_bo_list { +- struct mutex lock; +- struct rcu_head rhead; +- struct kref refcount; +- struct amdgpu_bo *gds_obj; +- struct amdgpu_bo *gws_obj; +- struct amdgpu_bo *oa_obj; +- unsigned first_userptr; +- unsigned num_entries; +- struct amdgpu_bo_list_entry *array; +-}; +- +-int amdgpu_bo_list_get(struct amdgpu_fpriv *fpriv, int id, +- struct amdgpu_bo_list **result); +-void amdgpu_bo_list_get_list(struct amdgpu_bo_list *list, +- struct list_head *validated); +-void amdgpu_bo_list_put(struct amdgpu_bo_list *list); +-void amdgpu_bo_list_free(struct amdgpu_bo_list *list); +-int amdgpu_bo_create_list_entry_array(struct drm_amdgpu_bo_list_in *in, +- struct drm_amdgpu_bo_list_entry **info_param); +- +-int amdgpu_bo_list_create(struct amdgpu_device *adev, +- struct drm_file *filp, +- struct drm_amdgpu_bo_list_entry *info, +- unsigned num_entries, +- struct amdgpu_bo_list **list); +- +-/* + * GFX stuff + */ + #include "clearstate_defs.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h +new file mode 100644 +index 0000000..833f846 +--- /dev/null ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h +@@ -0,0 +1,70 @@ ++/* ++ * Copyright 2018 Advanced Micro Devices, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++#ifndef __AMDGPU_BO_LIST_H__ ++#define __AMDGPU_BO_LIST_H__ ++ ++#include <drm/ttm/ttm_execbuf_util.h> ++#include <drm/amdgpu_drm.h> ++ ++struct amdgpu_device; ++struct amdgpu_bo; ++struct amdgpu_bo_va; ++struct amdgpu_fpriv; ++ ++struct amdgpu_bo_list_entry { ++ struct amdgpu_bo *robj; ++ struct ttm_validate_buffer tv; ++ struct amdgpu_bo_va *bo_va; ++ uint32_t priority; ++ struct page **user_pages; ++ int user_invalidated; ++}; ++ ++struct amdgpu_bo_list { ++ struct mutex lock; ++ struct rcu_head rhead; ++ struct kref refcount; ++ struct amdgpu_bo *gds_obj; ++ struct amdgpu_bo *gws_obj; ++ struct amdgpu_bo *oa_obj; ++ unsigned first_userptr; ++ unsigned num_entries; ++ struct amdgpu_bo_list_entry *array; ++}; ++ ++int amdgpu_bo_list_get(struct amdgpu_fpriv *fpriv, int id, ++ struct amdgpu_bo_list **result); ++void amdgpu_bo_list_get_list(struct amdgpu_bo_list *list, ++ struct list_head *validated); ++void amdgpu_bo_list_put(struct amdgpu_bo_list *list); ++void amdgpu_bo_list_free(struct amdgpu_bo_list *list); ++int amdgpu_bo_create_list_entry_array(struct drm_amdgpu_bo_list_in *in, ++ struct drm_amdgpu_bo_list_entry **info_param); ++ ++int amdgpu_bo_list_create(struct amdgpu_device *adev, ++ struct drm_file *filp, ++ struct drm_amdgpu_bo_list_entry *info, ++ unsigned num_entries, ++ struct amdgpu_bo_list **list); ++ ++#endif +-- +2.7.4 + |