lkml.org 
[lkml]   [2017]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/29] drm/msm: switch to drm_*_get(), drm_*_put() helpers
    Date
    Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference()
    and drm_*_unreference() helpers.

    drm_*_reference() and drm_*_unreference() functions are just
    compatibility alias for drm_*_get() and drm_*_put() and should not be
    used by new code. So convert all users of compatibility functions to
    use the new APIs.

    Generated by: scripts/coccinelle/api/drm-get-put.cocci

    Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
    ---
    drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 +++++-----
    drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
    drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
    drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +++---
    drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +-
    drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
    drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 ++--
    drivers/gpu/drm/msm/msm_drv.c | 8 ++++----
    drivers/gpu/drm/msm/msm_fb.c | 4 ++--
    drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
    drivers/gpu/drm/msm/msm_gem.c | 8 ++++----
    drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++--
    drivers/gpu/drm/msm/msm_gpu.c | 4 ++--
    drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +-
    14 files changed, 30 insertions(+), 30 deletions(-)

    diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
    index b4b54f1..12d0f9c 100644
    --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
    +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
    @@ -303,7 +303,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,

    ptr = msm_gem_get_vaddr(bo);
    if (!ptr) {
    - drm_gem_object_unreference(bo);
    + drm_gem_object_put(bo);
    return ERR_PTR(-ENOMEM);
    }

    @@ -311,7 +311,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,
    int ret = msm_gem_get_iova(bo, gpu->aspace, iova);

    if (ret) {
    - drm_gem_object_unreference(bo);
    + drm_gem_object_put(bo);
    return ERR_PTR(ret);
    }
    }
    @@ -697,19 +697,19 @@ static void a5xx_destroy(struct msm_gpu *gpu)
    if (a5xx_gpu->pm4_bo) {
    if (a5xx_gpu->pm4_iova)
    msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace);
    - drm_gem_object_unreference_unlocked(a5xx_gpu->pm4_bo);
    + drm_gem_object_put_unlocked(a5xx_gpu->pm4_bo);
    }

    if (a5xx_gpu->pfp_bo) {
    if (a5xx_gpu->pfp_iova)
    msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace);
    - drm_gem_object_unreference_unlocked(a5xx_gpu->pfp_bo);
    + drm_gem_object_put_unlocked(a5xx_gpu->pfp_bo);
    }

    if (a5xx_gpu->gpmu_bo) {
    if (a5xx_gpu->gpmu_iova)
    msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace);
    - drm_gem_object_unreference_unlocked(a5xx_gpu->gpmu_bo);
    + drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo);
    }

    adreno_gpu_cleanup(adreno_gpu);
    diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c
    index 87af6ee..3333620 100644
    --- a/drivers/gpu/drm/msm/adreno/a5xx_power.c
    +++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c
    @@ -330,7 +330,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
    if (a5xx_gpu->gpmu_iova)
    msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace);
    if (a5xx_gpu->gpmu_bo)
    - drm_gem_object_unreference(a5xx_gpu->gpmu_bo);
    + drm_gem_object_put(a5xx_gpu->gpmu_bo);

    a5xx_gpu->gpmu_bo = NULL;
    a5xx_gpu->gpmu_iova = 0;
    diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    index f1ab270..15de821 100644
    --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    @@ -433,7 +433,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)
    if (adreno_gpu->memptrs_iova)
    msm_gem_put_iova(adreno_gpu->memptrs_bo, gpu->aspace);

    - drm_gem_object_unreference_unlocked(adreno_gpu->memptrs_bo);
    + drm_gem_object_put_unlocked(adreno_gpu->memptrs_bo);
    }
    release_firmware(adreno_gpu->pm4);
    release_firmware(adreno_gpu->pfp);
    diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
    index 615e1de..4680b70 100644
    --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
    +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
    @@ -129,7 +129,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)
    struct msm_kms *kms = &mdp4_kms->base.base;

    msm_gem_put_iova(val, kms->aspace);
    - drm_gem_object_unreference_unlocked(val);
    + drm_gem_object_put_unlocked(val);
    }

    static void mdp4_crtc_destroy(struct drm_crtc *crtc)
    @@ -373,7 +373,7 @@ static void update_cursor(struct drm_crtc *crtc)

    if (next_bo) {
    /* take a obj ref + iova ref when we start scanning out: */
    - drm_gem_object_reference(next_bo);
    + drm_gem_object_get(next_bo);
    msm_gem_get_iova(next_bo, kms->aspace, &iova);

    /* enable cursor: */
    @@ -458,7 +458,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc,
    return 0;

    fail:
    - drm_gem_object_unreference_unlocked(cursor_bo);
    + drm_gem_object_put_unlocked(cursor_bo);
    return ret;
    }

    diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
    index bcd1f5c..b331f40 100644
    --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
    +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
    @@ -164,7 +164,7 @@ static void mdp4_destroy(struct msm_kms *kms)

    if (mdp4_kms->blank_cursor_iova)
    msm_gem_put_iova(mdp4_kms->blank_cursor_bo, kms->aspace);
    - drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo);
    + drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);

    if (aspace) {
    aspace->mmu->funcs->detach(aspace->mmu,
    diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
    index cb5415d..6781d8f 100644
    --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
    +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
    @@ -163,7 +163,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)
    struct msm_kms *kms = &mdp5_kms->base.base;

    msm_gem_put_iova(val, kms->aspace);
    - drm_gem_object_unreference_unlocked(val);
    + drm_gem_object_put_unlocked(val);
    }

    static void mdp5_crtc_destroy(struct drm_crtc *crtc)
    diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
    index fe3a4de..77926cc 100644
    --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
    +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
    @@ -194,7 +194,7 @@ static void mdp5_plane_reset(struct drm_plane *plane)
    struct mdp5_plane_state *mdp5_state;

    if (plane->state && plane->state->fb)
    - drm_framebuffer_unreference(plane->state->fb);
    + drm_framebuffer_put(plane->state->fb);

    kfree(to_mdp5_plane_state(plane->state));
    mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
    @@ -237,7 +237,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane,
    struct mdp5_plane_state *pstate = to_mdp5_plane_state(state);

    if (state->fb)
    - drm_framebuffer_unreference(state->fb);
    + drm_framebuffer_put(state->fb);

    kfree(pstate);
    }
    diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
    index f49f6ac..ba3c581 100644
    --- a/drivers/gpu/drm/msm/msm_drv.c
    +++ b/drivers/gpu/drm/msm/msm_drv.c
    @@ -664,7 +664,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,

    ret = msm_gem_cpu_prep(obj, args->op, &timeout);

    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);

    return ret;
    }
    @@ -682,7 +682,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,

    ret = msm_gem_cpu_fini(obj);

    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);

    return ret;
    }
    @@ -722,7 +722,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
    args->offset = msm_gem_mmap_offset(obj);
    }

    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);

    return ret;
    }
    @@ -776,7 +776,7 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data,
    ret = 0;
    }

    - drm_gem_object_unreference(obj);
    + drm_gem_object_put(obj);

    unlock:
    mutex_unlock(&dev->struct_mutex);
    diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
    index 6ecb7b1..0a2b4bb 100644
    --- a/drivers/gpu/drm/msm/msm_fb.c
    +++ b/drivers/gpu/drm/msm/msm_fb.c
    @@ -50,7 +50,7 @@ static void msm_framebuffer_destroy(struct drm_framebuffer *fb)
    for (i = 0; i < n; i++) {
    struct drm_gem_object *bo = msm_fb->planes[i];

    - drm_gem_object_unreference_unlocked(bo);
    + drm_gem_object_put_unlocked(bo);
    }

    kfree(msm_fb);
    @@ -157,7 +157,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,

    out_unref:
    for (i = 0; i < n; i++)
    - drm_gem_object_unreference_unlocked(bos[i]);
    + drm_gem_object_put_unlocked(bos[i]);
    return ERR_PTR(ret);
    }

    diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
    index 5ecf4ff..53d122c 100644
    --- a/drivers/gpu/drm/msm/msm_fbdev.c
    +++ b/drivers/gpu/drm/msm/msm_fbdev.c
    @@ -112,7 +112,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
    /* note: if fb creation failed, we can't rely on fb destroy
    * to unref the bo:
    */
    - drm_gem_object_unreference_unlocked(fbdev->bo);
    + drm_gem_object_put_unlocked(fbdev->bo);
    ret = PTR_ERR(fb);
    goto fail;
    }
    diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
    index 65f3554..98dbf22 100644
    --- a/drivers/gpu/drm/msm/msm_gem.c
    +++ b/drivers/gpu/drm/msm/msm_gem.c
    @@ -462,7 +462,7 @@ int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,

    *offset = msm_gem_mmap_offset(obj);

    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);

    fail:
    return ret;
    @@ -839,7 +839,7 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
    ret = drm_gem_handle_create(file, obj, handle);

    /* drop reference from allocate - handle holds it now */
    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);

    return ret;
    }
    @@ -955,7 +955,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
    return obj;

    fail:
    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);
    return ERR_PTR(ret);
    }

    @@ -1015,6 +1015,6 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
    return obj;

    fail:
    - drm_gem_object_unreference_unlocked(obj);
    + drm_gem_object_put_unlocked(obj);
    return ERR_PTR(ret);
    }
    diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
    index 6bfca74..59982cf 100644
    --- a/drivers/gpu/drm/msm/msm_gem_submit.c
    +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
    @@ -139,7 +139,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
    goto out_unlock;
    }

    - drm_gem_object_reference(obj);
    + drm_gem_object_get(obj);

    submit->bos[i].obj = msm_obj;

    @@ -375,7 +375,7 @@ static void submit_cleanup(struct msm_gem_submit *submit)
    struct msm_gem_object *msm_obj = submit->bos[i].obj;
    submit_unlock_unpin_bo(submit, i);
    list_del_init(&msm_obj->submit_entry);
    - drm_gem_object_unreference(&msm_obj->base);
    + drm_gem_object_put(&msm_obj->base);
    }

    ww_acquire_fini(&submit->ticket);
    diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
    index 9f3dbc2..0d7c58b 100644
    --- a/drivers/gpu/drm/msm/msm_gpu.c
    +++ b/drivers/gpu/drm/msm/msm_gpu.c
    @@ -417,7 +417,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
    /* move to inactive: */
    msm_gem_move_to_inactive(&msm_obj->base);
    msm_gem_put_iova(&msm_obj->base, gpu->aspace);
    - drm_gem_object_unreference(&msm_obj->base);
    + drm_gem_object_put(&msm_obj->base);
    }

    pm_runtime_mark_last_busy(&gpu->pdev->dev);
    @@ -496,7 +496,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
    WARN_ON(is_active(msm_obj) && (msm_obj->gpu != gpu));

    /* submit takes a reference to the bo and iova until retired: */
    - drm_gem_object_reference(&msm_obj->base);
    + drm_gem_object_get(&msm_obj->base);
    msm_gem_get_iova(&msm_obj->base,
    submit->gpu->aspace, &iova);

    diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
    index 791bca3..2ba978b 100644
    --- a/drivers/gpu/drm/msm/msm_ringbuffer.c
    +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
    @@ -62,7 +62,7 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)
    {
    if (ring->bo) {
    msm_gem_put_vaddr(ring->bo);
    - drm_gem_object_unreference_unlocked(ring->bo);
    + drm_gem_object_put_unlocked(ring->bo);
    }
    kfree(ring);
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-08-10 14:22    [W:2.352 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site