From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Apr 2022 03:10:43 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v6.1-rc5~1526
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d569e86915b7f2f9795588591c8d5ea0b66481cb;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'drm-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Extra quiet after Easter, only have minor i915 and msm pulls. However
  I haven't seen a PR from our misc tree in a little while, I've cc'ed
  all the suspects. Once that unblocks I expect a bit larger bunch of
  patches to arrive.

  Otherwise as I said, one msm revert and two i915 fixes.

  msm:

   - revert iommu change that broke some platforms.

  i915:

   - Unset enable_psr2_sel_fetch if PSR2 detection fails

   - Fix to detect when VRR is turned off from panel settings"

* tag 'drm-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm:
  drm/i915/display/psr: Unset enable_psr2_sel_fetch if other checks in intel_psr2_config_valid() fails
  drm/msm: Revert "drm/msm: Stop using iommu_present()"
  drm/i915/display/vrr: Reset VRR capable property on a long hpd
---

d569e86915b7f2f9795588591c8d5ea0b66481cb