Hi Linus,

Please pull the 'drm-patches' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-patches

I've reverted the vblank changeset for now, it looks like it needs more
baking, the rest is a better fix to previous locking changes and some more
i915 register saving/restoring.

Dave.

drivers/char/drm/drm.h | 17 --
drivers/char/drm/drmP.h | 91 ++-----
drivers/char/drm/drm_fops.c | 7 +-
drivers/char/drm/drm_irq.c | 381 ++++----------------------
drivers/char/drm/drm_lock.c | 35 +--
drivers/char/drm/i915_dma.c | 160 +++--------
drivers/char/drm/i915_drm.h | 45 +---
drivers/char/drm/i915_drv.c | 23 +-
drivers/char/drm/i915_drv.h | 115 ++-------
drivers/char/drm/i915_irq.c | 597 +++++++++++------------------------------
drivers/char/drm/mga_drv.c | 7 +-
drivers/char/drm/mga_drv.h | 6 +-
drivers/char/drm/mga_irq.c | 69 ++----
drivers/char/drm/r128_drv.c | 7 +-
drivers/char/drm/r128_drv.h | 9 +-
drivers/char/drm/r128_irq.c | 55 ++---
drivers/char/drm/radeon_drv.c | 8 +-
drivers/char/drm/radeon_drv.h | 19 +-
drivers/char/drm/radeon_irq.c | 171 ++++++------
drivers/char/drm/via_drv.c | 6 +-
drivers/char/drm/via_drv.h | 7 +-
drivers/char/drm/via_irq.c | 81 +++----
22 files changed, 513 insertions(+), 1403 deletions(-)

commit e948e99400b28af152414f15f8c8023ff2430b79
Author: Keith Packard
Date: Wed May 7 12:27:53 2008 +1000

drm/i915: save and restore dsparb and d_state registers.

Signed-off-by: Dave Airlie

commit a59e122a67b88925944d3bbf33d15229cf0fc3de
Author: Jesse Barnes
Date: Wed May 7 12:25:46 2008 +1000

drm/i915: fix off by one in VGA save/restore of AR & CR regs.

turns out it's important to save/restore AR14 in particular.

Signed-off-by: Dave Airlie

commit f116cc561eae0a426b8fa6b3e22e80ba0bcf7aee
Author: Thomas Hellstrom
Date: Wed May 7 12:22:39 2008 +1000

drm: disable tasklets not IRQs when taking the drm lock spinlock

Signed-off-by: Dave Airlie

commit af6061af0d9f84a4665f88186dc1ff9e4fb78330
Author: Dave Airlie
Date: Wed May 7 12:15:39 2008 +1000

Revert "drm/vbl rework: rework how the drm deals with vblank."

This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4.

Okay this looks like wasn't as fully baked as I'd led myself to believe.

Revert for now for further baking.

Signed-off-by: Dave Airlie
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/