From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [CI 16/22] drm/i915/xe2lpd: Add support for HPD
Date: Tue, 19 Sep 2023 12:21:22 -0700 [thread overview]
Message-ID: <20230919192128.2045154-16-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20230919192128.2045154-1-lucas.demarchi@intel.com>
From: Gustavo Sousa <gustavo.sousa@intel.com>
Hotplug setup for Xe2_LPD differs from Xe_LPD+ by the fact that the
extra programming for hotplug inversion and DDI HPD filter duration is
not necessary anymore. As mtp_hpd_irq_setup() is reasonably small,
prefer to fork it into a new function for Xe2_LPD instead of adding a
platform check.
v2: Add extra bspec reference and fix missing else (Matt Roper)
BSpec: 68970, 69940
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
---
.../gpu/drm/i915/display/intel_hotplug_irq.c | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index 3398cc21bd26..f07047e9cb30 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -163,7 +163,9 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)
(!HAS_PCH_SPLIT(dev_priv) || HAS_PCH_NOP(dev_priv)))
return;
- if (INTEL_PCH_TYPE(dev_priv) >= PCH_DG1)
+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_LNL)
+ hpd->pch_hpd = hpd_mtp;
+ else if (INTEL_PCH_TYPE(dev_priv) >= PCH_DG1)
hpd->pch_hpd = hpd_sde_dg1;
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_MTP)
hpd->pch_hpd = hpd_mtp;
@@ -1063,6 +1065,19 @@ static void mtp_hpd_irq_setup(struct drm_i915_private *i915)
mtp_tc_hpd_detection_setup(i915);
}
+static void xe2lpd_sde_hpd_irq_setup(struct drm_i915_private *i915)
+{
+ u32 hotplug_irqs, enabled_irqs;
+
+ enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915->display.hotplug.pch_hpd);
+
+ ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
+
+ mtp_ddi_hpd_detection_setup(i915);
+ mtp_tc_hpd_detection_setup(i915);
+}
+
static bool is_xelpdp_pica_hpd_pin(enum hpd_pin hpd_pin)
{
return hpd_pin >= HPD_PORT_TC1 && hpd_pin <= HPD_PORT_TC4;
@@ -1122,7 +1137,9 @@ static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915)
xelpdp_pica_hpd_detection_setup(i915);
- if (INTEL_PCH_TYPE(i915) >= PCH_MTP)
+ if (INTEL_PCH_TYPE(i915) >= PCH_LNL)
+ xe2lpd_sde_hpd_irq_setup(i915);
+ else if (INTEL_PCH_TYPE(i915) >= PCH_MTP)
mtp_hpd_irq_setup(i915);
}
--
2.40.1
next prev parent reply other threads:[~2023-09-19 19:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 19:21 [Intel-gfx] [CI 01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 02/22] drm/i915/lnl: Add display definitions Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 03/22] drm/i915/xe2lpd: FBC is now supported on all pipes Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 04/22] drm/i915/display: Remove FBC capability from fused off pipes Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 05/22] drm/i915: Re-order if/else ladder in intel_detect_pch() Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 06/22] drm/i915/xe2lpd: Add fake PCH Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 07/22] drm/i915/xe2lpd: Treat cursor plane as regular plane for DDB allocation Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 08/22] drm/i915/xe2lpd: Don't try to program PLANE_AUX_DIST Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 09/22] drm/i915/xe2lpd: Register DE_RRMR has been removed Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 10/22] drm/i915/display: Fix style and conventions for DP AUX regs Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 11/22] drm/i915/display: Use _PICK_EVEN_2RANGES() in " Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 12/22] drm/i915/xe2lpd: Re-order " Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 13/22] drm/i915/xe2lpd: Handle port AUX interrupts Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 14/22] drm/i915/xe2lpd: Read pin assignment from IOM Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 15/22] drm/i915/xe2lpd: Enable odd size and panning for planar yuv Lucas De Marchi
2023-09-19 19:21 ` Lucas De Marchi [this message]
2023-09-19 19:21 ` [Intel-gfx] [CI 17/22] drm/i915/xe2lpd: Extend Wa_15010685871 Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 18/22] drm/i915/lnl: Add gmbus/ddc support Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 19/22] drm/i915/lnl: Add CDCLK table Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 20/22] drm/i915/xe2lpd: Add display power well Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 21/22] drm/i915/xe2lpd: Add DC state support Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 22/22] drm/i915/lnl: Start using CDCLK through PLL Lucas De Marchi
2023-09-19 22:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES Patchwork
2023-09-19 22:37 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-09-19 22:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-09-20 10:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2023-09-21 15:24 ` Lucas De Marchi
2023-09-20 16:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES (rev2) Patchwork
2023-09-20 16:03 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-09-20 16:19 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230919192128.2045154-16-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).