Merge commit '75d04a3773' into drm-intel-next-queued

Browse source

Pull in patches Jani applied while I was on vacation.

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

...

This commit is contained in:

Daniel Vetter 2015-05-04 09:25:12 +02:00

parent de4de566f8 75d04a3773

commit 93a96c6f04

6 changed files with 67 additions and 50 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

5

drivers/gpu/drm/i915/i915_drv.h

View file

6

drivers/gpu/drm/i915/i915_gem_execbuffer.c

View file

39

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

56

drivers/gpu/drm/i915/intel_ddi.c

View file

2

drivers/gpu/drm/i915/intel_dvo.c

View file

9

drivers/gpu/drm/i915/intel_hdmi.c

View file