openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/rockchip: switch to drm_*_get(), drm_*_put() helpers 

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>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1502454794-28558-21-git-send-email-cakturk@gmail.com
This commit is contained in:
Cihangir Akturk 2017-08-11 15:33:06 +03:00 committed by Sean Paul
parent 1365e2dba0
commit adedbf0325
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
View File

@ -48,7 +48,7 @@ static void rockchip_drm_fb_destroy(struct drm_framebuffer *fb)
int i; int i;
for (i = 0; i < ROCKCHIP_MAX_FB_BUFFER; i++) for (i = 0; i < ROCKCHIP_MAX_FB_BUFFER; i++)
drm_gem_object_unreference_unlocked(rockchip_fb->obj[i]); drm_gem_object_put_unlocked(rockchip_fb->obj[i]);
drm_framebuffer_cleanup(fb); drm_framebuffer_cleanup(fb);
kfree(rockchip_fb); kfree(rockchip_fb);
@ -144,7 +144,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
width * drm_format_plane_cpp(mode_cmd->pixel_format, i); width * drm_format_plane_cpp(mode_cmd->pixel_format, i);
if (obj->size < min_size) { if (obj->size < min_size) {
drm_gem_object_unreference_unlocked(obj); drm_gem_object_put_unlocked(obj);
ret = -EINVAL; ret = -EINVAL;
goto err_gem_object_unreference; goto err_gem_object_unreference;
} }
@ -161,7 +161,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
err_gem_object_unreference: err_gem_object_unreference:
for (i--; i >= 0; i--) for (i--; i >= 0; i--)
drm_gem_object_unreference_unlocked(objs[i]); drm_gem_object_put_unlocked(objs[i]);
return ERR_PTR(ret); return ERR_PTR(ret);
} }

2
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
View File

@ -173,7 +173,7 @@ void rockchip_drm_fbdev_fini(struct drm_device *dev)
drm_fb_helper_unregister_fbi(helper); drm_fb_helper_unregister_fbi(helper);
if (helper->fb) if (helper->fb)
drm_framebuffer_unreference(helper->fb); drm_framebuffer_put(helper->fb);
drm_fb_helper_fini(helper); drm_fb_helper_fini(helper);
} }

2
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
View File

@ -383,7 +383,7 @@ rockchip_gem_create_with_handle(struct drm_file *file_priv,
goto err_handle_create; goto err_handle_create;
/* drop reference from allocate - handle holds it now. */ /* drop reference from allocate - handle holds it now. */
drm_gem_object_unreference_unlocked(obj); drm_gem_object_put_unlocked(obj);
return rk_obj; return rk_obj;

4
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@ -1026,7 +1026,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
if (old_plane_state->fb == new_plane_state->fb) if (old_plane_state->fb == new_plane_state->fb)
continue; continue;
drm_framebuffer_reference(old_plane_state->fb); drm_framebuffer_get(old_plane_state->fb);
drm_flip_work_queue(&vop->fb_unref_work, old_plane_state->fb); drm_flip_work_queue(&vop->fb_unref_work, old_plane_state->fb);
set_bit(VOP_PENDING_FB_UNREF, &vop->pending); set_bit(VOP_PENDING_FB_UNREF, &vop->pending);
WARN_ON(drm_crtc_vblank_get(crtc) != 0); WARN_ON(drm_crtc_vblank_get(crtc) != 0);
@ -1150,7 +1150,7 @@ static void vop_fb_unref_worker(struct drm_flip_work *work, void *val)
struct drm_framebuffer *fb = val; struct drm_framebuffer *fb = val;
drm_crtc_vblank_put(&vop->crtc); drm_crtc_vblank_put(&vop->crtc);
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
} }
static void vop_handle_vblank(struct vop *vop) static void vop_handle_vblank(struct vop *vop)