Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes

Browse source

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  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:

Dave Airlie 2011-02-24 12:19:43 +10:00

parent ef3242859f c2e0eb1670

commit fbf92bea68

5 changed files with 126 additions and 46 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

93

drivers/gpu/drm/i915/intel_display.c

View file