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
Sorry this is so late, after much talking at LCA we decided to pull TTM
from this round and I had to re-order a lot of things, so highlights of
this bunch are
intel driver suspend/resume support - can bring back text mode now.
basic radeon r500 CP support
sysfs cleanups.
fix pci_set_master not being called breaking some radeons.
Dave.
drivers/char/drm/Kconfig | 9 +-
drivers/char/drm/Makefile | 2 -
drivers/char/drm/README.drm | 1 -
drivers/char/drm/ati_pcigart.c | 6 +-
drivers/char/drm/drm.h | 3 +-
drivers/char/drm/drmP.h | 68 ++--
drivers/char/drm/drm_agpsupport.c | 3 +-
drivers/char/drm/drm_bufs.c | 23 +-
drivers/char/drm/drm_context.c | 2 +-
drivers/char/drm/drm_drv.c | 39 +-
drivers/char/drm/drm_hashtab.c | 5 +-
drivers/char/drm/drm_hashtab.h | 1 -
drivers/char/drm/drm_ioc32.c | 6 +-
drivers/char/drm/drm_ioctl.c | 25 +-
drivers/char/drm/drm_irq.c | 4 +-
drivers/char/drm/drm_memory.c | 1 -
drivers/char/drm/drm_mm.c | 1 -
drivers/char/drm/drm_os_linux.h | 4 +-
drivers/char/drm/drm_pciids.h | 97 +++++-
drivers/char/drm/drm_proc.c | 4 +-
drivers/char/drm/drm_sarea.h | 2 +-
drivers/char/drm/drm_scatter.c | 10 +-
drivers/char/drm/drm_stub.c | 18 +-
drivers/char/drm/drm_sysfs.c | 146 +++++---
drivers/char/drm/drm_vm.c | 4 +-
drivers/char/drm/i810_dma.c | 24 +-
drivers/char/drm/i810_drv.h | 52 ++--
drivers/char/drm/i830_dma.c | 2 +-
drivers/char/drm/i830_drm.h | 8 +-
drivers/char/drm/i830_drv.h | 51 ++--
drivers/char/drm/i830_irq.c | 2 +-
drivers/char/drm/i915_dma.c | 124 +++---
drivers/char/drm/i915_drv.c | 464 ++++++++++++++++++++-
drivers/char/drm/i915_drv.h | 848 +++++++++++++++++++++++++++++++++++--
drivers/char/drm/i915_irq.c | 26 +-
drivers/char/drm/i915_mem.c | 11 +-
drivers/char/drm/mga_dma.c | 10 +-
drivers/char/drm/mga_drv.h | 123 +++---
drivers/char/drm/mga_state.c | 24 +-
drivers/char/drm/r128_cce.c | 6 +-
drivers/char/drm/r128_drv.h | 5 +-
drivers/char/drm/r128_state.c | 43 +-
drivers/char/drm/r300_cmdbuf.c | 75 ++--
drivers/char/drm/r300_reg.h | 32 +-
drivers/char/drm/radeon_cp.c | 166 +++++---
drivers/char/drm/radeon_drm.h | 13 +-
drivers/char/drm/radeon_drv.h | 91 ++++-
drivers/char/drm/radeon_irq.c | 6 +-
drivers/char/drm/radeon_mem.c | 6 +-
drivers/char/drm/radeon_state.c | 18 +-
drivers/char/drm/savage_state.c | 6 +-
drivers/char/drm/sis_mm.c | 6 +-
drivers/char/drm/via_dma.c | 20 +-
drivers/char/drm/via_dmablit.c | 184 ++++----
drivers/char/drm/via_dmablit.h | 84 ++--
drivers/char/drm/via_drm.h | 4 +-
drivers/char/drm/via_drv.c | 2 +-
drivers/char/drm/via_irq.c | 26 +-
drivers/char/drm/via_map.c | 5 +-
drivers/char/drm/via_mm.c | 6 +-
drivers/char/drm/via_video.c | 4 +-
61 files changed, 2291 insertions(+), 770 deletions(-)
commit 3d5e2c13b13468f5eb2ac9323690af7e17f195fe
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 7 15:01:05 2008 +1000
drm: add initial r500 drm support
This adds CP support for the r500 series of chips, and allows
accel 2D support on these chips with a new radeon driver.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 576cc458a64673ecf3fa7f1bab751e52fd939071
Author: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Thu Feb 7 14:59:24 2008 +1000
radeon: setup the ring buffer fetcher to be less agressive.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 9d5b3ffc42f7820e8ee07705496955e4c2c38dd9
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 7 14:51:32 2008 +1000
drm: fixup some of the ioctl function exit paths
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 19a8f59ab8ceee751ea720085098355d53f727d6
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 7 14:48:32 2008 +1000
drm: the drm really should call pci_set_master..
perhaps bonghits could turn on my bus-mastering because the drm
certainly never bothered doing it before.
Signed-off-by: Dave Airlie <airlied@linux.ie>
commit 5f5f9d4c7bf96c044fb98c7c107172a730b2a247
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Thu Jan 24 16:46:36 2008 +1000
i915: Add chipset id for Intel Integrated Graphics Device
This adds new chipset id in drm.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3e684eae586a9b210a4517da5637a255b1ff5a92
Author: M
