diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-23 10:01:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-24 12:36:32 +1000 |
| commit | ee22f76306a68359c33809f8895eff603e71584b (patch) | |
| tree | 2a538cae03238976c2db300f1ee5fbbecbea0160 /include/drm | |
| parent | 83c163f7eb5948051b6fcb084ab3b81880c147dd (diff) | |
| download | linux-stable-ee22f76306a68359c33809f8895eff603e71584b.tar.gz linux-stable-ee22f76306a68359c33809f8895eff603e71584b.tar.bz2 linux-stable-ee22f76306a68359c33809f8895eff603e71584b.zip | |
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>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_auth.h | 6 | ||||
| -rw-r--r-- | include/drm/drm_file.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h index 86bff9841b54..871008118bab 100644 --- 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 6710b612e2f6..67af60bb527a 100644 --- 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 }; /** |