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:19:27 +0200 Message-ID: <20130306191927.GN4469@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> <20130306190906.GL4469@intel.com> <20130306191454.GA9021@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 493D8E6882 for ; Wed, 6 Mar 2013 11:19:31 -0800 (PST) Content-Disposition: inline In-Reply-To: <20130306191454.GA9021@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 08:14:54PM +0100, Daniel Vetter wrote: > On Wed, Mar 06, 2013 at 09:09:06PM +0200, Ville Syrj=E4l=E4 wrote: > > 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= /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 =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_sprit= e_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? > = > Fyi the patch which fixed div-by-zero on other platforms is: > = > commit 3490ea5de6ac4af309c3df8a26a5cca61306334c > Author: Chris Wilson > Date: Mon Jan 7 10:11:40 2013 +0000 > = > drm/i915: Treat crtc->mode.clock =3D=3D 0 as disabled Now I actually remember that Jani did try reverting this patch in his tree, and didn't get any div by zeros. So we were a bit confused about the patch at the time. If he had that fix in his tree, then that would explain it. Maybe this patch can be dropped then? -- = Ville Syrj=E4l=E4 Intel OTC