• Linus Torvalds's avatar
    Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 9b3a89f8
    Linus Torvalds authored
    * '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
      ...
    9b3a89f8
drm_vm.c 17.9 KB