malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "drm/msm/sde: avoid disabling clks/bw when cont-splash is enabled" into msm-4.14

Browse Source
This commit is contained in:
Linux Build Service Account 2018-04-16 18:10:08 -07:00 committed by Gerrit - the friendly Code Review server
commit 0f2330d930
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/msm/sde/sde_crtc.c
View File

@ -4094,6 +4094,7 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg)
static void sde_crtc_disable(struct drm_crtc *crtc)
{
struct sde_kms *sde_kms;
struct sde_crtc *sde_crtc;
struct sde_crtc_state *cstate;
struct drm_encoder *encoder;
@ -4109,6 +4110,12 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
return;
}
sde_kms = _sde_crtc_get_kms(crtc);
if (!sde_kms) {
SDE_ERROR("invalid kms\n");
return;
}
if (!sde_kms_power_resource_is_enabled(crtc->dev)) {
SDE_ERROR("power resource is not enabled\n");
return;
@ -4174,7 +4181,9 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
}
spin_unlock_irqrestore(&sde_crtc->spin_lock, flags);
sde_core_perf_crtc_update(crtc, 0, true);
/* avoid clk/bw downvote if cont-splash is enabled */
if (!sde_kms->splash_data.cont_splash_en)
sde_core_perf_crtc_update(crtc, 0, true);
drm_for_each_encoder(encoder, crtc->dev) {
if (encoder->crtc != crtc)