Commit 16fbc291 authored Jan 06, 2016 by Michel Thierry Committed by Daniel Vetter Jan 07, 2016

drm/i915/kbl: Enable PW1 and Misc I/O power wells



My kbl stopped working because of this.

Fixes regression from
commit 2f693e28
Author: Damien Lespiau <damien.lespiau@intel.com>
Date:   Wed Nov 4 19:24:12 2015 +0200
    drm/i915: Make turning on/off PW1 and Misc I/O part of the init/fini
    sequences

Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452082116-16770-1-git-send-email-michel.thierry@intel.com


Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent c03242b1

drivers/gpu/drm/i915/intel_runtime_pm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1851,7 +1851,7 @@ void skl_pw1_misc_io_init(struct drm_i915_private *dev_priv)
		{
		struct i915_power_well *well;

		if (!IS_SKYLAKE(dev_priv))
		if (!(IS_SKYLAKE(dev_priv) \|\| IS_KABYLAKE(dev_priv)))
		return;

		well = lookup_power_well(dev_priv, SKL_DISP_PW_1);
		@@ -1865,7 +1865,7 @@ void skl_pw1_misc_io_fini(struct drm_i915_private *dev_priv)
		{
		struct i915_power_well *well;

		if (!IS_SKYLAKE(dev_priv))
		if (!(IS_SKYLAKE(dev_priv) \|\| IS_KABYLAKE(dev_priv)))
		return;

		well = lookup_power_well(dev_priv, SKL_DISP_PW_1);