From 9a912ba34d5bb18cbbf1e7792311a3a9d3a884e4 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 1 Jul 2008 12:32:52 -0700 Subject: [PATCH] --- yaml --- r: 98527 b: refs/heads/master c: 3d25802e3ba7c82457b5c12bbfeefe391d8a333e h: refs/heads/master i: 98525: a6db8a029c1fcbaddac8ff647372b559f24c2e0d 98523: 5bef98b0c320449d525a8d0e7e46af74bf227626 98519: cd5569f3d891f20f552be2131a0db3c39195a5cc 98511: f56ee5f9face88f265da0b2b68ed1c8d72724970 98495: 597b1963912c5f1c6e55da1f1cbea882e7cfdceb v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/i915_irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5d79a99f1a1..79205e42683b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83680cdbcecd1fd284ad4df060d12bf214bb63a8 +refs/heads/master: 3d25802e3ba7c82457b5c12bbfeefe391d8a333e diff --git a/trunk/drivers/char/drm/i915_irq.c b/trunk/drivers/char/drm/i915_irq.c index f7f16e7a8bf3..df036118b8b1 100644 --- a/trunk/drivers/char/drm/i915_irq.c +++ b/trunk/drivers/char/drm/i915_irq.c @@ -62,11 +62,11 @@ static void i915_vblank_tasklet(struct drm_device *dev) u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24); RING_LOCALS; - if (sarea_priv->front_tiled) { + if (IS_I965G(dev) && sarea_priv->front_tiled) { cmd |= XY_SRC_COPY_BLT_DST_TILED; dst_pitch >>= 2; } - if (sarea_priv->back_tiled) { + if (IS_I965G(dev) && sarea_priv->back_tiled) { cmd |= XY_SRC_COPY_BLT_SRC_TILED; src_pitch >>= 2; }