diff mbox

drm/i915/vlv: don't wait for vblank after pipe enable

Message ID 1399934249-6771-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes May 12, 2014, 10:37 p.m. UTC
Like on ILK, the pipe won't be running until later on.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c |    1 -
 1 file changed, 1 deletion(-)

Comments

Daniel Vetter May 13, 2014, 6:08 a.m. UTC | #1
On Tue, May 13, 2014 at 12:37 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Like on ILK, the pipe won't be running until later on.

Like on ilk?! Since when is vlv display derived from that? "[PATCH
3/4] drm/i915: Kill vblank waits after pipe enable on gmch platforms"
from Ville makes a more consistent impression to me. Also, and
Bugzilla: tags for this one?
-Daniel

> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c65e7f7..c66d2ea 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4344,7 +4344,6 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
>
>         intel_update_watermarks(crtc);
>         intel_enable_pipe(intel_crtc);
> -       intel_wait_for_vblank(dev_priv->dev, pipe);
>         intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);
>
>         intel_enable_primary_hw_plane(dev_priv, plane, pipe);
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jesse Barnes May 13, 2014, 2:57 p.m. UTC | #2
On Tue, 13 May 2014 08:08:55 +0200
Daniel Vetter <daniel@ffwll.ch> wrote:

> On Tue, May 13, 2014 at 12:37 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > Like on ILK, the pipe won't be running until later on.
> 
> Like on ilk?! Since when is vlv display derived from that? "[PATCH
> 3/4] drm/i915: Kill vblank waits after pipe enable on gmch platforms"
> from Ville makes a more consistent impression to me. Also, and

Yeah that's fine too.  But of course BYT isn't just i915 legacy; it
also includes some IBX logic on the port side.  So you can't just lump
it in with i9xx all the time unfortuantely.  Either way it looks like
Ville's patch will fix this too.

> Bugzilla: tags for this one?

Meh, this particular one only addresses an internal bug, and it looks
like Ville didn't include a bz link either... did you add it when you
committed?

https://bugs.freedesktop.org/show_bug.cgi?id=77297 looks like the closest.
Daniel Vetter May 13, 2014, 3:14 p.m. UTC | #3
On Tue, May 13, 2014 at 07:57:57AM -0700, Jesse Barnes wrote:
> On Tue, 13 May 2014 08:08:55 +0200
> Daniel Vetter <daniel@ffwll.ch> wrote:
> 
> > On Tue, May 13, 2014 at 12:37 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > > Like on ILK, the pipe won't be running until later on.
> > 
> > Like on ilk?! Since when is vlv display derived from that? "[PATCH
> > 3/4] drm/i915: Kill vblank waits after pipe enable on gmch platforms"
> > from Ville makes a more consistent impression to me. Also, and
> 
> Yeah that's fine too.  But of course BYT isn't just i915 legacy; it
> also includes some IBX logic on the port side.  So you can't just lump
> it in with i9xx all the time unfortuantely.  Either way it looks like
> Ville's patch will fix this too.

Hm, I've thought the dp/hdmi ports are from g4x and the pll stuff from the
cedarview ... it's a frankenstein for sure ;-)

> > Bugzilla: tags for this one?
> 
> Meh, this particular one only addresses an internal bug, and it looks
> like Ville didn't include a bz link either... did you add it when you
> committed?
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=77297 looks like the closest.

Yeah, looks like a match, I'll add it. Although the bug also refers to
pch-split platforms ... I'll ask for retesting overall.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c65e7f7..c66d2ea 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4344,7 +4344,6 @@  static void valleyview_crtc_enable(struct drm_crtc *crtc)
 
 	intel_update_watermarks(crtc);
 	intel_enable_pipe(intel_crtc);
-	intel_wait_for_vblank(dev_priv->dev, pipe);
 	intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);
 
 	intel_enable_primary_hw_plane(dev_priv, plane, pipe);