Hi Linus,
Please pull the 'drm-fixes' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
This contains an intel oops fix, and some fixups to the lock code since
it got split into the per-master code.
Dave.
drivers/gpu/drm/drm_bufs.c | 2 +-
drivers/gpu/drm/drm_fops.c | 14 ++++++++++++++
drivers/gpu/drm/drm_lock.c | 3 ++-
drivers/gpu/drm/drm_stub.c | 8 --------
drivers/gpu/drm/i915/i915_irq.c | 5 +++--
5 files changed, 20 insertions(+), 12 deletions(-)
commit 299eb93c5f651b2bc368ada67d8471e4c575fa21
Author: Eric Anholt <[email protected]>
Date: Tue Feb 24 22:14:12 2009 -0800
drm/i915: Fix use-before-null-check in i915_irq_emit().
This could be triggered by a client asking to emit an irq when the device
wasn't initialized.
Signed-off-by: Eric Anholt <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit fda714c29cdf360464059044b221450decb4b913
Author: Thomas Hellstrom <[email protected]>
Date: Mon Mar 2 11:10:56 2009 +0100
drm: Avoid client deadlocks when the master disappears.
This is done by
1) Wake up lock waiters when we close the master file descriptor.
Not when the master structure is removed, since the latter
requires the waiters themselves to release the refcount on the
master structure -> Deadlock.
2) Send a SIGTERM to all clients waiting for the lock.
Normally these clients will get a SIGPIPE when the X server dies,
but clients may also spin trying to grab the DRM lock, without
getting any sort of notification.
Signed-off-by: Thomas Hellstrom <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 171901d15deeef61aa8e1b0d0772404f39691b73
Author: Thomas Hellstrom <[email protected]>
Date: Mon Mar 2 11:10:55 2009 +0100
drm: Wake up all lock waiters when the master disappears.
Currently only one waiter is woken up, leaving other waiters
hanging waiting for the DRM lock.
Signed-off-by: Thomas Hellstrom <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 4d77c88e912e5eb9480432af09e950ca8995c253
Author: Thomas Hellstrom <[email protected]>
Date: Mon Mar 2 11:10:54 2009 +0100
drm: Don't return ERESTARTSYS to user-space.
That return code is for in-kernel use only.
Use EINTR instead.
Signed-off-by: Thomas Hellstrom <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>