diff options
author | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:10:32 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:25:28 +1000 |
commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /drivers/gpu/drm/i915/intel_runtime_pm.c | |
parent | 6b62b3e134676687d5d666e6edc3b45f1507b2b7 (diff) | |
parent | 06d1ee32a4d25356a710b49d5e95dbdd68bdf505 (diff) | |
download | op-kernel-dev-48f87dd146a480c723774962eca675873a8aa1da.zip op-kernel-dev-48f87dd146a480c723774962eca675873a8aa1da.tar.gz |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
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 85c35fd..d194492 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); } } |