diff options
| author | Ingo Molnar | 2015-10-06 17:05:36 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-10-06 17:05:36 +0200 |
| commit | fe19159225d8516f3f57a5fe8f735c01684f0ddd (patch) | |
| tree | 1a41faa5ef5139485f4afabd6bb9d3977c0a115b /drivers/gpu/drm/i915/intel_runtime_pm.c | |
| parent | sched/core: Make 'sched_domain_topology' declaration static (diff) | |
| parent | sched/core: Fix TASK_DEAD race in finish_task_switch() (diff) | |
| download | kernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.tar.gz kernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.tar.xz kernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index af7fdb3bd663..7401cf90b0db 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -246,7 +246,8 @@ static void skl_power_well_post_enable(struct drm_i915_private *dev_priv, } if (power_well->data == SKL_DISP_PW_1) { - intel_prepare_ddi(dev); + if (!dev_priv->power_domains.initializing) + intel_prepare_ddi(dev); gen8_irq_power_well_post_enable(dev_priv, 1 << PIPE_A); } } |