From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 14/28] drm/i915: disable watermarks on VLV, pondicherry takes care of this Date: Wed, 6 Mar 2013 21:09:06 +0200 Message-ID: <20130306190906.GL4469@intel.com> References: <1362172471-7643-1-git-send-email-jbarnes@virtuousgeek.org> <1362172471-7643-15-git-send-email-jbarnes@virtuousgeek.org> <20130306185633.GS9021@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C7431E68B5 for ; Wed, 6 Mar 2013 11:09:10 -0800 (PST) Content-Disposition: inline In-Reply-To: <20130306185633.GS9021@phenom.ffwll.local> 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: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Mar 06, 2013 at 07:56:33PM +0100, Daniel Vetter wrote: > 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/int= el_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 =3D NULL; > > } else if (IS_VALLEYVIEW(dev)) { > > - dev_priv->display.update_wm =3D valleyview_update_wm; > > +// dev_priv->display.update_wm =3D valleyview_update_wm; > > + dev_priv->display.update_wm =3D NULL; > > +// dev_priv->display.update_sprite_wm =3D 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 ... The whole premise that pondicherry magically handles things is a bit weird too. I suppose all it really means is that the default WMs were high enough to avoid underruns for the guys who tested this. Actually wasn't there a comment on an earlier version of this patch that there was a div by zero or something, and that's the real reason for this patch? > -Daniel > = > > dev_priv->display.init_clock_gating =3D > > 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 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC