From: Dave Airlie <airlied@redhat.com>
Date: Wed, 11 May 2022 01:00:14 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2022-05-06' of git://anongit.freedesktop.org/drm/drm-intel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d53b8e19c24bab37f72a2fc4b61d6f4d77b84ab4;p=linux.git

Merge tag 'drm-intel-next-2022-05-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

drm/i915 feature pull #2 for v5.19:

Features and functionality:
- Add first set of DG2 PCI IDs for "motherboard down" designs (Matt Roper)
- Add initial RPL-P PCI IDs as ADL-P subplatform (Matt Atwood)

Refactoring and cleanups:
- Power well refactoring and cleanup (Imre)
- GVT-g refactor and mdev API cleanup (Christoph, Jason, Zhi)
- DPLL refactoring and cleanup (Ville)
- VBT panel specific data parsing cleanup (Ville)
- Use drm_mode_init() for on-stack modes (Ville)

Fixes:
- Fix PSR state pipe A/B confusion by clearing more state on disable (José)
- Fix FIFO underruns caused by not taking DRAM channel into account (Vinod)
- Fix FBC flicker on display 11+ by enabling a workaround (José)
- Fix VBT seamless DRRS min refresh rate check (Ville)
- Fix panel type assumption on bogus VBT data (Ville)
- Fix panel data parsing for VBT that misses panel data pointers block (Ville)
- Fix spurious AUX timeout/hotplug handling on LTTPR links (Imre)

Merges:
- Backmerge drm-next (Jani)
- GVT changes (Jani)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87bkwbkkdo.fsf@intel.com
---

d53b8e19c24bab37f72a2fc4b61d6f4d77b84ab4
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 987bdeb090a51,c88e454a74bba..acf688b698c39
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1057,10 -1054,8 +1057,9 @@@ static const struct intel_device_info x
  	.platform_engine_mask = \
  		BIT(RCS0) | BIT(BCS0) | \
  		BIT(VECS0) | BIT(VECS1) | \
 -		BIT(VCS0) | BIT(VCS2)
 +		BIT(VCS0) | BIT(VCS2) | \
 +		BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3)
  
- __maybe_unused
  static const struct intel_device_info dg2_info = {
  	DG2_FEATURES,
  	XE_LPD_FEATURES,