- drm-i915-only-use-tiled-blits-on-965.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     DRM/i915: only use tiled blits on 965+
has been removed from the -mm tree.  Its filename was
     drm-i915-only-use-tiled-blits-on-965.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: DRM/i915: only use tiled blits on 965+
From: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

When scheduled swaps occur, we need to blit between front & back buffers. 
If the buffers are tiled, we need to set the appropriate XY_SRC_COPY tile
bit, but only on 965 chips, since it will cause corruption on pre-965
(e.g.  945).

Bug reported by and fix tested by Tomas Janousek.

Reported-by: Tomas Janousek <tomi@xxxxxxx>
Tested-by: Tomas Janousek <tomi@xxxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Cc: Keith Packard <keithp@xxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/char/drm/i915_irq.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/char/drm/i915_irq.c~drm-i915-only-use-tiled-blits-on-965 drivers/char/drm/i915_irq.c
--- a/drivers/char/drm/i915_irq.c~drm-i915-only-use-tiled-blits-on-965
+++ a/drivers/char/drm/i915_irq.c
@@ -62,11 +62,11 @@ static void i915_vblank_tasklet(struct d
 	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;
 	}
_

Patches currently in -mm which might be from jbarnes@xxxxxxxxxxxxxxxx are

origin.patch
pci-vt3336-cant-do-msi-either.patch
linux-next.patch
x86-pci-use-dev_printk-when-possible.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux