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>

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index ee969e9de47231668fe2c8d9fb4274c8ff56f261..e88151b65c2230f9358ff3c4e8bc52be79f0a39f 100644 (file)
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -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;
 

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index 263fbef73fe50324118e8be5fa1969dcf769df93..233f114d21863d3d8bdb54ed606291b02b2ebdec 100644 (file)
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -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);

diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
index 6f08066ce68116093b56f8c3d0d57b937886b179..51f1fabfa145c792eba7841f7298c03e6d09c766 100644 (file)
--- a/drivers/gpu/drm/drm_legacy.h
+++ b/drivers/gpu/drm/drm_legacy.h
@@ -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__ */

diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy_misc.c
index 3616b169100772b09ea654e7add894d496026f8b..2fe786839ca854ef3c60b6254f79da8a8a511bf9 100644 (file)
--- a/drivers/gpu/drm/drm_legacy_misc.c
+++ b/drivers/gpu/drm/drm_legacy_misc.c
@@ -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);
+}

diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
index 86bff9841b54f2861b6617ad629105118ede2672..871008118bab23c3c79dacf3025841ded3996525 100644 (file)
--- a/include/drm/drm_auth.h
+++ b/include/drm/drm_auth.h
@@ -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);

diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index 6710b612e2f6f7050eab3885668da34822ef0579..67af60bb527a798b9aea6b7e5181a56600488c40 100644 (file)
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -335,7 +335,9 @@ struct drm_file {
        struct drm_prime_file_private prime;
 
        /* private: */
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
        unsigned long lock_count; /* DRI1 legacy lock count */
+#endif
 };
 
 /**