From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: reduce power in the ilk rc6 enable error message Date: Wed, 13 Mar 2013 21:09:14 +0100 Message-ID: <20130313200914.GA1896@bremse> References: <1363078159-18780-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 04A5FE5C73 for ; Wed, 13 Mar 2013 13:09:34 -0700 (PDT) Received: by mail-pb0-f45.google.com with SMTP id ro8so1383682pbb.4 for ; Wed, 13 Mar 2013 13:09:33 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1363078159-18780-1-git-send-email-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Mar 12, 2013 at 10:49:19AM +0200, Jani Nikula wrote: > Even if "power power" is good for grepping. > > Signed-off-by: Jani Nikula Queued for -next, thanks for the patch. Fyi I've merged a few other patches, but might be that the merge confirmation mails have been lost in the awful conference wifi here. So please check my trees, I'm lazy ;-) -Daniel > --- > drivers/gpu/drm/i915/intel_pm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 5479363..be43f71 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -2821,7 +2821,7 @@ static void ironlake_enable_rc6(struct drm_device *dev) > ret = intel_ring_idle(ring); > dev_priv->mm.interruptible = was_interruptible; > if (ret) { > - DRM_ERROR("failed to enable ironlake power power savings\n"); > + DRM_ERROR("failed to enable ironlake power savings\n"); > ironlake_teardown_rc6(dev); > return; > } > -- > 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