| commit | 3d7f0f9dcca6b40dd347bbf3508c642002e0a561 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Dec 18 16:23:37 2013 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Dec 18 16:23:37 2013 +0100 |
| tree | 928513cb455ce852c52e1d33688901f87f3267af | |
| parent | 4fe9adbc36097317864bfec3c32047da7c45a2fa [diff] | |
| parent | 6c719faca2aceca72f1bf5b1645c1734ed3e9447 [diff] |
Merge commit drm-intel-fixes into topic/ppgtt I need the tricky do_switch fix before I can merge the final piece of the ppgtt enabling puzzle. Otherwise the conflict will be a real pain to resolve since the do_switch hunk from -fixes must be placed at the exact right place within a hunk in the next patch. Conflicts: drivers/gpu/drm/i915/i915_gem_context.c drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_display.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>