Commit c951a9b2 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Remove msm_gem_free_work 



Now that we don't need struct_mutex in the free path, we can get rid of
the asynchronous free altogether.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarKristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 25c49c83

drivers/gpu/drm/msm/msm_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -438,9 +438,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 


	priv->wq = alloc_ordered_workqueue("msm", 0);



	INIT_WORK(&priv->free_work, msm_gem_free_work);

	init_llist_head(&priv->free_list);



	INIT_LIST_HEAD(&priv->inactive_list);

	mutex_init(&priv->mm_lock);

drivers/gpu/drm/msm/msm_drv.h

+0 −5
Original line number Diff line number Diff line
@@ -188,10 +188,6 @@ struct msm_drm_private { 
	struct list_head inactive_list;

	struct mutex mm_lock;



	/* worker for delayed free of objects: */

	struct work_struct free_work;

	struct llist_head free_list;



	struct workqueue_struct *wq;



	unsigned int num_planes;
@@ -292,7 +288,6 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, 
		struct dma_buf_attachment *attach, struct sg_table *sg);

int msm_gem_prime_pin(struct drm_gem_object *obj);

void msm_gem_prime_unpin(struct drm_gem_object *obj);

void msm_gem_free_work(struct work_struct *work);



int msm_framebuffer_prepare(struct drm_framebuffer *fb,

		struct msm_gem_address_space *aspace);

drivers/gpu/drm/msm/msm_gem.c

+0 −27
Original line number Diff line number Diff line
@@ -938,16 +938,6 @@ void msm_gem_free_object(struct drm_gem_object *obj) 
	struct drm_device *dev = obj->dev;

	struct msm_drm_private *priv = dev->dev_private;



	if (llist_add(&msm_obj->freed, &priv->free_list))

		queue_work(priv->wq, &priv->free_work);

}



static void free_object(struct msm_gem_object *msm_obj)

{

	struct drm_gem_object *obj = &msm_obj->base;

	struct drm_device *dev = obj->dev;

	struct msm_drm_private *priv = dev->dev_private;



	/* object should not be on active list: */

	WARN_ON(is_active(msm_obj));
@@ -985,23 +975,6 @@ static void free_object(struct msm_gem_object *msm_obj) 
	kfree(msm_obj);

}



void msm_gem_free_work(struct work_struct *work)

{

	struct msm_drm_private *priv =

		container_of(work, struct msm_drm_private, free_work);

	struct llist_node *freed;

	struct msm_gem_object *msm_obj, *next;



	while ((freed = llist_del_all(&priv->free_list))) {

		llist_for_each_entry_safe(msm_obj, next,

					  freed, freed)

			free_object(msm_obj);



		if (need_resched())

			break;

	}

}



/* convenience method to construct a GEM buffer object, and userspace handle */

int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,

		uint32_t size, uint32_t flags, uint32_t *handle,

drivers/gpu/drm/msm/msm_gem.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ static inline bool is_vunmapable(struct msm_gem_object *msm_obj) 


void msm_gem_purge(struct drm_gem_object *obj);

void msm_gem_vunmap(struct drm_gem_object *obj);

void msm_gem_free_work(struct work_struct *work);



/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,

 * associated with the cmdstream submission for synchronization (and

CRA Git | Maintained and supported by SUSTech CRA and CCSE