Merge branch 'drm-gem-update' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Browse source

* '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.

...

This commit is contained in:

Linus Torvalds 2008-12-04 21:44:40 -08:00

parent 341e55805d 0235439232

commit 6df944c5f8

5 changed files with 420 additions and 245 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

drivers/gpu/drm/i915/i915_drv.h

View file

641

drivers/gpu/drm/i915/i915_gem.c

View file

5

drivers/gpu/drm/i915/i915_gem_proc.c

View file

7

drivers/gpu/drm/i915/i915_gem_tiling.c

View file

1

drivers/gpu/drm/i915/i915_reg.h

View file