Re: [PATCH 4/9] drm/i915/bdw: Use centralized rc6 info print

Ben Widawsky
2014-02-14T20:34:22Z

On Tue, Feb 11, 2014 at 05:12:17PM +0100, Daniel Vetter wrote:
> On Thu, Feb 06, 2014 at 11:42:39AM -0200, Rodrigo Vivi wrote:
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
> >
> > On Wed, Jan 29, 2014 at 2:25 AM, Ben Widawsky
> > <benjamin.widawsky@intel.com> wrote:
> > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> > > ---
> > > drivers/gpu/drm/i915/intel_pm.c | 6 +++---
> > > 1 file changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > > index 944b99c..6acb429 100644
> > > --- a/drivers/gpu/drm/i915/intel_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > > @@ -3215,10 +3215,10 @@ static void gen8_enable_rps(struct drm_device *dev)
> > > /* 3: Enable RC6 */
> > > if (intel_enable_rc6(dev) & INTEL_RC6_ENABLE)
> > > rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
> > > - DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ? "on" : "off");
> > > + intel_print_rc6_info(dev, rc6_mask);
> > > I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
> > > - GEN6_RC_CTL_EI_MODE(1) |
> > > - rc6_mask);
> > > + GEN6_RC_CTL_EI_MODE(1) |
> > > + rc6_mask);
> > >
> > > /* 4 Program defaults and thresholds for RPS*/
> > > I915_WRITE(GEN6_RPNSWREQ, HSW_FREQUENCY(10)); /* Request 500 MHz */
> > > --
> > > 1.8.5.3
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> Merged up to this patch, but after that it gets confusing:
> - I have two patches 5/9.

5/9 is good to go. Not sure how two got sent out. Rodrigo reviewed the
right one (the patches are the same, but the commit message changed). I
think I accidentally did two git format-patches in my staging area after
doing the rename.

> - 6/9 lacks review ...
>

6/9 can be skipped for this series, though I think it's a reasonable
patch. Maybe Chris or Jesse has an opinion on 6/9?

> Mailing-list grues ate something?
> -Daniel
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

--
Ben Widawsky, Intel Open Source Technology Center