Merge branch 'drm-intel-fixes' into drm-intel-next
Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c
No related branches found
No related tags found
Showing
- drivers/gpu/drm/i915/i915_debugfs.c 2 additions, 2 deletionsdrivers/gpu/drm/i915/i915_debugfs.c
- drivers/gpu/drm/i915/i915_drv.c 15 additions, 2 deletionsdrivers/gpu/drm/i915/i915_drv.c
- drivers/gpu/drm/i915/i915_drv.h 18 additions, 5 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 1 addition, 1 deletiondrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_execbuffer.c 2 additions, 1 deletiondrivers/gpu/drm/i915/i915_gem_execbuffer.c
- drivers/gpu/drm/i915/i915_gem_tiling.c 19 additions, 19 deletionsdrivers/gpu/drm/i915/i915_gem_tiling.c
- drivers/gpu/drm/i915/i915_reg.h 2 additions, 0 deletionsdrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/intel_display.c 4 additions, 4 deletionsdrivers/gpu/drm/i915/intel_display.c
- drivers/gpu/drm/i915/intel_ringbuffer.h 7 additions, 6 deletionsdrivers/gpu/drm/i915/intel_ringbuffer.h
Loading
Please register or sign in to comment