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

Commit 34a2ab5e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Add acquire ctx parameter to ->update_plane 



Just rolling it out, no code change here.

Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-3-daniel.vetter@ffwll.ch
parent 232e8f70

drivers/gpu/drm/armada/armada_overlay.c

+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ static int 
armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,

	struct drm_framebuffer *fb,

	int crtc_x, int crtc_y, unsigned crtc_w, unsigned crtc_h,

	uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h)

	uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h,

	struct drm_modeset_acquire_ctx *ctx)

{

	struct armada_ovl_plane *dplane = drm_to_armada_ovl_plane(plane);

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);

drivers/gpu/drm/drm_atomic_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -2077,6 +2077,7 @@ EXPORT_SYMBOL(drm_atomic_helper_swap_state); 
 * @src_y: y offset of @fb for panning

 * @src_w: width of source rectangle in @fb

 * @src_h: height of source rectangle in @fb

 * @ctx: lock acquire context

 *

 * Provides a default plane update handler using the atomic driver interface.

 *
@@ -2089,7 +2090,8 @@ int drm_atomic_helper_update_plane(struct drm_plane *plane, 
				   int crtc_x, int crtc_y,

				   unsigned int crtc_w, unsigned int crtc_h,

				   uint32_t src_x, uint32_t src_y,

				   uint32_t src_w, uint32_t src_h)

				   uint32_t src_w, uint32_t src_h,

				   struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_atomic_state *state;

	struct drm_plane_state *plane_state;

drivers/gpu/drm/drm_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int __setplane_internal(struct drm_plane *plane, 
	plane->old_fb = plane->fb;

	ret = plane->funcs->update_plane(plane, crtc, fb,

					 crtc_x, crtc_y, crtc_w, crtc_h,

					 src_x, src_y, src_w, src_h);

					 src_x, src_y, src_w, src_h, ctx);

	if (!ret) {

		plane->crtc = crtc;

		plane->fb = fb;

drivers/gpu/drm/drm_plane_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ EXPORT_SYMBOL(drm_plane_helper_check_update); 
 * @src_y: y offset of @fb for panning

 * @src_w: width of source rectangle in @fb

 * @src_h: height of source rectangle in @fb

 * @ctx: lock acquire context, not used here

 *

 * Provides a default plane update handler for primary planes.  This is handler

 * is called in response to a userspace SetPlane operation on the plane with a
@@ -303,7 +304,8 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, 
			      int crtc_x, int crtc_y,

			      unsigned int crtc_w, unsigned int crtc_h,

			      uint32_t src_x, uint32_t src_y,

			      uint32_t src_w, uint32_t src_h)

			      uint32_t src_w, uint32_t src_h,

			      struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_mode_set set = {

		.crtc = crtc,

drivers/gpu/drm/i915/intel_display.c

+3 −2
Original line number Diff line number Diff line
@@ -13426,7 +13426,8 @@ intel_legacy_cursor_update(struct drm_plane *plane, 
			   int crtc_x, int crtc_y,

			   unsigned int crtc_w, unsigned int crtc_h,

			   uint32_t src_x, uint32_t src_y,

			   uint32_t src_w, uint32_t src_h)

			   uint32_t src_w, uint32_t src_h,

			   struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	int ret;
@@ -13539,7 +13540,7 @@ intel_legacy_cursor_update(struct drm_plane *plane, 
slow:

	return drm_atomic_helper_update_plane(plane, crtc, fb,

					      crtc_x, crtc_y, crtc_w, crtc_h,

					      src_x, src_y, src_w, src_h);

					      src_x, src_y, src_w, src_h, ctx);

}



static const struct drm_plane_funcs intel_cursor_plane_funcs = {