Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fabb0e2a authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/legacy: move map_hash create/destroy into inlines 



This allows them to be removed later.

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

drivers/gpu/drm/drm_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ int drm_dev_init(struct drm_device *dev, 
	if (ret)

		goto err_minors;



	ret = drm_ht_create(&dev->map_hash, 12);

	ret = drm_legacy_create_map_hash(dev);

	if (ret)

		goto err_minors;
@@ -717,7 +717,7 @@ int drm_dev_init(struct drm_device *dev, 
		drm_gem_destroy(dev);

err_ctxbitmap:

	drm_legacy_ctxbitmap_cleanup(dev);

	drm_ht_remove(&dev->map_hash);

	drm_legacy_remove_map_hash(dev);

err_minors:

	drm_minor_free(dev, DRM_MINOR_PRIMARY);

	drm_minor_free(dev, DRM_MINOR_RENDER);
@@ -792,7 +792,7 @@ void drm_dev_fini(struct drm_device *dev) 
		drm_gem_destroy(dev);



	drm_legacy_ctxbitmap_cleanup(dev);

	drm_ht_remove(&dev->map_hash);

	drm_legacy_remove_map_hash(dev);

	drm_fs_inode_free(dev->anon_inode);



	drm_minor_free(dev, DRM_MINOR_PRIMARY);

drivers/gpu/drm/drm_legacy.h

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,16 @@ int drm_legacy_getsareactx(struct drm_device *d, void *v, struct drm_file *f); 


#define DRM_MAP_HASH_OFFSET 0x10000000



static inline int drm_legacy_create_map_hash(struct drm_device *dev)

{

	return drm_ht_create(&dev->map_hash, 12);

}



static inline void drm_legacy_remove_map_hash(struct drm_device *dev)

{

	drm_ht_remove(&dev->map_hash);

}



int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file_priv);

int drm_legacy_addmap_ioctl(struct drm_device *d, void *v, struct drm_file *f);