Merge patches merged by Jani while I was on vacation.

Browse source

Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2014-07-07 10:15:44 +02:00

parent 34882298b9 57127efaf1

commit cfb3c0ab09

7 changed files with 116 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

10

drivers/gpu/drm/i915/i915_debugfs.c

View file

2

drivers/gpu/drm/i915/i915_drv.c

View file

5

drivers/gpu/drm/i915/i915_drv.h

View file

83

drivers/gpu/drm/i915/i915_gem_stolen.c

View file

14

drivers/gpu/drm/i915/intel_display.c

View file

2

drivers/gpu/drm/i915/intel_fbdev.c

View file

46

drivers/gpu/drm/i915/intel_pm.c

View file