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

Commit 0ed87071 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marissa Wall
Browse files

BACKPORT: drm/atomic: add drm_atomic_set_fence_for_plane() 



This new function should be used by drivers when setting a implicit
fence for the plane. It abstracts the fact that the user might have
chosen explicit fencing instead.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478513013-3221-1-git-send-email-gustavo@padovan.org


(cherry picked from commit 13b55664eec7b85607c4ab9d26a62b4af413a771)
Signed-off-by: default avatarMarissa Wall <marissaw@google.com>

Change-Id: If364103f7e85d915e13b84c0cb8ce37202c6f9b9
parent 4baaef80

drivers/gpu/drm/drm_atomic.c

+30 −0
Original line number Diff line number Diff line
@@ -1151,6 +1151,36 @@ drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state, 
}

EXPORT_SYMBOL(drm_atomic_set_fb_for_plane);



/**

 * drm_atomic_set_fence_for_plane - set fence for plane

 * @plane_state: atomic state object for the plane

 * @fence: fence to use for the plane

 *

 * Helper to setup the plane_state fence in case it is not set yet.

 * By using this drivers doesn't need to worry if the user choose

 * implicit or explicit fencing.

 *

 * This function will not set the fence to the state if it was set

 * via explicit fencing interfaces on the atomic ioctl. It will

 * all drope the reference to the fence as we not storing it

 * anywhere.

 *

 * Otherwise, if plane_state->fence is not set this function we

 * just set it with the received implict fence.

 */

void

drm_atomic_set_fence_for_plane(struct drm_plane_state *plane_state,

			       struct fence *fence)

{

	if (plane_state->fence) {

		fence_put(fence);

		return;

	}



	plane_state->fence = fence;

}

EXPORT_SYMBOL(drm_atomic_set_fence_for_plane);



/**

 * drm_atomic_set_crtc_for_connector - set crtc for connector

 * @conn_state: atomic state object for the connector

include/drm/drm_atomic.h

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, 
			      struct drm_crtc *crtc);

void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,

				 struct drm_framebuffer *fb);

void drm_atomic_set_fence_for_plane(struct drm_plane_state *plane_state,

				    struct fence *fence);

int __must_check

drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,

				  struct drm_crtc *crtc);

include/drm/drm_plane.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct drm_plane_state { 


	struct drm_crtc *crtc;   /* do not write directly, use drm_atomic_set_crtc_for_plane() */

	struct drm_framebuffer *fb;  /* do not write directly, use drm_atomic_set_fb_for_plane() */

	struct fence *fence;

	struct fence *fence; /* do not write directly, use drm_atomic_set_fence_for_plane() */



	/* Signed dest location allows it to be partially off screen */

	int32_t crtc_x, crtc_y;