Merge branch 'drm-gem-update' of git://git.kernel.org/pub/scm/linux/kernel/git/airlie...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:44:40 +0000 (21:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:44:40 +0000 (21:44 -0800)
commit6df944c5f8194a1010f7166bcdd48667637f1af8
tree033c8c9bf599d0759c5fb1b25e9edd4dfa3728ce
parent341e55805d671948c2a93d3d6c7e9babb47de5d8
parent0235439232cb6f8a54f8976aa8330c1c98ebad0b
Merge branch 'drm-gem-update' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-gem-update' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: Return error in i915_gem_set_to_gtt_domain if we're not in the GTT.
  drm/i915: Retry execbuffer pinning after clearing the GTT
  drm/i915: Move the execbuffer domain computations together
  drm/i915: Rename object_set_domain to object_set_to_gpu_domain
  drm/i915: Make a single set-to-cpu-domain path and use it wherever needed.
  drm/i915: Make a single set-to-gtt-domain path.
  drm/i915: If interrupted while setting object domains, still emit the flush.
  drm/i915: Move flushing list cleanup from flush request retire to request emit.
  drm/i915: Respect GM965/GM45 bit-17-instead-of-bit-11 option for swizzling.