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

Browse source

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: Add missing mutex_lock(&dev->struct_mutex)
  drm/i915: fix WC mapping in non-GEM i915 code.
  drm/i915: Fix regression in 95ca9d
  drm/i915: Retire requests from i915_gem_busy_ioctl.
  drm/i915: suspend/resume GEM when KMS is active
  drm/i915: Don't let a device flush to prepare buffers clear new write_domains.
  drm/i915: Cut two args to set_to_gpu_domain that confused this tricky path.

...

This commit is contained in:

Linus Torvalds 2009-02-22 16:26:09 -08:00

parent 09c50b4a52 5004417d84

commit 8310509252

5 changed files with 67 additions and 27 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

23

drivers/gpu/drm/i915/i915_drv.c

View file

1

drivers/gpu/drm/i915/i915_drv.h

View file

67

drivers/gpu/drm/i915/i915_gem.c

View file

1

drivers/gpu/drm/i915/intel_display.c

View file