Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

+19 -5
+1 -2
drivers/gpu/drm/drm_auth.c
··· 103 103 return NULL; 104 104 105 105 kref_init(&master->refcount); 106 - spin_lock_init(&master->lock.spinlock); 107 - init_waitqueue_head(&master->lock.lock_queue); 106 + drm_master_legacy_init(master); 108 107 idr_init(&master->magic_map); 109 108 master->dev = dev; 110 109
-1
drivers/gpu/drm/drm_file.c
··· 128 128 129 129 /* for compatibility root is always authenticated */ 130 130 file->authenticated = capable(CAP_SYS_ADMIN); 131 - file->lock_count = 0; 132 131 133 132 INIT_LIST_HEAD(&file->lhead); 134 133 INIT_LIST_HEAD(&file->fbs);
+6
drivers/gpu/drm/drm_legacy.h
··· 199 199 static inline void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master) {} 200 200 #endif 201 201 202 + #if IS_ENABLED(CONFIG_DRM_LEGACY) 203 + void drm_master_legacy_init(struct drm_master *master); 204 + #else 205 + static inline void drm_master_legacy_init(struct drm_master *master) {} 206 + #endif 207 + 202 208 #endif /* __DRM_LEGACY_H__ */
+6
drivers/gpu/drm/drm_legacy_misc.c
··· 74 74 75 75 DRM_DEBUG("lastclose completed\n"); 76 76 } 77 + 78 + void drm_master_legacy_init(struct drm_master *master) 79 + { 80 + spin_lock_init(&master->lock.spinlock); 81 + init_waitqueue_head(&master->lock.lock_queue); 82 + }
+4 -2
include/drm/drm_auth.h
··· 50 50 * 51 51 * @refcount: Refcount for this master object. 52 52 * @dev: Link back to the DRM device 53 - * @lock: DRI1 lock information. 54 53 * @driver_priv: Pointer to driver-private information. 55 54 * @lessor: Lease holder 56 55 * @lessee_id: id for lessees. Owners always have id 0 ··· 79 80 * &drm_device.master_mutex. 80 81 */ 81 82 struct idr magic_map; 82 - struct drm_lock_data lock; 83 83 void *driver_priv; 84 84 85 85 /* Tree of display resource leases, each of which is a drm_master struct ··· 93 95 struct list_head lessees; 94 96 struct idr leases; 95 97 struct idr lessee_idr; 98 + /* private: */ 99 + #if IS_ENABLED(CONFIG_DRM_LEGACY) 100 + struct drm_lock_data lock; 101 + #endif 96 102 }; 97 103 98 104 struct drm_master *drm_master_get(struct drm_master *master);
+2
include/drm/drm_file.h
··· 335 335 struct drm_prime_file_private prime; 336 336 337 337 /* private: */ 338 + #if IS_ENABLED(CONFIG_DRM_LEGACY) 338 339 unsigned long lock_count; /* DRI1 legacy lock count */ 340 + #endif 339 341 }; 340 342 341 343 /**