Hi Linus,
Please pull the 'drm-patches' branch of
git://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-patches
This contains the drm patch for 2.6.22-rc1, and contains a number of fixes
in the mmap code and the locking for AIGLX systems along with new hw support
for i965GM.
Dave.
drivers/char/drm/README.drm | 16 +++--
drivers/char/drm/drm.h | 4 +-
drivers/char/drm/drmP.h | 23 +------
drivers/char/drm/drm_bufs.c | 75 +++--------------------
drivers/char/drm/drm_drv.c | 9 +--
drivers/char/drm/drm_fops.c | 96 ++++++++++++++--------------
drivers/char/drm/drm_hashtab.c | 17 +-----
drivers/char/drm/drm_hashtab.h | 1 -
drivers/char/drm/drm_irq.c | 4 +-
drivers/char/drm/drm_lock.c | 134 ++++++++-------------------------------
drivers/char/drm/drm_mm.c | 2 +
drivers/char/drm/drm_pciids.h | 3 +-
drivers/char/drm/drm_proc.c | 2 +-
drivers/char/drm/drm_stub.c | 1 -
drivers/char/drm/drm_vm.c | 102 ++++++++++++-------------------
drivers/char/drm/i915_dma.c | 3 +-
drivers/char/drm/radeon_cp.c | 8 +-
drivers/char/drm/sis_drv.c | 2 +-
drivers/char/drm/via_drv.c | 3 +-
drivers/char/drm/via_mm.h | 40 ++++++++++++
20 files changed, 196 insertions(+), 349 deletions(-)
commit ce7dd06372058f9e3e57ee4c0aeba694a43a80ad
Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
Date: Thu Apr 26 07:42:56 2007 +1000
drm/i915: Add 965GM pci id update
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 9e9c1326a592c677c94d730fcf4446d0e275aef4
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Mar 24 17:57:54 2007 +1100
drm: just use io_remap_pfn_range on all archs..
Move the sparc64 ifdef around to clean this up.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 38315878a560eede1a2db52e511ad3a2cfbb4206
Author: Hugh Dickins <hugh@veritas.com>
Date: Sat Mar 24 17:55:16 2007 +1100
drm: fix DRM_CONSISTENT mapping
This patch got lost in the DRM git tree for ages, bring it back to life.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit d7d8aac79dc38cbdef83b774e49bafdae9918137
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sat Mar 24 17:52:49 2007 +1100
drm: fix up mmap locking in preparation for ttm changes
This change is needed to protect againt disappearing maps which aren't common.
The map lists are protected using sturct_mutex but drm_mmap never locked it.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 040ac32048d5efabd557c1e0a6ab8aec2c710c56
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri Mar 23 13:28:33 2007 +1100
drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
Bugzilla Bug #9457
Add refcounting of user waiters to the DRM hardware lock, so that we can use
DRM_LOCK_CONT flag more conservatively.
Also add a kernel waiter refcount that if nonzero transfers the lock for the
kernel context when it is released. This is useful when waiting for idle and can be used for very simple fence object driver implementations for the new memory manager
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 4b560fde06aeb342f3ff0bce924627ab722d251a
Author: Andrew Morton <akpm@linux-foundation.org>
Date: Mon Mar 19 09:08:21 2007 +1100
drm: fix warning in drm_fops.c
drivers/char/drm/drm_fops.c: In function 'drm_setup':
drivers/char/drm/drm_fops.c:60: warning: comparison of distinct pointer types lacks a cast
Unfortunately PAGE_SIZE has different types on different architectures.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 99da6d861c659bb1a961b70f50fad268b9ed5a5f
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon Mar 19 08:52:17 2007 +1100
drm: allow for more generic drm ioctls
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 6244270ef62203e057191bf85489e2ff91cc0e60
Author: Jay Estabrook <Jay.Estabrook@hp.com>
Date: Sun Mar 11 11:46:27 2007 +1100
drm: fix alpha domain handling
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 74be8e3b3707956f8f232313de9fad896d5489ac
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Mar 11 11:45:24 2007 +1100
via: fix CX700 pci id
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 0bead7cdc94b4897f3d92db6170737a2da527134
Author: Adrian Bunk <bunk@stusta.de>
Date: Sun Mar 11 11:41:16 2007 +1100
drm: make drm_io_prot static.
This patch makes the needlessly global drm_io_prot() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 5379397182a7b5fa1c68ceaefe311ce4c1d04b2a
Author: Robert P. J. Day <rpjday@mindspring.com>
Date: Sun Mar 11 11:39:31 2007 +1100
drm: remove via_mm.h
Delete apparently unused header file drivers/char/drm/via_mm.h.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit c1185ccdfb797df82fa84b581eea128041bd63b0
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 18 18:23:11 2007 +1100
drm: add missing NULL assignment
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 80b2c386f3d8c3367533a8600b599f8686c9d386
Author: Michel D
