From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Nov 2024 23:08:52 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2024-11-04' of https://gitlab.freedesktop.org/drm/i915... 
X-Git-Tag: microblaze-v6.16~490^2~12
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=bf99ceb6e0fa67e7509f489c2b4ae1600d8bbf53;p=linux-2.6-microblaze.git

Merge tag 'drm-intel-next-2024-11-04' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next

drm/i915 feature pull #2 for v6.13:

Features and functionality:

- Pantherlake (PTL) Xe3 LPD display enabling for xe driver (Clint, Suraj,
  Dnyaneshwar, Matt, Gustavo, Radhakrishna, Chaitanya, Haridhar, Juha-Pekka, Ravi)
- Enable dbuf overlap detection on Lunarlake and later (Stanislav, Vinod)
- Allow fastset for HDR infoframe changes (Chaitanya)
- Write DP source OUI also for non-eDP sinks (Imre)

Refactoring and cleanups:
- Independent platform identification for display (Jani)
- Display tracepoint fixes and cleanups (Gustavo)
- Share PCI ID headers between i915 and xe drivers (Jani)
- Use x100 version for full version and release checks (Jani)
- Conversions to struct intel_display (Jani, Ville)
- Reuse DP DPCD and AUX macros in gvt instead of duplication (Jani)
- Use string choice helpers (R Sundar, Sai Teja)
- Remove unused underrun detection irq code (Sai Teja)
- Color management debug improvements and other cleanups (Ville)
- Refactor panel fitter code to a separate file (Ville)
- Use try_cmpxchg() instead of open-coding (Uros Bizjak)

Fixes:
- PSR and Panel Replay fixes and workarounds (Jouni)
- Fix panel power during connector detection (Imre)
- Fix connector detection and modeset races (Imre)
- Fix C20 PHY TX MISC configuration (Gustavo)
- Improve panel fitter validity checks (Ville)
- Fix eDP short HPD interrupt handling while runtime suspended (Imre)
- Propagate DP MST DSC BW overhead/slice calculation errors (Imre)
- Stop hotplug polling for eDP connectors (Imre)
- Workaround panels reporting bad link status after PSR enable (Jouni)
- Panel Replay VRR VSC SDP related workaround and refactor (Animesh, Mitul)
- Fix memory leak on eDP init error path (Shuicheng)
- Fix GVT KVMGT Kconfig dependencies (Arnd Bergmann)
- Fix irq function documentation build warning (Rodrigo)
- Add platform check to power management fuse bit read (Clint)
- Revert kstrdup_const() and kfree_const() usage for clarity (Christophe JAILLET)
- Workaround horizontal odd panning issues in display versions 20 and 30 (Nemesa)
- Fix xe drive HDCP GSC firmware check (Suraj)

Merges:
- Backmerge drm-next to get some KVM changes (Rodrigo)
- Fix a build failure originating from previous backmerge (Jani)

Signed-off-by: Dave Airlie <airlied@redhat.com>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_dp_mst.c
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87h68ni0wd.fsf@intel.com
---

bf99ceb6e0fa67e7509f489c2b4ae1600d8bbf53
diff --cc drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 6d34b55d72bb,219e0b0dd07e..7c02323e9531
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@@ -42,9 -42,8 +42,9 @@@ bool intel_hdcp_gsc_check_status(struc
  	struct xe_gt *gt = tile->media_gt;
  	struct xe_gsc *gsc = &gt->uc.gsc;
  	bool ret = true;
 +	unsigned int fw_ref;
  
- 	if (!gsc && !xe_uc_fw_is_enabled(&gsc->fw)) {
+ 	if (!gsc || !xe_uc_fw_is_enabled(&gsc->fw)) {
  		drm_dbg_kms(&xe->drm,
  			    "GSC Components not ready for HDCP2.x\n");
  		return false;