[git pull] drm fixes for 5.9-rc5 (special edition)

* [git pull] drm fixes for 5.9-rc5 (special edition)
@ 2020-09-08  6:22 ` Dave Airlie
  0 siblings, 0 replies; 4+ messages in thread
From: Dave Airlie @ 2020-09-08  6:22 UTC (permalink / raw)
  To: Linus Torvalds, Daniel Vetter
  Cc: dri-devel, LKML, Joonas Lahtinen, Stephen Rothwell

Hi Linus,

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.

Dave.

drm-fixes-2020-09-08:
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue
The following changes since commit f4d51dffc6c01a9e94650d95ce0104964f8ae822:

  Linux 5.9-rc4 (2020-09-06 17:11:40 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-09-08

for you to fetch changes up to 20561da3a2e1e0e827ef5510cb0f74bcfd377e41:

  Revert "drm/i915/gem: Delete unused code" (2020-09-08 15:45:27 +1000)

----------------------------------------------------------------
drm fixes for 5.9-rc5 (special edition)

i915:
- revert gpu relocation changes due to regression

msm:
- fixes for RPTR corruption issue

----------------------------------------------------------------
Dave Airlie (4):
      Merge tag 'drm-msm-fixes-2020-09-04' of
https://gitlab.freedesktop.org/drm/msm into drm-fixes
      Revert "drm/i915: Remove i915_gem_object_get_dirty_page()"
      Revert "drm/i915/gem: Async GPU relocations only"
      Revert "drm/i915/gem: Delete unused code"

Jordan Crouse (4):
      drm/msm: Split the a5xx preemption record
      drm/msm: Enable expanded apriv support for a650
      drm/msm: Disable preemption on all 5xx targets
      drm/msm: Disable the RPTR shadow

 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     | 314 +++++++++++++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_object.h         |   4 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c          |  14 +
 .../drm/i915/gem/selftests/i915_gem_execbuffer.c   |  21 +-
 drivers/gpu/drm/msm/adreno/a2xx_gpu.c              |   5 +
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a4xx_gpu.c              |  10 +
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |  14 +-
 drivers/gpu/drm/msm/adreno/a5xx_gpu.h              |   1 +
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c          |  25 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |  13 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  27 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |   2 +-
 drivers/gpu/drm/msm/msm_gpu.h                      |  11 +
 drivers/gpu/drm/msm/msm_ringbuffer.c               |   4 +-
 15 files changed, 411 insertions(+), 64 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread