Merge branch 'drm-intel-next-fixes' into drm-intel-next

Browse source

So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)

More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

v2: Of course I've forgotten the fixup script for the silent conflict.

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

...

This commit is contained in:

Daniel Vetter 2014-10-21 14:32:55 +02:00

parent b727735732 07c338ce98

commit a8cbd45977

9 changed files with 118 additions and 300 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

22

drivers/gpu/drm/i915/i915_drv.h

View file

31

drivers/gpu/drm/i915/i915_gem_userptr.c

View file

41

drivers/gpu/drm/i915/i915_irq.c

View file

7

drivers/gpu/drm/i915/i915_reg.h

View file

51

drivers/gpu/drm/i915/intel_display.c

View file

3

drivers/gpu/drm/i915/intel_drv.h

View file

5

drivers/gpu/drm/i915/intel_panel.c

View file

239

drivers/gpu/drm/i915/intel_pm.c

View file

15

drivers/gpu/drm/i915/intel_ringbuffer.c

View file