Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: fix 945 fence register writes for fence 8 and above.
  drm/i915: Protect active fences on i915
  drm/i915: Check to see if we've pinned all available fences
  drm/i915: Check fence status on every pin.
  drm/i915: First recheck for an empty fence register.
  drm/i915: Fix bad \n in MTRR failure notice.
  drm/i915: Don't restore palettes through VGA registers.
  i915: add newline to i915_gem_object_pin failure msg
  drm: Return EINVAL on duplicate objects in execbuffer object list

...

This commit is contained in:

Linus Torvalds 2009-03-11 12:09:45 -07:00

parent f809e5a21f dc529a4fe1

commit 932088b136

5 changed files with 99 additions and 37 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

2

drivers/gpu/drm/i915/i915_dma.c

View file

7

drivers/gpu/drm/i915/i915_drv.h

View file

115

drivers/gpu/drm/i915/i915_gem.c

View file

1

drivers/gpu/drm/i915/i915_reg.h

View file

11

drivers/gpu/drm/i915/i915_suspend.c

View file