From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 14/28] drm/i915: disable watermarks on VLV, pondicherry takes care of this Date: Wed, 6 Mar 2013 19:56:33 +0100 Message-ID: <20130306185633.GS9021@phenom.ffwll.local> References: <1362172471-7643-1-git-send-email-jbarnes@virtuousgeek.org> <1362172471-7643-15-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-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTP id CF9AAE5C77 for ; Wed, 6 Mar 2013 10:54:00 -0800 (PST) Received: by mail-wg0-f53.google.com with SMTP id fn15so7849444wgb.8 for ; Wed, 06 Mar 2013 10:53:59 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362172471-7643-15-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 Fri, Mar 01, 2013 at 01:14:17PM -0800, Jesse Barnes wrote: > For current usage, not needed. > > Signed-off-by: Vijay Purushothaman > --- > drivers/gpu/drm/i915/intel_pm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 7de8cec..b8f5a17 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4211,7 +4211,9 @@ void intel_init_pm(struct drm_device *dev) > } else > dev_priv->display.update_wm = NULL; > } else if (IS_VALLEYVIEW(dev)) { > - dev_priv->display.update_wm = valleyview_update_wm; > +// dev_priv->display.update_wm = valleyview_update_wm; > + dev_priv->display.update_wm = NULL; > +// dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm; Either kill this all (it's kzalloced so no need for NULL assignments) or add a giant comment explaining what's going on. Adding commented-out code without comment is strange ... -Daniel > dev_priv->display.init_clock_gating = > valleyview_init_clock_gating; > } else if (IS_PINEVIEW(dev)) { > -- > 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