hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9244H
---------------------------
Reserve space for drm_sched_entity, drm_sched_rq, drm_sched_fence, drm_sched_job and drm_gpu_scheduler in drm_gpu_scheduler.h.
Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- include/drm/gpu_scheduler.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index ac65f0626cfc..7585eb06a2b9 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -29,6 +29,7 @@ #include <linux/completion.h> #include <linux/xarray.h> #include <linux/workqueue.h> +#include <linux/kabi.h>
#define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
@@ -238,6 +239,10 @@ struct drm_sched_entity { */ struct rb_node rb_tree_node;
+ KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/** @@ -259,6 +264,8 @@ struct drm_sched_rq { struct list_head entities; struct drm_sched_entity *current_entity; struct rb_root_cached rb_tree_root; + KABI_RESERVE(1) + KABI_RESERVE(2) };
/** @@ -308,6 +315,8 @@ struct drm_sched_fence { * @owner: job owner for debugging */ void *owner; + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f); @@ -371,6 +380,8 @@ struct drm_sched_job { * When the job was pushed into the entity queue. */ ktime_t submit_ts; + KABI_RESERVE(1) + KABI_RESERVE(2) };
static inline bool drm_sched_invalidate_job(struct drm_sched_job *s_job, @@ -516,6 +527,10 @@ struct drm_gpu_scheduler { bool ready; bool free_guilty; struct device *dev; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
int drm_sched_init(struct drm_gpu_scheduler *sched,