Commit a52ff2a5 authored by Haneen Mohammed's avatar Haneen Mohammed Committed by Sean Paul

drm/armada: Replace drm_framebuffer_reference/unreference() with _get/put()

This patch replace instances of drm_framebuffer_reference/unreference with
*_get/put() suffixes, because get/put is shorter and consistent with the
kernel use of *_get/put suffixes.
This was done with the following Coccinelle script:

@r1@
expression e;
@@

(
-drm_framebuffer_reference(e);
+drm_framebuffer_get(e);
|
-drm_framebuffer_unreference(e);
+drm_framebuffer_put(e);
)
Signed-off-by: default avatarHaneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/e1df1b3375faa819029559b11c32e10501c5c5d6.1505932812.git.hamohammed.sa@gmail.com
parent 4c3cf375
...@@ -298,7 +298,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc, ...@@ -298,7 +298,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,
if (force) { if (force) {
/* Display is disabled, so just drop the old fb */ /* Display is disabled, so just drop the old fb */
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
return; return;
} }
...@@ -321,7 +321,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc, ...@@ -321,7 +321,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,
* the best. The worst that will happen is the buffer gets * the best. The worst that will happen is the buffer gets
* reused before it has finished being displayed. * reused before it has finished being displayed.
*/ */
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
} }
static void armada_drm_vblank_off(struct armada_crtc *dcrtc) static void armada_drm_vblank_off(struct armada_crtc *dcrtc)
...@@ -577,7 +577,7 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, ...@@ -577,7 +577,7 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc,
unsigned i; unsigned i;
bool interlaced; bool interlaced;
drm_framebuffer_reference(crtc->primary->fb); drm_framebuffer_get(crtc->primary->fb);
interlaced = !!(adj->flags & DRM_MODE_FLAG_INTERLACE); interlaced = !!(adj->flags & DRM_MODE_FLAG_INTERLACE);
...@@ -718,7 +718,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, ...@@ -718,7 +718,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
MAX_SCHEDULE_TIMEOUT); MAX_SCHEDULE_TIMEOUT);
/* Take a reference to the new fb as we're using it */ /* Take a reference to the new fb as we're using it */
drm_framebuffer_reference(crtc->primary->fb); drm_framebuffer_get(crtc->primary->fb);
/* Update the base in the CRTC */ /* Update the base in the CRTC */
armada_drm_crtc_update_regs(dcrtc, regs); armada_drm_crtc_update_regs(dcrtc, regs);
...@@ -742,7 +742,7 @@ void armada_drm_crtc_plane_disable(struct armada_crtc *dcrtc, ...@@ -742,7 +742,7 @@ void armada_drm_crtc_plane_disable(struct armada_crtc *dcrtc,
* primary plane. * primary plane.
*/ */
if (plane->fb) if (plane->fb)
drm_framebuffer_unreference(plane->fb); drm_framebuffer_put(plane->fb);
/* Power down the Y/U/V FIFOs */ /* Power down the Y/U/V FIFOs */
sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66; sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66;
...@@ -1045,12 +1045,12 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, ...@@ -1045,12 +1045,12 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,
* Ensure that we hold a reference on the new framebuffer. * Ensure that we hold a reference on the new framebuffer.
* This has to match the behaviour in mode_set. * This has to match the behaviour in mode_set.
*/ */
drm_framebuffer_reference(fb); drm_framebuffer_get(fb);
ret = armada_drm_crtc_queue_frame_work(dcrtc, work); ret = armada_drm_crtc_queue_frame_work(dcrtc, work);
if (ret) { if (ret) {
/* Undo our reference above */ /* Undo our reference above */
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
kfree(work); kfree(work);
return ret; return ret;
} }
......
...@@ -25,7 +25,7 @@ static void armada_drm_unref_work(struct work_struct *work) ...@@ -25,7 +25,7 @@ static void armada_drm_unref_work(struct work_struct *work)
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
while (kfifo_get(&priv->fb_unref, &fb)) while (kfifo_get(&priv->fb_unref, &fb))
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
} }
/* Must be called with dev->event_lock held */ /* Must be called with dev->event_lock held */
......
...@@ -177,7 +177,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, ...@@ -177,7 +177,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
* Take a reference on the new framebuffer - we want to * Take a reference on the new framebuffer - we want to
* hold on to it while the hardware is displaying it. * hold on to it while the hardware is displaying it.
*/ */
drm_framebuffer_reference(fb); drm_framebuffer_get(fb);
if (plane->fb) if (plane->fb)
armada_ovl_retire_fb(dplane, plane->fb); armada_ovl_retire_fb(dplane, plane->fb);
...@@ -278,7 +278,7 @@ static int armada_ovl_plane_disable(struct drm_plane *plane, ...@@ -278,7 +278,7 @@ static int armada_ovl_plane_disable(struct drm_plane *plane,
fb = xchg(&dplane->old_fb, NULL); fb = xchg(&dplane->old_fb, NULL);
if (fb) if (fb)
drm_framebuffer_unreference(fb); drm_framebuffer_put(fb);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment