Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie: "The i915 reverts are going to be a bit of a conflict mess for next, so I decided to dequeue them now, along with some msm fixes for a ring corruption issue, that Rob sent over the weekend. Summary: i915: - revert gpu relocation changes due to regression msm: - fixes for RPTR corruption issue" * tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm: Revert "drm/i915/gem: Delete unused code" Revert "drm/i915/gem: Async GPU relocations only" Revert "drm/i915: Remove i915_gem_object_get_dirty_page()" drm/msm: Disable the RPTR shadow drm/msm: Disable preemption on all 5xx targets drm/msm: Enable expanded apriv support for a650 drm/msm: Split the a5xx preemption record
Showing
- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c 293 additions, 21 deletionsdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
- drivers/gpu/drm/i915/gem/i915_gem_object.h 4 additions, 0 deletionsdrivers/gpu/drm/i915/gem/i915_gem_object.h
- drivers/gpu/drm/i915/gem/i915_gem_pages.c 14 additions, 0 deletionsdrivers/gpu/drm/i915/gem/i915_gem_pages.c
- drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c 15 additions, 6 deletionsdrivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c
- drivers/gpu/drm/msm/adreno/a2xx_gpu.c 5 additions, 0 deletionsdrivers/gpu/drm/msm/adreno/a2xx_gpu.c
- drivers/gpu/drm/msm/adreno/a3xx_gpu.c 10 additions, 0 deletionsdrivers/gpu/drm/msm/adreno/a3xx_gpu.c
- drivers/gpu/drm/msm/adreno/a4xx_gpu.c 10 additions, 0 deletionsdrivers/gpu/drm/msm/adreno/a4xx_gpu.c
- drivers/gpu/drm/msm/adreno/a5xx_gpu.c 11 additions, 3 deletionsdrivers/gpu/drm/msm/adreno/a5xx_gpu.c
- drivers/gpu/drm/msm/adreno/a5xx_gpu.h 1 addition, 0 deletionsdrivers/gpu/drm/msm/adreno/a5xx_gpu.h
- drivers/gpu/drm/msm/adreno/a5xx_preempt.c 20 additions, 5 deletionsdrivers/gpu/drm/msm/adreno/a5xx_preempt.c
- drivers/gpu/drm/msm/adreno/a6xx_gpu.c 12 additions, 1 deletiondrivers/gpu/drm/msm/adreno/a6xx_gpu.c
- drivers/gpu/drm/msm/adreno/adreno_gpu.c 2 additions, 25 deletionsdrivers/gpu/drm/msm/adreno/adreno_gpu.c
- drivers/gpu/drm/msm/msm_gpu.c 1 addition, 1 deletiondrivers/gpu/drm/msm/msm_gpu.c
- drivers/gpu/drm/msm/msm_gpu.h 11 additions, 0 deletionsdrivers/gpu/drm/msm/msm_gpu.h
- drivers/gpu/drm/msm/msm_ringbuffer.c 2 additions, 2 deletionsdrivers/gpu/drm/msm/msm_ringbuffer.c
Please register or sign in to comment