• Linus Torvalds's avatar
    Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 70740d6c
    Linus Torvalds authored
    * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
      drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
      drm/i915: use pipes, not planes to label vblank data
      drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
      i915: Fix format string warnings on x86-64.
      i915: Don't dereference HWS in /proc debug files when it isn't initialized.
      i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
      drm: Remove two leaks of vblank reference count in error paths.
      drm: fix leak of cliprects in drm_rmdraw()
      i915: Disable MSI on GM965 (errata says it doesn't work)
      drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
      i915: Protect vblank IRQ reg access with spinlock
    70740d6c
i915_gem.c 66.2 KB