Unverified Commit 966ccf7e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4631 Add kabi reserve 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Wensheng <wangwensheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y7WDZCGTKYJXYXL2OJE46CK5GAXYBNCH/ 
Wang Wensheng (11):
  delayacct: Reserve kabi for task_delay_info
  xarray: Reserve kabi for xa_state
  sbitmap: Add kabi reserve
  drm: Add kabi reserve in drm_plane.h
  drm: Add kabi reserve in drm_syncobj.h
  drm: Add kabi reserve in drm_gpu_scheduler.h
  drm/ttm: Add kabi reserve in ttm_bo.h
  drm/ttm: Add kabi reserve in ttm_resource.h
  drm/ttm: Add kabi reserve in ttm_tt.h


-- 
2.17.1
 
https://gitee.com/openeuler/kernel/issues/I9244H 
 
Link:https://gitee.com/openeuler/kernel/pulls/4631

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 8d757f98 ebd632ef

include/drm/drm_mode_config.h

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/idr.h>

#include <linux/workqueue.h>

#include <linux/llist.h>

#include <linux/kabi.h>



#include <drm/drm_modeset_lock.h>
@@ -955,6 +956,10 @@ struct drm_mode_config { 
	struct drm_atomic_state *suspend_state;



	const struct drm_mode_config_helper_funcs *helper_private;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



int __must_check drmm_mode_config_init(struct drm_device *dev);

include/drm/drm_modeset_lock.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/types.h> /* stackdepot.h is not self-contained */

#include <linux/stackdepot.h>

#include <linux/ww_mutex.h>

#include <linux/kabi.h>



struct drm_modeset_lock;
@@ -72,6 +73,8 @@ struct drm_modeset_acquire_ctx { 


	/* Perform interruptible waits on this context. */

	bool interruptible;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/**

include/drm/drm_plane.h

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <linux/list.h>

#include <linux/ctype.h>

#include <linux/kabi.h>

#include <drm/drm_mode_object.h>

#include <drm/drm_color_mgmt.h>

#include <drm/drm_rect.h>
@@ -237,6 +238,10 @@ struct drm_plane_state { 


	/** @state: backpointer to global drm_atomic_state */

	struct drm_atomic_state *state;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



static inline struct drm_rect
@@ -748,6 +753,10 @@ struct drm_plane { 
	 * scaling.

	 */

	struct drm_property *scaling_filter_property;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



#define obj_to_plane(x) container_of(x, struct drm_plane, base)

include/drm/drm_syncobj.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <linux/dma-fence.h>

#include <linux/dma-fence-chain.h>

#include <linux/kabi.h>



struct drm_file;
@@ -65,6 +66,8 @@ struct drm_syncobj { 
	 * @file: A file backing for this syncobj.

	 */

	struct file *file;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



void drm_syncobj_free(struct kref *kref);

include/drm/gpu_scheduler.h

+15 −0
Original line number Diff line number Diff line
@@ -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,