From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
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 [thread overview]
Message-ID: <20130306191927.GN4469@intel.com> (raw)
In-Reply-To: <20130306191454.GA9021@phenom.ffwll.local>
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älä 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 <vijay.a.purushothaman@intel.com>
> > > > ---
> > > > 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 ...
> >
> > 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 <chris@chris-wilson.co.uk>
> Date: Mon Jan 7 10:11:40 2013 +0000
>
> drm/i915: Treat crtc->mode.clock == 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älä
Intel OTC
next prev parent reply other threads:[~2013-03-06 19:19 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 21:14 VLV updates Jesse Barnes
2013-03-01 21:14 ` [PATCH 01/28] drm/i915: sprite support for ValleyView Jesse Barnes
2013-03-04 18:23 ` Ville Syrjälä
2013-03-01 21:14 ` [PATCH 02/28] drm/i915: add sprite assertion function for VLV Jesse Barnes
2013-03-04 18:29 ` Ville Syrjälä
2013-03-07 23:24 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 03/28] drm/i915: add constant alpha support to sprite ioctl Jesse Barnes
2013-03-01 21:14 ` [PATCH 04/28] drm/i915: update VLV PLL and DPIO code Jesse Barnes
2013-03-01 21:14 ` [PATCH 05/28] drm/i915: panel power sequencing for VLV eDP Jesse Barnes
2013-03-01 21:43 ` Ville Syrjälä
2013-03-01 21:57 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 06/28] drm/i915: add more VLV IDs Jesse Barnes
2013-03-01 21:14 ` [PATCH 07/28] drm/i915: implement WaForceL3Serialization on VLV and IVB Jesse Barnes
2013-03-01 21:43 ` Ville Syrjälä
2013-03-01 21:58 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 08/28] drm/i915: implement WaGTEnableMiFlush on VLV Jesse Barnes
2013-03-01 21:47 ` Ville Syrjälä
2013-03-01 21:58 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 09/28] drm/i915: implement WaDisablePSDDualDispatchEnable " Jesse Barnes
2013-03-01 21:14 ` [PATCH 10/28] drm/i915: VLV has force wake Jesse Barnes
2013-03-06 18:53 ` Daniel Vetter
2013-03-01 21:14 ` [PATCH 11/28] drm/i915: add power context allocation and setup on VLV Jesse Barnes
2013-03-01 21:14 ` [PATCH 12/28] drm/i915: add more clock gating for VLV, allow force wake at init Jesse Barnes
2013-03-06 18:54 ` Daniel Vetter
2013-03-01 21:14 ` [PATCH 13/28] drm/i915: fix VLV limits and m/n/p calculations Jesse Barnes
2013-03-05 11:49 ` Ville Syrjälä
2013-03-01 21:14 ` [PATCH 14/28] drm/i915: disable watermarks on VLV, pondicherry takes care of this Jesse Barnes
2013-03-06 18:56 ` Daniel Vetter
2013-03-06 19:09 ` Ville Syrjälä
2013-03-06 19:14 ` Daniel Vetter
2013-03-06 19:19 ` Ville Syrjälä [this message]
2013-03-06 19:32 ` Daniel Vetter
2013-03-07 23:12 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 15/28] drm/i915: use gen6 stolen check on VLV Jesse Barnes
2013-03-01 21:14 ` [PATCH 16/28] drm/i915: add Punit read/write routines for VLV Jesse Barnes
2013-03-04 8:43 ` Jani Nikula
2013-03-04 16:35 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 17/28] drm/i915: add media well to VLV force wake routines Jesse Barnes
2013-03-01 21:14 ` [PATCH 18/28] drm/i915: turbo & RC6 support for VLV Jesse Barnes
2013-03-01 21:14 ` [PATCH 19/28] drm/i915: remove VLV MSI IRQ hack Jesse Barnes
2013-03-01 21:14 ` [PATCH 20/28] drm/i915: don't enumerate VGA on VLV Jesse Barnes
2013-03-06 18:58 ` Daniel Vetter
2013-03-06 19:00 ` Ville Syrjälä
2013-03-06 19:09 ` Jesse Barnes
2013-03-06 19:14 ` Ville Syrjälä
2013-03-01 21:14 ` [PATCH 21/28] drm/i915: DSPFW and BLC regs are in the display offset range Jesse Barnes
2013-03-01 21:14 ` [PATCH 22/28] drm/i915: don't use plane pipe select on VLV Jesse Barnes
2013-03-01 21:14 ` [PATCH 23/28] drm/i915: use VLV DIP routines " Jesse Barnes
2013-03-06 19:00 ` Daniel Vetter
2013-03-06 19:09 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 24/28] drm/i915: export intel_dpio_write for use in intel_dp.c Jesse Barnes
2013-03-06 19:02 ` Daniel Vetter
2013-03-06 19:10 ` Jesse Barnes
2013-03-01 21:14 ` [PATCH 25/28] drm/i915/dp: program VSwing and Preemphasis control settings on VLV Jesse Barnes
2013-03-01 21:14 ` [PATCH 26/28] drm/i915: VLV doesn't have HDMI on port C Jesse Barnes
2013-03-01 21:14 ` [PATCH 27/28] drm/i915/dp: don't use ILK paths on VLV Jesse Barnes
2013-03-06 19:04 ` Daniel Vetter
2013-03-01 21:14 ` [PATCH 28/28] drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV Jesse Barnes
2013-03-06 19:05 ` Daniel Vetter
2013-03-06 20:55 ` Jesse Barnes
2013-03-06 21:02 ` Daniel Vetter
2013-03-01 21:59 ` VLV updates Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130306191927.GN4469@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox