Commit ee22f763 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/legacy: remove some legacy lock struct members 



This removes these unless legacy is enabled.

The lock count init is unneeded anyways since it's kzalloc.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 83c163f7

drivers/gpu/drm/drm_auth.c

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ struct drm_master *drm_master_create(struct drm_device *dev) 
		return NULL;



	kref_init(&master->refcount);

	spin_lock_init(&master->lock.spinlock);

	init_waitqueue_head(&master->lock.lock_queue);

	drm_master_legacy_init(master);

	idr_init(&master->magic_map);

	master->dev = dev;

drivers/gpu/drm/drm_file.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor) 


	/* for compatibility root is always authenticated */

	file->authenticated = capable(CAP_SYS_ADMIN);

	file->lock_count = 0;



	INIT_LIST_HEAD(&file->lhead);

	INIT_LIST_HEAD(&file->fbs);

drivers/gpu/drm/drm_legacy.h

+6 −0
Original line number Diff line number Diff line
@@ -199,4 +199,10 @@ void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *m 
static inline void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master) {}

#endif



#if IS_ENABLED(CONFIG_DRM_LEGACY)

void drm_master_legacy_init(struct drm_master *master);

#else

static inline void drm_master_legacy_init(struct drm_master *master) {}

#endif



#endif /* __DRM_LEGACY_H__ */

drivers/gpu/drm/drm_legacy_misc.c

+6 −0
Original line number Diff line number Diff line
@@ -74,3 +74,9 @@ void drm_legacy_dev_reinit(struct drm_device *dev) 


	DRM_DEBUG("lastclose completed\n");

}



void drm_master_legacy_init(struct drm_master *master)

{

	spin_lock_init(&master->lock.spinlock);

	init_waitqueue_head(&master->lock.lock_queue);

}

include/drm/drm_auth.h

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct drm_lock_data { 
 *

 * @refcount: Refcount for this master object.

 * @dev: Link back to the DRM device

 * @lock: DRI1 lock information.

 * @driver_priv: Pointer to driver-private information.

 * @lessor: Lease holder

 * @lessee_id: id for lessees. Owners always have id 0
@@ -80,7 +79,6 @@ struct drm_master { 
	 * &drm_device.master_mutex.

	 */

	struct idr magic_map;

	struct drm_lock_data lock;

	void *driver_priv;



	/* Tree of display resource leases, each of which is a drm_master struct
@@ -95,6 +93,10 @@ struct drm_master { 
	struct list_head lessees;

	struct idr leases;

	struct idr lessee_idr;

	/* private: */

#if IS_ENABLED(CONFIG_DRM_LEGACY)

	struct drm_lock_data lock;

#endif

};



struct drm_master *drm_master_get(struct drm_master *master);