diff options
| -rw-r--r-- | drivers/gpu/drm/drm_legacy.h | 9 | ||||
| -rw-r--r-- | include/drm/drm_device.h | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index 0400ed19190e..6f08066ce681 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h @@ -72,6 +72,7 @@ int drm_legacy_getsareactx(struct drm_device *d, void *v, struct drm_file *f); #define DRM_MAP_HASH_OFFSET 0x10000000 +#if IS_ENABLED(CONFIG_DRM_LEGACY) static inline int drm_legacy_create_map_hash(struct drm_device *dev) { return drm_ht_create(&dev->map_hash, 12); @@ -81,6 +82,14 @@ static inline void drm_legacy_remove_map_hash(struct drm_device *dev) { drm_ht_remove(&dev->map_hash); } +#else +static inline int drm_legacy_create_map_hash(struct drm_device *dev) +{ + return 0; +} + +static inline void drm_legacy_remove_map_hash(struct drm_device *dev) {} +#endif #if IS_ENABLED(CONFIG_DRM_LEGACY) diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index d5e092dccf3e..7f9ef709b2b6 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -306,7 +306,7 @@ struct drm_device { /* Everything below here is for legacy driver, never use! */ /* private: */ - +#if IS_ENABLED(CONFIG_DRM_LEGACY) /* Context handle management - linked list of context handles */ struct list_head ctxlist; @@ -353,6 +353,7 @@ struct drm_device { /* Scatter gather memory */ struct drm_sg_mem *sg; +#endif }; #endif |