This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '24aeab8dafa69cf79637a03d399cf2c1cec91b25'
Change-Id: I91536212f7ac77f19b7150734ca3e6a3a1e2a87a Signed-off-by: Vaisakh Murali <[email protected]>
- Loading branch information
Showing
5 changed files
with
29 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* Copyright (c) 2014-2021 The Linux Foundation. All rights reserved. | ||
* Copyright (C) 2013 Red Hat | ||
* Author: Rob Clark <[email protected]> | ||
|
@@ -3484,6 +3484,12 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc, | |
_sde_crtc_blend_setup(crtc, old_state, true); | ||
_sde_crtc_dest_scaler_setup(crtc); | ||
|
||
/* cancel the idle notify delayed work */ | ||
if (sde_encoder_check_curr_mode(sde_crtc->mixers[0].encoder, | ||
MSM_DISPLAY_VIDEO_MODE) && | ||
kthread_cancel_delayed_work_sync(&sde_crtc->idle_notify_work)) | ||
SDE_DEBUG("idle notify work cancelled\n"); | ||
|
||
if (crtc->state->mode_changed || sde_kms->perf.catalog->uidle_cfg.dirty) | ||
sde_core_perf_crtc_update_uidle(crtc, true); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved. | ||
* Copyright (C) 2013 Red Hat | ||
* Author: Rob Clark <[email protected]> | ||
|
@@ -3950,6 +3950,7 @@ static int sde_kms_pm_suspend(struct device *dev) | |
DRM_ERROR("failed to get crtc %d state\n", | ||
conn->state->crtc->base.id); | ||
drm_connector_list_iter_end(&conn_iter); | ||
ret = -EINVAL; | ||
goto unlock; | ||
} | ||
|
||
|
@@ -3988,6 +3989,12 @@ static int sde_kms_pm_suspend(struct device *dev) | |
drm_modeset_backoff(&ctx); | ||
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_acquire_fini(&ctx); | ||
|
||
|
@@ -4028,7 +4035,8 @@ static int sde_kms_pm_resume(struct device *dev) | |
|
||
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); | ||
retry: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters