samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: sde: drop suspend state if commit is skipped

Browse Source 
Drop refcount on pm_suspend commit state if atomic
commit is skipped due to failure. It will avoid frame
trigger during pm_resume call.

Change-Id: Ib650ff348ef53122cccad9cb5d200ae295fd2b30
Signed-off-by: Dhaval Patel <quic_pdhaval@quicinc.com>
This commit is contained in:
Dhaval Patel
2021-10-06 11:54:35 -07:00
parent 27c4708570
commit e9f3be9f02
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
msm/sde/sde_kms.c
View File

@@ -3892,6 +3892,7 @@ retry:
DRM_ERROR("failed to get crtc %d state\n", DRM_ERROR("failed to get crtc %d state\n",
conn->state->crtc->base.id); conn->state->crtc->base.id);
drm_connector_list_iter_end(&conn_iter); drm_connector_list_iter_end(&conn_iter);
ret = -EINVAL;
goto unlock; goto unlock;
} }
@@ -3930,6 +3931,12 @@ unlock:
drm_modeset_backoff(&ctx); drm_modeset_backoff(&ctx);
goto retry; goto retry;
} }
if ((ret || !num_crtcs) && sde_kms->suspend_state) {
drm_atomic_state_put(sde_kms->suspend_state);
sde_kms->suspend_state = NULL;
}
drm_modeset_drop_locks(&ctx); drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx); drm_modeset_acquire_fini(&ctx);
@@ -3968,7 +3975,8 @@ static int sde_kms_pm_resume(struct device *dev)
SDE_EVT32(sde_kms->suspend_state != NULL); SDE_EVT32(sde_kms->suspend_state != NULL);
drm_mode_config_reset(ddev); if (sde_kms->suspend_state)
drm_mode_config_reset(ddev);
drm_modeset_acquire_init(&ctx, 0); drm_modeset_acquire_init(&ctx, 0);
retry: retry: