From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Apr 2021 17:23:57 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2021-04-23' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: microblaze-v5.14~219
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=5bfc75d92efd494db37f5c4c173d3639d4772966;p=linux-2.6-microblaze.git

Merge tag 'drm-fixes-2021-04-23' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Just some small i915 and amdgpu fixes this week, should be all until
  you open the merge window.

  amdgpu:
   - Fix gpuvm page table update issue
   - Modifier fixes
   - Register fix for dimgrey cavefish

  i915:
   - GVT's BDW regression fix for cmd parser
   - Fix modesetting in case of unexpected AUX timeouts"

* tag 'drm-fixes-2021-04-23' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu: fix GCR_GENERAL_CNTL offset for dimgrey_cavefish
  amd/display: allow non-linear multi-planar formats
  drm/amd/display: Update modifier list for gfx10_3
  drm/amdgpu: reserve fence slot to update page table
  drm/i915: Fix modesetting in case of unexpected AUX timeouts
  drm/i915/gvt: Fix BDW command parser regression
---

5bfc75d92efd494db37f5c4c173d3639d4772966