diff options
| author | Daniel Vetter | 2013-12-18 16:23:37 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-12-18 16:23:37 +0100 |
| commit | 3d7f0f9dcca6b40dd347bbf3508c642002e0a561 (patch) | |
| tree | 928513cb455ce852c52e1d33688901f87f3267af /drivers/gpu/drm/drm_context.c | |
| parent | drm/i915: Do not allow buffers at offset 0 (diff) | |
| parent | drm/i915: don't update the dri1 breadcrumb with modesetting (diff) | |
| download | kernel-qcow2-linux-3d7f0f9dcca6b40dd347bbf3508c642002e0a561.tar.gz kernel-qcow2-linux-3d7f0f9dcca6b40dd347bbf3508c642002e0a561.tar.xz kernel-qcow2-linux-3d7f0f9dcca6b40dd347bbf3508c642002e0a561.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/drm_context.c')
0 files changed, 0 insertions, 0 deletions