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

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

Browse Source
This commit is contained in:
qctecmdr
2022-03-31 17:23:16 -07:00
committed by Gerrit - the friendly Code Review server
parent 0d5e286187 e9f3be9f02
commit fdcfe00b0b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msm/sde/sde_kms.c
View File

@@ -3985,6 +3985,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;
} }
@@ -4023,6 +4024,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);
@@ -4061,6 +4068,7 @@ static int sde_kms_pm_resume(struct device *dev)
SDE_EVT32(sde_kms->suspend_state != NULL); SDE_EVT32(sde_kms->suspend_state != NULL);
if (sde_kms->suspend_state)
drm_mode_config_reset(ddev); drm_mode_config_reset(ddev);
drm_modeset_acquire_init(&ctx, 0); drm_modeset_acquire_init(&ctx, 0);