Commit 83c163f7 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/legacy: place all drm legacy members under DRM_LEGACY. 



This places a bunch of the legacy members of drm_device into
only being there when legacy is enabled.

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

drivers/gpu/drm/drm_legacy.h

+9 −0
Original line number Diff line number Diff line
@@ -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)

include/drm/drm_device.h

+2 −1
Original line number Diff line number Diff line
@@ -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