lkml.org 
[lkml]   [2022]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/15] drm/msm/gem: Rename update_inactive
    Date
    From: Rob Clark <robdclark@chromium.org>

    Really what this is doing is updating various LRU lists.

    Signed-off-by: Rob Clark <robdclark@chromium.org>
    ---
    drivers/gpu/drm/msm/msm_gem.c | 25 +++++++++++++------------
    1 file changed, 13 insertions(+), 12 deletions(-)

    diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
    index b55d252aef17..97467364dc0a 100644
    --- a/drivers/gpu/drm/msm/msm_gem.c
    +++ b/drivers/gpu/drm/msm/msm_gem.c
    @@ -19,7 +19,7 @@
    #include "msm_gpu.h"
    #include "msm_mmu.h"

    -static void update_inactive(struct msm_gem_object *msm_obj);
    +static void update_lru(struct drm_gem_object *obj);

    static dma_addr_t physaddr(struct drm_gem_object *obj)
    {
    @@ -132,7 +132,7 @@ static struct page **get_pages(struct drm_gem_object *obj)
    if (msm_obj->flags & MSM_BO_WC)
    sync_for_device(msm_obj);

    - update_inactive(msm_obj);
    + update_lru(obj);
    }

    return msm_obj->pages;
    @@ -193,7 +193,7 @@ struct page **msm_gem_get_pages(struct drm_gem_object *obj)

    if (!IS_ERR(p)) {
    msm_obj->pin_count++;
    - update_inactive(msm_obj);
    + update_lru(obj);
    }

    msm_gem_unlock(obj);
    @@ -207,7 +207,7 @@ void msm_gem_put_pages(struct drm_gem_object *obj)
    msm_gem_lock(obj);
    msm_obj->pin_count--;
    GEM_WARN_ON(msm_obj->pin_count < 0);
    - update_inactive(msm_obj);
    + update_lru(obj);
    msm_gem_unlock(obj);
    }

    @@ -449,7 +449,7 @@ void msm_gem_unpin_locked(struct drm_gem_object *obj)
    msm_obj->pin_count--;
    GEM_WARN_ON(msm_obj->pin_count < 0);

    - update_inactive(msm_obj);
    + update_lru(obj);
    }

    struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj,
    @@ -658,7 +658,7 @@ static void *get_vaddr(struct drm_gem_object *obj, unsigned madv)
    goto fail;
    }

    - update_inactive(msm_obj);
    + update_lru(obj);
    }

    return msm_obj->vaddr;
    @@ -730,7 +730,7 @@ int msm_gem_madvise(struct drm_gem_object *obj, unsigned madv)
    * between inactive lists
    */
    if (msm_obj->active_count == 0)
    - update_inactive(msm_obj);
    + update_lru(obj);

    msm_gem_unlock(obj);

    @@ -757,7 +757,7 @@ void msm_gem_purge(struct drm_gem_object *obj)
    put_iova_vmas(obj);

    msm_obj->madv = __MSM_MADV_PURGED;
    - update_inactive(msm_obj);
    + update_lru(obj);

    drm_gem_free_mmap_offset(obj);

    @@ -792,7 +792,7 @@ void msm_gem_evict(struct drm_gem_object *obj)

    put_pages(obj);

    - update_inactive(msm_obj);
    + update_lru(obj);
    }

    void msm_gem_vunmap(struct drm_gem_object *obj)
    @@ -835,13 +835,14 @@ void msm_gem_active_put(struct drm_gem_object *obj)
    GEM_WARN_ON(!msm_gem_is_locked(obj));

    if (--msm_obj->active_count == 0) {
    - update_inactive(msm_obj);
    + update_lru(obj);
    }
    }

    -static void update_inactive(struct msm_gem_object *msm_obj)
    +static void update_lru(struct drm_gem_object *obj)
    {
    - struct msm_drm_private *priv = msm_obj->base.dev->dev_private;
    + struct msm_drm_private *priv = obj->dev->dev_private;
    + struct msm_gem_object *msm_obj = to_msm_bo(obj);

    GEM_WARN_ON(!msm_gem_is_locked(&msm_obj->base));

    --
    2.36.1
    \
     
     \ /
      Last update: 2022-06-26 00:55    [W:4.344 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site