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: Fix unintended recursion in ironlake_disable_rc6
  drm/i915: fix corruptions on i8xx due to relaxed fencing
  drm/i915: skip FDI & PCH enabling for DP_A
  agp/intel: Experiment with a 855GM GWB bit
  drm/i915: don't enable FDI & transcoder interrupts after all
  drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch

...

This commit is contained in:

Linus Torvalds 2011-02-24 17:08:48 -08:00

parent 86e2fe9ff3 3c0556e967

commit 4662db4461

5 changed files with 127 additions and 47 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

1

drivers/char/agp/intel-agp.h

View file

56

drivers/char/agp/intel-gtt.c

View file

16

drivers/gpu/drm/i915/i915_gem_tiling.c

View file

6

drivers/gpu/drm/i915/i915_irq.c

View file

95

drivers/gpu/drm/i915/intel_display.c

View file