Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a63d3bd2 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Daniel Vetter
Browse files

drm/gma500: Replace drm_gem_object_unreference_unlocked with put function 



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: default avatarThomas Zimmermann <contact@tzimmermann.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625152148.29555-1-contact@tzimmermann.org
parent 26aec255

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/gma500/gem.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/gma500/gma_display.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}