Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next

Browse source

* 'keithp/drm-intel-next' of ../drm-next:
  drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge
  drm/i915/sdvo: Reorder i2c initialisation before ddc proxy
  drm/i915: FDI link training broken on Ironlake by Ivybridge integration
  drm/i915: enable rc6 by default
  drm/i915: add fbc enable flag, but disable by default
  drm/i915: clean up unused ring_get_irq/ring_put_irq functions
  drm/i915: fix user irq miss in BSD ring on g4x

...

This commit is contained in:

Dave Airlie 2011-05-20 11:30:02 +10:00

parent fb0b760605 9e3c256d7d

commit 351fc4d660

7 changed files with 48 additions and 40 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_debugfs.c

View file

7

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/i915_drv.h

View file

3

drivers/gpu/drm/i915/i915_irq.c

View file

13

drivers/gpu/drm/i915/intel_display.c

View file

58

drivers/gpu/drm/i915/intel_ringbuffer.c

View file

10

drivers/gpu/drm/i915/intel_sdvo.c

View file