diff options
| author | Keith Packard <keithp@keithp.com> | 2008-04-21 10:27:24 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-26 11:48:47 +0400 |
| commit | a36b7dcc05bc4c4580f11cf78e95edfefa86b8a6 (patch) | |
| tree | 568d3d5931ee7f83d2ee6862bb9f18feca91f772 | |
| parent | f1c3e67eb73a4a1db31e235883156ac098e29ff6 (diff) | |
| download | linux-a36b7dcc05bc4c4580f11cf78e95edfefa86b8a6.tar.xz | |
drm/i965: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
The batchbuffer submission paths were fixed to use the 965-specific command,
but the vblank tasklet was not. When the older version is sent, the 965 will
lock up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/char/drm/i915_irq.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index 92653b38e64c..5a6f8309d8be 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c @@ -125,16 +125,26 @@ static void i915_vblank_tasklet(struct drm_device *dev) i915_kernel_lost_context(dev); - BEGIN_LP_RING(6); - - OUT_RING(GFX_OP_DRAWRECT_INFO); - OUT_RING(0); - OUT_RING(0); - OUT_RING(sarea_priv->width | sarea_priv->height << 16); - OUT_RING(sarea_priv->width | sarea_priv->height << 16); - OUT_RING(0); - - ADVANCE_LP_RING(); + if (IS_I965G(dev)) { + BEGIN_LP_RING(4); + + OUT_RING(GFX_OP_DRAWRECT_INFO_I965); + OUT_RING(0); + OUT_RING(((sarea_priv->width - 1) & 0xffff) | ((sarea_priv->height - 1) << 16)); + OUT_RING(0); + ADVANCE_LP_RING(); + } else { + BEGIN_LP_RING(6); + + OUT_RING(GFX_OP_DRAWRECT_INFO); + OUT_RING(0); + OUT_RING(0); + OUT_RING(sarea_priv->width | sarea_priv->height << 16); + OUT_RING(sarea_priv->width | sarea_priv->height << 16); + OUT_RING(0); + + ADVANCE_LP_RING(); + } sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT; |