Re: [PATCH 5/5] drm/i915: Enable rc6 with bdw

Daniel Vetter
2014-05-15T21:17:51Z

On Thu, May 15, 2014 at 08:58:11PM +0300, Mika Kuoppala wrote:
> Everything should be in place so enable rc6/rps for bdw.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

Merged all 5 patches, thanks. Now that we have the prerequisites it's time
to give runtime pm on bdw another shot. Can you please test a revert of

commit f033579f7759bfb34c082aacbd19a830f1e587cc
Author: Imre Deak <imre.deak@intel.com>
Date: Mon Apr 28 12:03:59 2014 +0300

drm/i915: bdw: fix RC6 enabled status reporting and disable runtime PM

and if it checks out please submit it?

Thanks, Daniel
> ---
> drivers/gpu/drm/i915/intel_pm.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 36eb1ea..34b0766 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3374,10 +3374,6 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
> if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev))
> return 0;
>
> - /* Disable RC6 on Broadwell for now */
> - if (IS_BROADWELL(dev))
> - return 0;
> -
> /* Respect the kernel parameter if it is set */
> if (enable_rc6 >= 0) {
> int mask;
> @@ -4685,7 +4681,7 @@ void intel_disable_gt_powersave(struct drm_device *dev)
> if (IS_IRONLAKE_M(dev)) {
> ironlake_disable_drps(dev);
> ironlake_disable_rc6(dev);
> - } else if (IS_GEN6(dev) || IS_GEN7(dev)) {
> + } else if (IS_GEN6(dev) || IS_GEN7(dev) || IS_BROADWELL(dev)) {
> cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);
> cancel_work_sync(&dev_priv->rps.work);
> mutex_lock(&dev_priv->rps.hw_lock);
> @@ -4732,7 +4728,7 @@ void intel_enable_gt_powersave(struct drm_device *dev)
> ironlake_enable_rc6(dev);
> intel_init_emon(dev);
> mutex_unlock(&dev->struct_mutex);
> - } else if (IS_GEN6(dev) || IS_GEN7(dev)) {
> + } else if (IS_GEN6(dev) || IS_GEN7(dev) || IS_BROADWELL(dev)) {
> /*
> * PCU communication is slow and this doesn't need to be
> * done at any specific time, so do this out of our fast path
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch