From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Sep 2020 18:16:11 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v5.10.7~1688
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f6a73c8b715d595977774d48450a734297ab21f;p=platform%2Fkernel%2Flinux-rpi.git

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
---

6f6a73c8b715d595977774d48450a734297ab21f