From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/2] drm/i915: only get clock for active pipes Date: Fri, 20 Sep 2013 09:50:14 +0200 Message-ID: <20130920075014.GG32145@phenom.ffwll.local> References: <1379622401-9542-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by gabe.freedesktop.org (Postfix) with ESMTP id B56A3E6204 for ; Fri, 20 Sep 2013 00:49:59 -0700 (PDT) Received: by mail-ea0-f174.google.com with SMTP id z15so52882ead.5 for ; Fri, 20 Sep 2013 00:49:58 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1379622401-9542-1-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Sep 19, 2013 at 01:26:40PM -0700, Jesse Barnes wrote: > Otherwise the pixel_multiplier may not be set, and who knows what else > in the future. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 1d14ad3..8d7b5f0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8790,7 +8790,7 @@ check_crtc_state(struct drm_device *dev) > encoder->get_config(encoder, &pipe_config); > } > > - if (dev_priv->display.get_clock) > + if (active && dev_priv->display.get_clock) > dev_priv->display.get_clock(crtc, &pipe_config); You're -nightly is a bit old, this stuff is gone now. Ville moved it all into the get_crtc_config callback. -Daniel > > WARN(crtc->active != active, > -- > 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