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

Commit 43b2c259 authored by Abhijit Kulkarni's avatar Abhijit Kulkarni
Browse files

drm/msm/sde: set correct timeline at fence create 



This change adds the offset to the associated timeline
when the retire and release fences are created.
The DRM client queries the fences using the atomic commit
instead of set_property ioctl. So the sync point should
contain the updated timeline before sending the FDs to
client.

Change-Id: I1ac9507934223bd1091be6960805c63cb4aacfb1
Signed-off-by: default avatarAbhijit Kulkarni <kabhijit@codeaurora.org>
parent 452becbf

drivers/gpu/drm/msm/sde/sde_connector.c

+4 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,10 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector, 
		if (!val)

			goto end;



		rc = sde_fence_create(&c_conn->retire_fence, &fence_fd, 0);

		/*

		 * update the the offset to a timeline for commit completion

		 */

		rc = sde_fence_create(&c_conn->retire_fence, &fence_fd, 1);

		if (rc) {

			SDE_ERROR("fence create failed rc:%d\n", rc);

			goto end;

drivers/gpu/drm/msm/sde/sde_crtc.c

+7 −0
Original line number Diff line number Diff line
@@ -5209,6 +5209,13 @@ static int _sde_crtc_get_output_fence(struct drm_crtc *crtc, 
	 */

	offset = is_cmd ? 0 : (offset + conn_offset);



	/*

	 * Hwcomposer now queries the fences using the commit list in atomic

	 * commit ioctl. The offset should be set to next timeline

	 * which will be incremented during the prepare commit phase

	 */

	offset++;



	return sde_fence_create(&sde_crtc->output_fence, val, offset);

}