| Message ID | 1383695281-1189-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 05, 2013 at 03:48:01PM -0800, Jesse Barnes wrote: > This fixes a mismatch between our vblank enable code and our IRQ > handler. Also, since vblank start events come in before page flips > reliably, it also fixes the kms_flip plain-flip test on my BYT system. > > Spotted-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> So kms_flip isn't totally crap I hear? One problem is that the iosf bug is blocking QA's ability to use kms_flip as a regression tests. I wonder a bit whether we need to split out the results as subtests so that each connector type can be tracked individually. The problem with that is that we'd have unstable subtest names, which is a bit ugly ... Good ideas highly welcome. Picked up for -fixes, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_irq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 2a44816..32c9c8d 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1353,7 +1353,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) > spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); > > for_each_pipe(pipe) { > - if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS) > + if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS) > drm_handle_vblank(dev, pipe); > > if (pipe_stats[pipe] & PLANE_FLIPDONE_INT_STATUS_VLV) { > -- > 1.8.4.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2a44816..32c9c8d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1353,7 +1353,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags); for_each_pipe(pipe) { - if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS) + if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS) drm_handle_vblank(dev, pipe); if (pipe_stats[pipe] & PLANE_FLIPDONE_INT_STATUS_VLV) {
This fixes a mismatch between our vblank enable code and our IRQ handler. Also, since vblank start events come in before page flips reliably, it also fixes the kms_flip plain-flip test on my BYT system. Spotted-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)