This patch unifies the naming of DRM functions for reference counting of struct drm_framebuffer. The resulting code is more aligned with the rest of the Linux kernel interfaces. Signed-off-by: Thomas Zimmermann <tdz@xxxxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/armada/armada_crtc.c | 8 ++++---- drivers/gpu/drm/armada/armada_overlay.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 03eeee11dd5b..38724b554a54 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1220,7 +1220,7 @@ static int armada_drm_primary_update(struct drm_plane *plane, * Take a reference on the new framebuffer - we want to * hold on to it while the hardware is displaying it. */ - drm_framebuffer_reference(fb); + drm_framebuffer_get(fb); work->old_fb = plane->fb; } else { @@ -1239,7 +1239,7 @@ static int armada_drm_primary_update(struct drm_plane *plane, if (!dplane->state.vsync_update) { work->fn(dcrtc, work); if (work->old_fb) - drm_framebuffer_unreference(work->old_fb); + drm_framebuffer_put(work->old_fb); return 0; } @@ -1248,7 +1248,7 @@ static int armada_drm_primary_update(struct drm_plane *plane, if (ret) { work->fn(dcrtc, work); if (work->old_fb) - drm_framebuffer_unreference(work->old_fb); + drm_framebuffer_put(work->old_fb); } dplane->next_work = !dplane->next_work; @@ -1308,7 +1308,7 @@ int armada_drm_plane_disable(struct drm_plane *plane, if (armada_drm_plane_work_queue(dcrtc, work)) { work->fn(dcrtc, work); if (work->old_fb) - drm_framebuffer_unreference(work->old_fb); + drm_framebuffer_put(work->old_fb); } dplane->next_work = !dplane->next_work; diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index c391955009d6..bb2874d84d74 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -228,7 +228,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, * Take a reference on the new framebuffer - we want to * hold on to it while the hardware is displaying it. */ - drm_framebuffer_reference(fb); + drm_framebuffer_get(fb); work->old_fb = plane->fb; } else { -- 2.14.4 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel