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

Browse source

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Use chipset-specific irq installers
  drm/i915: forcewake fix after reset
  drm/i915: add Ivy Bridge page flip support
  drm/i915: split page flip queueing into per-chipset functions

...

This commit is contained in:

Linus Torvalds 2011-06-28 11:15:57 -07:00

parent c89b857ce6 f01c22fd59

commit 0d72c6fcb5

4 changed files with 230 additions and 85 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

3

drivers/gpu/drm/i915/i915_drv.c

View file

3

drivers/gpu/drm/i915/i915_drv.h

View file

4

drivers/gpu/drm/i915/i915_gem.c

View file

305

drivers/gpu/drm/i915/intel_display.c

View file