| Message ID | 1452082116-16770-1-git-send-email-michel.thierry@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 06, 2016 at 12:08:36PM +0000, Michel Thierry wrote: > My kbl stopped working because of this. > > Fixes regression from > commit 2f693e28b8df69f67beced5e18bb2b91c2bfcec2 > 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> Part of a time where IS_SKYLAKE() would have been true for KBL... Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
On Wed, Jan 06, 2016 at 01:24:58PM +0100, Damien Lespiau wrote: > On Wed, Jan 06, 2016 at 12:08:36PM +0000, Michel Thierry wrote: > > My kbl stopped working because of this. > > > > Fixes regression from > > commit 2f693e28b8df69f67beced5e18bb2b91c2bfcec2 > > 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> > > Part of a time where IS_SKYLAKE() would have been true for KBL... > > Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index ddbdbff..4b44e68 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -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);
My kbl stopped working because of this. Fixes regression from commit 2f693e28b8df69f67beced5e18bb2b91c2bfcec2 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> --- drivers/gpu/drm/i915/intel_runtime_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)