From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 May 2022 17:00:37 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2022-05-13' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v6.1-rc5~1419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10b4b67ab58248636723af181734b9574be05ade;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'drm-fixes-2022-05-13' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Pretty quiet week on the fixes front, 4 amdgpu and one i915 fix.

  I think there might be a few misc fbdev ones outstanding, but I'll see
  if they are necessary and pass them on if so.

  amdgpu:

   - Disable ASPM for VI boards on ADL platforms

   - S0ix DCN3.1 display fix

   - Resume regression fix

   - Stable pstate fix

  i915:

   - fix for kernel memory corruption when running a lot of OpenCL tests
     in parallel"

* tag 'drm-fixes-2022-05-13' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu/ctx: only reset stable pstate if the user changed it (v2)
  Revert "drm/amd/pm: keep the BACO feature enabled for suspend"
  drm/i915: Fix race in __i915_vma_remove_closed
  drm/amd/display: undo clearing of z10 related function pointers
  drm/amdgpu: vi: disable ASPM on Intel Alder Lake based systems
---

10b4b67ab58248636723af181734b9574be05ade