Merge branch 'topic/atomic-conversion' into drm-intel-next-queued

Browse source

The i915 atomic conversion is a real beast and it's not getting easier
wrangling in a separate branch. I'm might be regretting this, but
right after vacation nothing can burst my little bubble here!

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

...

This commit is contained in:

Daniel Vetter 2015-06-15 17:43:48 +02:00

parent 49e4d842f0 c0165304e1

commit a80c69fc08

7 changed files with 513 additions and 583 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

50

drivers/gpu/drm/i915/i915_debugfs.c

View file

4

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/i915_drv.h

View file

13

drivers/gpu/drm/i915/i915_irq.c

View file

96

drivers/gpu/drm/i915/intel_atomic.c

View file

918

drivers/gpu/drm/i915/intel_display.c

View file

21

drivers/gpu/drm/i915/intel_drv.h

View file