lkml.org 
[lkml]   [2020]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 20/23] drm/msm: Remove msm_gem_free_work
    Date
    From: Rob Clark <robdclark@chromium.org>

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

    Signed-off-by: Rob Clark <robdclark@chromium.org>
    ---
    drivers/gpu/drm/msm/msm_drv.c | 3 ---
    drivers/gpu/drm/msm/msm_drv.h | 5 -----
    drivers/gpu/drm/msm/msm_gem.c | 27 ---------------------------
    drivers/gpu/drm/msm/msm_gem.h | 1 -
    4 files changed, 36 deletions(-)

    diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
    index 15c41786d018..ebcd8e827363 100644
    --- a/drivers/gpu/drm/msm/msm_drv.c
    +++ b/drivers/gpu/drm/msm/msm_drv.c
    @@ -465,9 +465,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);

    diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
    index 7e6fb4af4964..5308e636a90c 100644
    --- a/drivers/gpu/drm/msm/msm_drv.h
    +++ b/drivers/gpu/drm/msm/msm_drv.h
    @@ -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;
    @@ -291,7 +287,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);
    diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
    index af1abddca78e..827c7397ed12 100644
    --- a/drivers/gpu/drm/msm/msm_gem.c
    +++ b/drivers/gpu/drm/msm/msm_gem.c
    @@ -939,16 +939,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));

    @@ -981,23 +971,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,
    diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
    index f4e73c6f07bf..ffa2130ee97d 100644
    --- a/drivers/gpu/drm/msm/msm_gem.h
    +++ b/drivers/gpu/drm/msm/msm_gem.h
    @@ -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
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-10-19 22:47    [W:4.417 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site