Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (21 commits) Fix http://bugzilla.kernel.org/show_bug.cgi?id=7606 drm: add flag for mapping PCI DMA buffers read-only. drm: fix up irqflags in drm_lock.c drm: i915 updates drm: i915: fix up irqflags arg drm: i915: Only return EBUSY after we've established we need to schedule a new swap. drm: i915: Fix 'sequence has passed' condition in i915_vblank_swap(). drm: i915: Add SAREA fileds for determining which pipe to sync window buffer swaps to. drm: Make handling of dev_priv->vblank_pipe more robust. drm: DRM_I915_VBLANK_SWAP ioctl: Take drm_vblank_seq_type_t instead drm: i915: Add ioctl for scheduling buffer swaps at vertical blanks. drm: Core vsync: Don't clobber target sequence number when scheduling signal. drm: Core vsync: Add flag DRM_VBLANK_NEXTONMISS. drm: Make locked tasklet handling more robust. drm: drm_rmdraw: Declare id and idx as signed so testing for < 0 works as intended. drm: Change first valid DRM drawable ID to be 1 instead of 0. drm: drawable locking + memory management fixes + copyright drm: Add support for interrupt triggered driver callback with lock held to DRM core. drm: Add support for tracking drawable information to core drm: add support for secondary vertical blank interrupt to i915 ...
Showing
- drivers/char/drm/drm.h 31 additions, 2 deletionsdrivers/char/drm/drm.h
- drivers/char/drm/drmP.h 22 additions, 1 deletiondrivers/char/drm/drmP.h
- drivers/char/drm/drm_bufs.c 7 additions, 3 deletionsdrivers/char/drm/drm_bufs.c
- drivers/char/drm/drm_core.h 4 additions, 4 deletionsdrivers/char/drm/drm_core.h
- drivers/char/drm/drm_drawable.c 284 additions, 10 deletionsdrivers/char/drm/drm_drawable.c
- drivers/char/drm/drm_drv.c 14 additions, 0 deletionsdrivers/char/drm/drm_drv.c
- drivers/char/drm/drm_irq.c 131 additions, 24 deletionsdrivers/char/drm/drm_irq.c
- drivers/char/drm/drm_lock.c 11 additions, 0 deletionsdrivers/char/drm/drm_lock.c
- drivers/char/drm/drm_stub.c 2 additions, 0 deletionsdrivers/char/drm/drm_stub.c
- drivers/char/drm/drm_vm.c 16 additions, 0 deletionsdrivers/char/drm/drm_vm.c
- drivers/char/drm/i915_dma.c 2 additions, 0 deletionsdrivers/char/drm/i915_dma.c
- drivers/char/drm/i915_drm.h 19 additions, 0 deletionsdrivers/char/drm/i915_drm.h
- drivers/char/drm/i915_drv.c 3 additions, 1 deletiondrivers/char/drm/i915_drv.c
- drivers/char/drm/i915_drv.h 21 additions, 1 deletiondrivers/char/drm/i915_drv.h
- drivers/char/drm/i915_irq.c 254 additions, 11 deletionsdrivers/char/drm/i915_irq.c
Loading
Please register or sign in to comment