Message ID | 1421431648-22904-3-git-send-email-damien.lespiau@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Jan 16, 2015 at 06:07:26PM +0000, Damien Lespiau wrote: > v2: Use the new function, gen6_init_rps_frequencies() (Damien) > > Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> (v1) > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> First two patches merged, later two have conflicts. Can you please rebase? Also the big rework from Mika to support forcewake domains generically has landed, I hope that unblocks skl rps support? Thanks, Daniel
On Tue, Jan 20, 2015 at 11:14:22AM +0100, Daniel Vetter wrote: > On Fri, Jan 16, 2015 at 06:07:26PM +0000, Damien Lespiau wrote: > > v2: Use the new function, gen6_init_rps_frequencies() (Damien) > > > > Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> (v1) > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > First two patches merged, later two have conflicts. Can you please rebase? > > Also the big rework from Mika to support forcewake domains generically has > landed, I hope that unblocks skl rps support? Actually the whole series needs rebasing (doesn't compile with Mika's/Chris rework). Let me do that. It doesn't quite unblock the rps support, we still need some work as it has been identified that the frequency granularity has changed on SKL (as always with PM, we know about things super late and by chance)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3a0aec0..f40b8f2 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4032,6 +4032,8 @@ static void gen9_enable_rps(struct drm_device *dev) gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); + gen6_init_rps_frequencies(dev); + I915_WRITE(GEN6_RPNSWREQ, 0xc800000); I915_WRITE(GEN6_RC_VIDEO_FREQ, 0xc800000);