diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:44:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:44:40 -0800 |
| commit | 6df944c5f8194a1010f7166bcdd48667637f1af8 (patch) | |
| tree | 033c8c9bf599d0759c5fb1b25e9edd4dfa3728ce /include/linux/pci.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc (diff) | |
| parent | drm/i915: Return error in i915_gem_set_to_gtt_domain if we're not in the GTT. (diff) | |
| download | linux-dev-6df944c5f8194a1010f7166bcdd48667637f1af8.tar.xz linux-dev-6df944c5f8194a1010f7166bcdd48667637f1af8.zip | |
Merge branch 'drm-gem-update' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'include/linux/pci.h')
0 files changed, 0 insertions, 0 deletions