From: Keith Packard <keithp@keithp.com>
Date: Sun, 20 Apr 2008 08:55:57 +0000 (-0700)
Subject: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
X-Git-Tag: submit/1.0/20121108.012404~900
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21dbba5a227e20dd64ce300cc78927e139a684dd;p=profile%2Fivi%2Flibdrm.git

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.
---

diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index a9b67a9..2aa0d45 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -279,16 +279,29 @@ static void i915_vblank_tasklet(struct drm_device *dev)
 			}
 
 			if (init_drawrect) {
-				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();
+				int width  = sarea_priv->width;
+				int height = sarea_priv->height;
+				if (IS_I965G(dev)) {
+					BEGIN_LP_RING(4);
+
+					OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
+					OUT_RING(0);
+					OUT_RING(((width - 1) & 0xffff) | ((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(((width - 1) & 0xffff) | ((height - 1) << 16));
+					OUT_RING(0);
+					OUT_RING(0);
+					
+					ADVANCE_LP_RING();
+				}
 
 				sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;