On Mon, Jun 25, 2018 at 05:21:48PM +0200, Thomas Zimmermann wrote:
> This patch unifies the naming of DRM functions for reference counting
> of struct drm_gem_object. The resulting code is more aligned with the
> rest of the Linux kernel interfaces.
>
> Signed-off-by: Thomas Zimmermann <cont...@tzimmermann.org>
Applied, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/gma500/framebuffer.c | 2 +-
> drivers/gpu/drm/gma500/gem.c | 2 +-
> drivers/gpu/drm/gma500/gma_display.c | 6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/framebuffer.c
> b/drivers/gpu/drm/gma500/framebuffer.c
> index 8fa4ef192c1e..2f00a37684a2 100644
> --- a/drivers/gpu/drm/gma500/framebuffer.c
> +++ b/drivers/gpu/drm/gma500/framebuffer.c
> @@ -517,7 +517,7 @@ static int psb_fbdev_destroy(struct drm_device *dev,
> struct psb_fbdev *fbdev)
> drm_framebuffer_cleanup(&psbfb->base);
>
> if (psbfb->base.obj[0])
> - drm_gem_object_unreference_unlocked(psbfb->base.obj[0]);
> + drm_gem_object_put_unlocked(psbfb->base.obj[0]);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
> index 131239759a75..913bf4c256fa 100644
> --- a/drivers/gpu/drm/gma500/gem.c
> +++ b/drivers/gpu/drm/gma500/gem.c
> @@ -93,7 +93,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device
> *dev, u64 size,
> return ret;
> }
> /* We have the initial and handle reference but need only one now */
> - drm_gem_object_unreference_unlocked(&r->gem);
> + drm_gem_object_put_unlocked(&r->gem);
> *handlep = handle;
> return 0;
> }
> diff --git a/drivers/gpu/drm/gma500/gma_display.c
> b/drivers/gpu/drm/gma500/gma_display.c
> index c8f071c47daf..015dc9f9348d 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -353,7 +353,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
> gt = container_of(gma_crtc->cursor_obj,
> struct gtt_range, gem);
> psb_gtt_unpin(gt);
> -
> drm_gem_object_unreference_unlocked(gma_crtc->cursor_obj);
> + drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
> gma_crtc->cursor_obj = NULL;
> }
> return 0;
> @@ -429,7 +429,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
> if (gma_crtc->cursor_obj) {
> gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);
> psb_gtt_unpin(gt);
> - drm_gem_object_unreference_unlocked(gma_crtc->cursor_obj);
> + drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
> }
>
> gma_crtc->cursor_obj = obj;
> @@ -437,7 +437,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
> return ret;
>
> unref_cursor:
> - drm_gem_object_unreference_unlocked(obj);
> + drm_gem_object_put_unlocked(obj);
> return ret;
> }
>
> --
> 2.14.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
