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 all together. Change-Id: I82406450e3a5d0d49d3fb753c621f55e8f4af088 Signed-off-by: Rob Clark <robdclark@chromium.org> Git-commit: c951a9b284b907604759628d273901064c60d09f Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
@@ -1010,16 +1010,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));
|
||||
|
||||
@@ -1062,27 +1052,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 drm_device *dev = priv->dev;
|
||||
struct llist_node *freed;
|
||||
struct msm_gem_object *msm_obj, *next;
|
||||
|
||||
while ((freed = llist_del_all(&priv->free_list))) {
|
||||
|
||||
mutex_lock(&dev->struct_mutex);
|
||||
|
||||
llist_for_each_entry_safe(msm_obj, next, freed, freed)
|
||||
free_object(msm_obj);
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
|
||||
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,
|
||||
|
Reference in New Issue
Block a user