From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jan 2022 17:17:53 +0000 (-0800)
Subject: Merge tag 'drm-fixes-2022-01-07' of git://anongit.freedesktop.org/drm/drm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7a6043cc2e863ab45016622c30879e555523ee13;p=linux.git

Merge tag 'drm-fixes-2022-01-07' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "There is only the amdgpu runtime pm regression fix in here:

  amdgpu:

   - suspend/resume fix

   - fix runtime PM regression"

* tag 'drm-fixes-2022-01-07' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu: disable runpm if we are the primary adapter
  fbdev: fbmem: add a helper to determine if an aperture is used by a fw fb
  drm/amd/pm: keep the BACO feature enabled for suspend
---

7a6043cc2e863ab45016622c30879e555523ee13