* [PATCH] drm/i915: fix up ivb plane 3 pageflips
@ 2012-05-23 11:20 Daniel Vetter
2012-05-23 11:30 ` Chris Wilson
0 siblings, 1 reply; 9+ messages in thread
From: Daniel Vetter @ 2012-05-23 11:20 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Or at least plug another gapping hole. Apparrently hw desingers only
moved the bit field, but did not bother ot re-enumerate the planes
when adding support for a 3rd pipe.
Discovered by i-g-t/flip_test.
This may or may not fix the reference bugzilla, because that one
smells like we have still larger fish to fry.
References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++
drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 2d49b95..76bc275 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -210,6 +210,14 @@
#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
+/* IVB has funny definitions for which plane to flip. */
+#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
+#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
+#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
+
#define MI_SET_CONTEXT MI_INSTR(0x18, 0)
#define MI_MM_SPACE_GTT (1<<8)
#define MI_MM_SPACE_PHYSICAL (0<<8)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 67ed819..bd0d1b0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6158,17 +6158,33 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
+ uint32_t plane_bit = 0;
int ret;
ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
if (ret)
goto err;
+ switch(intel_crtc->plane) {
+ case PLANE_A:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
+ break;
+ case PLANE_B:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
+ break;
+ case PLANE_C:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
+ break;
+ default:
+ WARN(1, "unknown plane in flip command\n");
+ goto err;
+ }
+
ret = intel_ring_begin(ring, 4);
if (ret)
goto err_unpin;
- intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc->plane << 19));
+ intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | plane_bit);
intel_ring_emit(ring, (fb->pitches[0] | obj->tiling_mode));
intel_ring_emit(ring, (obj->gtt_offset));
intel_ring_emit(ring, (MI_NOOP));
--
1.7.9
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-05-23 11:20 [PATCH] drm/i915: fix up ivb plane 3 pageflips Daniel Vetter
@ 2012-05-23 11:30 ` Chris Wilson
2012-05-23 12:02 ` Daniel Vetter
0 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2012-05-23 11:30 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Wed, 23 May 2012 13:20:05 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Or at least plug another gapping hole. Apparrently hw desingers only
> moved the bit field, but did not bother ot re-enumerate the planes
> when adding support for a 3rd pipe.
>
> Discovered by i-g-t/flip_test.
>
> This may or may not fix the reference bugzilla, because that one
> smells like we have still larger fish to fry.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++
> drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++-
> 2 files changed, 25 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 2d49b95..76bc275 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -210,6 +210,14 @@
> #define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
> #define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
> #define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
> +/* IVB has funny definitions for which plane to flip. */
> +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
> +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
> +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
> +
> #define MI_SET_CONTEXT MI_INSTR(0x18, 0)
> #define MI_MM_SPACE_GTT (1<<8)
> #define MI_MM_SPACE_PHYSICAL (0<<8)
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 67ed819..bd0d1b0 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6158,17 +6158,33 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
> + uint32_t plane_bit = 0;
> int ret;
>
> ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
> if (ret)
> goto err;
>
> + switch(intel_crtc->plane) {
> + case PLANE_A:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
> + break;
> + case PLANE_B:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
> + break;
> + case PLANE_C:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
> + break;
> + default:
> + WARN(1, "unknown plane in flip command\n");
Just DRM_ERROR(), the callstack is uninteresting, and make it once? But
more importantly set ret=-EINVAL. Or how about send_fatal_sig() :)
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-05-23 11:30 ` Chris Wilson
@ 2012-05-23 12:02 ` Daniel Vetter
2012-05-23 12:05 ` Chris Wilson
2012-06-05 8:56 ` Daniel Vetter
0 siblings, 2 replies; 9+ messages in thread
From: Daniel Vetter @ 2012-05-23 12:02 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Or at least plug another gapping hole. Apparrently hw desingers only
moved the bit field, but did not bother ot re-enumerate the planes
when adding support for a 3rd pipe.
Discovered by i-g-t/flip_test.
This may or may not fix the reference bugzilla, because that one
smells like we have still larger fish to fry.
v2: Fixup the impossible case to catch programming errors, noticed by
Chris Wilson.
References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++
drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 2d49b95..76bc275 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -210,6 +210,14 @@
#define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
#define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
#define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
+/* IVB has funny definitions for which plane to flip. */
+#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
+#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
+#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
+#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
+
#define MI_SET_CONTEXT MI_INSTR(0x18, 0)
#define MI_MM_SPACE_GTT (1<<8)
#define MI_MM_SPACE_PHYSICAL (0<<8)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 67ed819..9a6e819 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6158,17 +6158,34 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
+ uint32_t plane_bit = 0;
int ret;
ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
if (ret)
goto err;
+ switch(intel_crtc->plane) {
+ case PLANE_A:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
+ break;
+ case PLANE_B:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
+ break;
+ case PLANE_C:
+ plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
+ break;
+ default:
+ WARN_ONCE(1, "unknown plane in flip command\n");
+ ret = -ENODEV;
+ goto err;
+ }
+
ret = intel_ring_begin(ring, 4);
if (ret)
goto err_unpin;
- intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc->plane << 19));
+ intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | plane_bit);
intel_ring_emit(ring, (fb->pitches[0] | obj->tiling_mode));
intel_ring_emit(ring, (obj->gtt_offset));
intel_ring_emit(ring, (MI_NOOP));
--
1.7.9
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-05-23 12:02 ` Daniel Vetter
@ 2012-05-23 12:05 ` Chris Wilson
2012-06-05 8:56 ` Daniel Vetter
1 sibling, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2012-05-23 12:05 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Wed, 23 May 2012 14:02:00 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Or at least plug another gapping hole. Apparrently hw desingers only
> moved the bit field, but did not bother ot re-enumerate the planes
> when adding support for a 3rd pipe.
>
> Discovered by i-g-t/flip_test.
>
> This may or may not fix the reference bugzilla, because that one
> smells like we have still larger fish to fry.
>
> v2: Fixup the impossible case to catch programming errors, noticed by
> Chris Wilson.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
The code looks correct, just not in a position atm to verify the
MI_DISPLAY_FLIP bits.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-05-23 12:02 ` Daniel Vetter
2012-05-23 12:05 ` Chris Wilson
@ 2012-06-05 8:56 ` Daniel Vetter
2012-06-05 16:35 ` Ben Widawsky
2012-06-05 18:52 ` Eugeni Dodonov
1 sibling, 2 replies; 9+ messages in thread
From: Daniel Vetter @ 2012-06-05 8:56 UTC (permalink / raw)
To: Intel Graphics Development, Eugeni Dodonov, Ben Widawsky; +Cc: Daniel Vetter
On Wed, May 23, 2012 at 02:02:00PM +0200, Daniel Vetter wrote:
> Or at least plug another gapping hole. Apparrently hw desingers only
> moved the bit field, but did not bother ot re-enumerate the planes
> when adding support for a 3rd pipe.
>
> Discovered by i-g-t/flip_test.
>
> This may or may not fix the reference bugzilla, because that one
> smells like we have still larger fish to fry.
>
> v2: Fixup the impossible case to catch programming errors, noticed by
> Chris Wilson.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Ping for review and maybe a tested-by. This fixes i-g-t/tests/flip_test on
my ivb, but for some strange reasons QA can't confirm that. Still, I'd
like to push this patch to -fixes. Eugeni, Ben?
Thanks, Daniel
> ---
> drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++
> drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++++++-
> 2 files changed, 26 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 2d49b95..76bc275 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -210,6 +210,14 @@
> #define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
> #define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
> #define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
> +/* IVB has funny definitions for which plane to flip. */
> +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
> +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
> +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
> +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
> +
> #define MI_SET_CONTEXT MI_INSTR(0x18, 0)
> #define MI_MM_SPACE_GTT (1<<8)
> #define MI_MM_SPACE_PHYSICAL (0<<8)
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 67ed819..9a6e819 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6158,17 +6158,34 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
> + uint32_t plane_bit = 0;
> int ret;
>
> ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
> if (ret)
> goto err;
>
> + switch(intel_crtc->plane) {
> + case PLANE_A:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
> + break;
> + case PLANE_B:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
> + break;
> + case PLANE_C:
> + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
> + break;
> + default:
> + WARN_ONCE(1, "unknown plane in flip command\n");
> + ret = -ENODEV;
> + goto err;
> + }
> +
> ret = intel_ring_begin(ring, 4);
> if (ret)
> goto err_unpin;
>
> - intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc->plane << 19));
> + intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | plane_bit);
> intel_ring_emit(ring, (fb->pitches[0] | obj->tiling_mode));
> intel_ring_emit(ring, (obj->gtt_offset));
> intel_ring_emit(ring, (MI_NOOP));
> --
> 1.7.9
>
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-06-05 8:56 ` Daniel Vetter
@ 2012-06-05 16:35 ` Ben Widawsky
2012-06-05 18:52 ` Eugeni Dodonov
1 sibling, 0 replies; 9+ messages in thread
From: Ben Widawsky @ 2012-06-05 16:35 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, Eugeni, Daniel Vetter
On Tue, 5 Jun 2012 10:56:58 +0200
Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, May 23, 2012 at 02:02:00PM +0200, Daniel Vetter wrote:
> > Or at least plug another gapping hole. Apparrently hw desingers only
> > moved the bit field, but did not bother ot re-enumerate the planes
> > when adding support for a 3rd pipe.
> >
> > Discovered by i-g-t/flip_test.
> >
> > This may or may not fix the reference bugzilla, because that one
> > smells like we have still larger fish to fry.
> >
> > v2: Fixup the impossible case to catch programming errors, noticed by
> > Chris Wilson.
> >
> > References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
> > Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Ping for review and maybe a tested-by. This fixes i-g-t/tests/flip_test on
> my ivb, but for some strange reasons QA can't confirm that. Still, I'd
> like to push this patch to -fixes. Eugeni, Ben?
>
> Thanks, Daniel
I'm starting to review it. I need to do some background reading first.
>
> > ---
> > drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++
> > drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++++++-
> > 2 files changed, 26 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 2d49b95..76bc275 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -210,6 +210,14 @@
> > #define MI_DISPLAY_FLIP MI_INSTR(0x14, 2)
> > #define MI_DISPLAY_FLIP_I915 MI_INSTR(0x14, 1)
> > #define MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
> > +/* IVB has funny definitions for which plane to flip. */
> > +#define MI_DISPLAY_FLIP_IVB_PLANE_A (0 << 19)
> > +#define MI_DISPLAY_FLIP_IVB_PLANE_B (1 << 19)
> > +#define MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
> > +#define MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
> > +#define MI_DISPLAY_FLIP_IVB_PLANE_C (4 << 19)
> > +#define MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
> > +
> > #define MI_SET_CONTEXT MI_INSTR(0x18, 0)
> > #define MI_MM_SPACE_GTT (1<<8)
> > #define MI_MM_SPACE_PHYSICAL (0<<8)
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 67ed819..9a6e819 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -6158,17 +6158,34 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
> > struct drm_i915_private *dev_priv = dev->dev_private;
> > struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> > struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
> > + uint32_t plane_bit = 0;
> > int ret;
> >
> > ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
> > if (ret)
> > goto err;
> >
> > + switch(intel_crtc->plane) {
> > + case PLANE_A:
> > + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
> > + break;
> > + case PLANE_B:
> > + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
> > + break;
> > + case PLANE_C:
> > + plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
> > + break;
> > + default:
> > + WARN_ONCE(1, "unknown plane in flip command\n");
> > + ret = -ENODEV;
> > + goto err;
> > + }
> > +
> > ret = intel_ring_begin(ring, 4);
> > if (ret)
> > goto err_unpin;
> >
> > - intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc->plane << 19));
> > + intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | plane_bit);
> > intel_ring_emit(ring, (fb->pitches[0] | obj->tiling_mode));
> > intel_ring_emit(ring, (obj->gtt_offset));
> > intel_ring_emit(ring, (MI_NOOP));
> > --
> > 1.7.9
> >
>
--
Ben Widawsky, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-06-05 8:56 ` Daniel Vetter
2012-06-05 16:35 ` Ben Widawsky
@ 2012-06-05 18:52 ` Eugeni Dodonov
2012-06-05 18:59 ` Eugeni Dodonov
1 sibling, 1 reply; 9+ messages in thread
From: Eugeni Dodonov @ 2012-06-05 18:52 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, Ben Widawsky, Daniel Vetter
On 06/05/2012 05:56 AM, Daniel Vetter wrote:
> On Wed, May 23, 2012 at 02:02:00PM +0200, Daniel Vetter wrote:
>> Or at least plug another gapping hole. Apparrently hw desingers only
>> moved the bit field, but did not bother ot re-enumerate the planes
>> when adding support for a 3rd pipe.
>>
>> Discovered by i-g-t/flip_test.
>>
>> This may or may not fix the reference bugzilla, because that one
>> smells like we have still larger fish to fry.
>>
>> v2: Fixup the impossible case to catch programming errors, noticed by
>> Chris Wilson.
>>
>> References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
>> Signed-Off-by: Daniel Vetter<daniel.vetter@ffwll.ch>
>
> Ping for review and maybe a tested-by. This fixes i-g-t/tests/flip_test on
> my ivb, but for some strange reasons QA can't confirm that. Still, I'd
> like to push this patch to -fixes. Eugeni, Ben?
Although I don't get exact symptoms (I don't get any BUG in dmesg),
without this patch the flip_test hangs when running on 3rd pipe, and
with this patch it proceeds and finishes correctly.
So this patch fixes this test case, and as far I can see it is correct.
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Eugeni
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-06-05 18:52 ` Eugeni Dodonov
@ 2012-06-05 18:59 ` Eugeni Dodonov
2012-06-05 19:06 ` Daniel Vetter
0 siblings, 1 reply; 9+ messages in thread
From: Eugeni Dodonov @ 2012-06-05 18:59 UTC (permalink / raw)
To: eugeni.dodonov; +Cc: Daniel Vetter, Intel Graphics Development, Ben Widawsky
On 06/05/2012 03:52 PM, Eugeni Dodonov wrote:
> On 06/05/2012 05:56 AM, Daniel Vetter wrote:
>> On Wed, May 23, 2012 at 02:02:00PM +0200, Daniel Vetter wrote:
>>> Or at least plug another gapping hole. Apparrently hw desingers only
>>> moved the bit field, but did not bother ot re-enumerate the planes
>>> when adding support for a 3rd pipe.
>>>
>>> Discovered by i-g-t/flip_test.
>>>
>>> This may or may not fix the reference bugzilla, because that one
>>> smells like we have still larger fish to fry.
>>>
>>> v2: Fixup the impossible case to catch programming errors, noticed by
>>> Chris Wilson.
>>>
>>> References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
>>> Signed-Off-by: Daniel Vetter<daniel.vetter@ffwll.ch>
>>
>> Ping for review and maybe a tested-by. This fixes
>> i-g-t/tests/flip_test on
>> my ivb, but for some strange reasons QA can't confirm that. Still, I'd
>> like to push this patch to -fixes. Eugeni, Ben?
>
> Although I don't get exact symptoms (I don't get any BUG in dmesg),
> without this patch the flip_test hangs when running on 3rd pipe, and
> with this patch it proceeds and finishes correctly.
>
> So this patch fixes this test case, and as far I can see it is correct.
>
> Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
..and also Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: fix up ivb plane 3 pageflips
2012-06-05 18:59 ` Eugeni Dodonov
@ 2012-06-05 19:06 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2012-06-05 19:06 UTC (permalink / raw)
To: eugeni.dodonov; +Cc: Daniel Vetter, Intel Graphics Development, Ben Widawsky
On Tue, Jun 05, 2012 at 03:59:15PM -0300, Eugeni Dodonov wrote:
> On 06/05/2012 03:52 PM, Eugeni Dodonov wrote:
> >On 06/05/2012 05:56 AM, Daniel Vetter wrote:
> >>On Wed, May 23, 2012 at 02:02:00PM +0200, Daniel Vetter wrote:
> >>>Or at least plug another gapping hole. Apparrently hw desingers only
> >>>moved the bit field, but did not bother ot re-enumerate the planes
> >>>when adding support for a 3rd pipe.
> >>>
> >>>Discovered by i-g-t/flip_test.
> >>>
> >>>This may or may not fix the reference bugzilla, because that one
> >>>smells like we have still larger fish to fry.
> >>>
> >>>v2: Fixup the impossible case to catch programming errors, noticed by
> >>>Chris Wilson.
> >>>
> >>>References: https://bugs.freedesktop.org/show_bug.cgi?id=50069
> >>>Signed-Off-by: Daniel Vetter<daniel.vetter@ffwll.ch>
> >>
> >>Ping for review and maybe a tested-by. This fixes
> >>i-g-t/tests/flip_test on
> >>my ivb, but for some strange reasons QA can't confirm that. Still, I'd
> >>like to push this patch to -fixes. Eugeni, Ben?
> >
> >Although I don't get exact symptoms (I don't get any BUG in dmesg),
> >without this patch the flip_test hangs when running on 3rd pipe, and
> >with this patch it proceeds and finishes correctly.
> >
> >So this patch fixes this test case, and as far I can see it is correct.
> >
> >Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
>
> ..and also Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Picked up for -fixes (with a cc stable added), thanks for the review and
testing.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-06-05 19:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-23 11:20 [PATCH] drm/i915: fix up ivb plane 3 pageflips Daniel Vetter
2012-05-23 11:30 ` Chris Wilson
2012-05-23 12:02 ` Daniel Vetter
2012-05-23 12:05 ` Chris Wilson
2012-06-05 8:56 ` Daniel Vetter
2012-06-05 16:35 ` Ben Widawsky
2012-06-05 18:52 ` Eugeni Dodonov
2012-06-05 18:59 ` Eugeni Dodonov
2012-06-05 19:06 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox