evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Abhijit Kulkarni <kabhijit@codeaurora.org>
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
This commit is contained in:
Rahul Sharma 2019-01-22 15:27:02 +05:30 • committed by Gerrit - the friendly Code Review server
parent 6e84efb6ff
commit c021cd0f30
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/msm/sde/sde_connector.c
View file

@ -477,7 +477,10 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
if (!val) if (!val)
goto end; 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) { if (rc) {
SDE_ERROR("fence create failed rc:%d\n", rc); SDE_ERROR("fence create failed rc:%d\n", rc);
goto end; goto end;

7
drivers/gpu/drm/msm/sde/sde_crtc.c
View file

@ -1720,6 +1720,13 @@ static int _sde_crtc_get_output_fence(struct drm_crtc *crtc,
offset = sde_crtc_get_property(cstate, CRTC_PROP_OUTPUT_FENCE_OFFSET); offset = sde_crtc_get_property(cstate, CRTC_PROP_OUTPUT_FENCE_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); return sde_fence_create(&sde_crtc->output_fence, val, offset);
} }