Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (44 commits) drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831) drm: make CONFIG_DRM depend on CONFIG_SHMEM. radeon: fix PCI bus mastering support enables. radeon: add RS400 family support. drm/radeon: add support for RS740 IGP chipsets. i915: GM45 has GM965-style MCH setup. i915: Don't run retire work handler while suspended i915: Map status page cached for chips with GTT-based HWS location. i915: Fix up ring initialization to cover G45 oddities i915: Use non-reserved status page index for breadcrumb drm: Increment dev_priv->irq_received so i915_gem_interrupts count works. drm: kill drm_device->irq drm: wbinvd is cache coherent. i915: add missing return in error path. i915: fixup permissions on gem ioctls. drm: Clean up many sparse warnings in i915. drm: Use ioremap_wc in i915_driver instead of ioremap, since we always want WC. drm: G33-class hardware has a newer 965-style MCH (no DCC register). drm: Avoid oops in GEM execbuffers with bad arguments. DRM: Return -EBADF on bad object in flink, and return curent name if it exists. ...
No related branches found
No related tags found
Showing
- arch/x86/mm/highmem_32.c 1 addition, 0 deletionsarch/x86/mm/highmem_32.c
- drivers/gpu/drm/Kconfig 2 additions, 1 deletiondrivers/gpu/drm/Kconfig
- drivers/gpu/drm/Makefile 3 additions, 2 deletionsdrivers/gpu/drm/Makefile
- drivers/gpu/drm/drm_agpsupport.c 51 additions, 1 deletiondrivers/gpu/drm/drm_agpsupport.c
- drivers/gpu/drm/drm_cache.c 69 additions, 0 deletionsdrivers/gpu/drm/drm_cache.c
- drivers/gpu/drm/drm_drv.c 6 additions, 0 deletionsdrivers/gpu/drm/drm_drv.c
- drivers/gpu/drm/drm_fops.c 7 additions, 1 deletiondrivers/gpu/drm/drm_fops.c
- drivers/gpu/drm/drm_gem.c 421 additions, 0 deletionsdrivers/gpu/drm/drm_gem.c
- drivers/gpu/drm/drm_irq.c 387 additions, 77 deletionsdrivers/gpu/drm/drm_irq.c
- drivers/gpu/drm/drm_memory.c 2 additions, 0 deletionsdrivers/gpu/drm/drm_memory.c
- drivers/gpu/drm/drm_mm.c 4 additions, 1 deletiondrivers/gpu/drm/drm_mm.c
- drivers/gpu/drm/drm_proc.c 122 additions, 13 deletionsdrivers/gpu/drm/drm_proc.c
- drivers/gpu/drm/drm_stub.c 10 additions, 1 deletiondrivers/gpu/drm/drm_stub.c
- drivers/gpu/drm/drm_sysfs.c 1 addition, 1 deletiondrivers/gpu/drm/drm_sysfs.c
- drivers/gpu/drm/i915/Makefile 6 additions, 1 deletiondrivers/gpu/drm/i915/Makefile
- drivers/gpu/drm/i915/i915_dma.c 226 additions, 106 deletionsdrivers/gpu/drm/i915/i915_dma.c
- drivers/gpu/drm/i915/i915_drv.c 14 additions, 462 deletionsdrivers/gpu/drm/i915/i915_drv.c
- drivers/gpu/drm/i915/i915_drv.h 350 additions, 830 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 2558 additions, 0 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_debug.c 201 additions, 0 deletionsdrivers/gpu/drm/i915/i915_gem_debug.c
Loading
Please register or sign in to comment