[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Provided upstream commit SHA1 does not match found commit
The claimed upstream commit SHA1 (76120b3a304aec28fef4910204b81a12db8974da) was not found.
However, I found a matching commit: 879f70382ff3e92fc854589ada3453e3f5f5b601
Note: The patch differs from the upstream commit:
---
1: 879f70382ff3e ! 1: b3874f246c67b drm/i915/dsi: Use TRANS_DDI_FUNC_CTL's own port width macro
@@ Metadata
## Commit message ##
drm/i915/dsi: Use TRANS_DDI_FUNC_CTL's own port width macro
+ commit 76120b3a304aec28fef4910204b81a12db8974da upstream.
+
The format of the port width field in the DDI_BUF_CTL and the
TRANS_DDI_FUNC_CTL registers are different starting with MTL, where the
x3 lane mode for HDMI FRL has a different encoding in the two registers.
@@ Commit message
Link: https://patchwork.freedesktop.org/patch/msgid/20250214142001.552916-2-imre.deak@xxxxxxxxx
(cherry picked from commit 76120b3a304aec28fef4910204b81a12db8974da)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
+ (cherry picked from commit 879f70382ff3e92fc854589ada3453e3f5f5b601)
+ [Imre: Rebased on v6.6.y, due to upstream API changes for intel_de_read(),
+ TRANS_DDI_FUNC_CTL()]
+ Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
## drivers/gpu/drm/i915/display/icl_dsi.c ##
@@ drivers/gpu/drm/i915/display/icl_dsi.c: gen11_dsi_configure_transcoder(struct intel_encoder *encoder,
+
/* select data lane width */
- tmp = intel_de_read(display,
- TRANS_DDI_FUNC_CTL(display, dsi_trans));
+ tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(dsi_trans));
- tmp &= ~DDI_PORT_WIDTH_MASK;
- tmp |= DDI_PORT_WIDTH(intel_dsi->lane_count);
+ tmp &= ~TRANS_DDI_PORT_WIDTH_MASK;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
