[Intel-gfx] [PATCH v2 09/20] drm/i915: Introduce GEN8_DE_PORT_HOTPLUG()
Lucas De Marchi
lucas.demarchi at intel.com
Wed Oct 7 23:17:24 UTC 2020
On Tue, Oct 06, 2020 at 07:25:43PM +0300, Ville Syrjälä wrote:
>From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
>Unify the BDW/BXT hotplug bits. BDW only has port A, but that
>matches BXT port A so we can shar the same macro for both.
>
>v2: Remember the gvt
>
>Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>
Lucas De Marchi
>---
> drivers/gpu/drm/i915/gvt/display.c | 14 +++++++-------
> drivers/gpu/drm/i915/i915_irq.c | 18 +++++++++---------
> drivers/gpu/drm/i915/i915_reg.h | 10 +++++-----
> 3 files changed, 21 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
>index c124734e114c..5b5c71a0b4af 100644
>--- a/drivers/gpu/drm/i915/gvt/display.c
>+++ b/drivers/gpu/drm/i915/gvt/display.c
>@@ -174,23 +174,23 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
>
> if (IS_BROXTON(dev_priv)) {
> vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) &=
>- ~(BXT_DE_PORT_HP_DDI(HPD_PORT_A) |
>- BXT_DE_PORT_HP_DDI(HPD_PORT_B) |
>- BXT_DE_PORT_HP_DDI(HPD_PORT_C));
>+ ~(GEN8_DE_PORT_HOTPLUG(HPD_PORT_A) |
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_B) |
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_C));
>
> if (intel_vgpu_has_monitor_on_port(vgpu, PORT_A)) {
> vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |=
>- BXT_DE_PORT_HP_DDI(HPD_PORT_A);
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_A);
> }
>
> if (intel_vgpu_has_monitor_on_port(vgpu, PORT_B)) {
> vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |=
>- BXT_DE_PORT_HP_DDI(HPD_PORT_B);
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_B);
> }
>
> if (intel_vgpu_has_monitor_on_port(vgpu, PORT_C)) {
> vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |=
>- BXT_DE_PORT_HP_DDI(HPD_PORT_C);
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_C);
> }
>
> return;
>@@ -328,7 +328,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
> if (intel_vgpu_has_monitor_on_port(vgpu, PORT_A)) {
> if (IS_BROADWELL(dev_priv))
> vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |=
>- GEN8_PORT_DP_A_HOTPLUG;
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_A);
> else
> vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTA_HOTPLUG_SPT;
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 9b92b95f7a6f..6b824db1424a 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -71,7 +71,7 @@ static const u32 hpd_ivb[HPD_NUM_PINS] = {
> };
>
> static const u32 hpd_bdw[HPD_NUM_PINS] = {
>- [HPD_PORT_A] = GEN8_PORT_DP_A_HOTPLUG,
>+ [HPD_PORT_A] = GEN8_DE_PORT_HOTPLUG(HPD_PORT_A),
> };
>
> static const u32 hpd_ibx[HPD_NUM_PINS] = {
>@@ -126,9 +126,9 @@ static const u32 hpd_status_i915[HPD_NUM_PINS] = {
> };
>
> static const u32 hpd_bxt[HPD_NUM_PINS] = {
>- [HPD_PORT_A] = BXT_DE_PORT_HP_DDI(HPD_PORT_A),
>- [HPD_PORT_B] = BXT_DE_PORT_HP_DDI(HPD_PORT_B),
>- [HPD_PORT_C] = BXT_DE_PORT_HP_DDI(HPD_PORT_C),
>+ [HPD_PORT_A] = GEN8_DE_PORT_HOTPLUG(HPD_PORT_A),
>+ [HPD_PORT_B] = GEN8_DE_PORT_HOTPLUG(HPD_PORT_B),
>+ [HPD_PORT_C] = GEN8_DE_PORT_HOTPLUG(HPD_PORT_C),
> };
>
> static const u32 hpd_gen11[HPD_NUM_PINS] = {
>@@ -2367,7 +2367,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> found = true;
> }
> } else if (IS_BROADWELL(dev_priv)) {
>- tmp_mask = iir & GEN8_PORT_DP_A_HOTPLUG;
>+ tmp_mask = iir & BDW_DE_PORT_HOTPLUG_MASK;
> if (tmp_mask) {
> ilk_hpd_irq_handler(dev_priv, tmp_mask);
> found = true;
>@@ -3391,13 +3391,13 @@ static void __bxt_hpd_detection_setup(struct drm_i915_private *dev_priv,
> * For BXT invert bit has to be set based on AOB design
> * for HPD detection logic, update it based on VBT fields.
> */
>- if ((enabled_irqs & BXT_DE_PORT_HP_DDI(HPD_PORT_A)) &&
>+ if ((enabled_irqs & GEN8_DE_PORT_HOTPLUG(HPD_PORT_A)) &&
> intel_bios_is_port_hpd_inverted(dev_priv, PORT_A))
> hotplug |= BXT_DDIA_HPD_INVERT;
>- if ((enabled_irqs & BXT_DE_PORT_HP_DDI(HPD_PORT_B)) &&
>+ if ((enabled_irqs & GEN8_DE_PORT_HOTPLUG(HPD_PORT_B)) &&
> intel_bios_is_port_hpd_inverted(dev_priv, PORT_B))
> hotplug |= BXT_DDIB_HPD_INVERT;
>- if ((enabled_irqs & BXT_DE_PORT_HP_DDI(HPD_PORT_C)) &&
>+ if ((enabled_irqs & GEN8_DE_PORT_HOTPLUG(HPD_PORT_C)) &&
> intel_bios_is_port_hpd_inverted(dev_priv, PORT_C))
> hotplug |= BXT_DDIC_HPD_INVERT;
>
>@@ -3574,7 +3574,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
> if (IS_GEN9_LP(dev_priv))
> de_port_enables |= BXT_DE_PORT_HOTPLUG_MASK;
> else if (IS_BROADWELL(dev_priv))
>- de_port_enables |= GEN8_PORT_DP_A_HOTPLUG;
>+ de_port_enables |= BDW_DE_PORT_HOTPLUG_MASK;
>
> if (INTEL_GEN(dev_priv) >= 12) {
> enum transcoder trans;
>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index 72f93ec38aea..969266e59f56 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -7801,11 +7801,11 @@ enum {
> #define GEN9_AUX_CHANNEL_B (1 << 25)
> #define DSI1_TE (1 << 24)
> #define DSI0_TE (1 << 23)
>-#define BXT_DE_PORT_HP_DDI(hpd_pin) REG_BIT(3 + _HPD_PIN_DDI(hpd_pin))
>-#define BXT_DE_PORT_HOTPLUG_MASK (BXT_DE_PORT_HP_DDI(HPD_PORT_A) | \
>- BXT_DE_PORT_HP_DDI(HPD_PORT_B) | \
>- BXT_DE_PORT_HP_DDI(HPD_PORT_C))
>-#define GEN8_PORT_DP_A_HOTPLUG (1 << 3)
>+#define GEN8_DE_PORT_HOTPLUG(hpd_pin) REG_BIT(3 + _HPD_PIN_DDI(hpd_pin))
>+#define BXT_DE_PORT_HOTPLUG_MASK (GEN8_DE_PORT_HOTPLUG(HPD_PORT_A) | \
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_B) | \
>+ GEN8_DE_PORT_HOTPLUG(HPD_PORT_C))
>+#define BDW_DE_PORT_HOTPLUG_MASK GEN8_DE_PORT_HOTPLUG(HPD_PORT_A)
> #define BXT_DE_PORT_GMBUS (1 << 1)
> #define GEN8_AUX_CHANNEL_A (1 << 0)
> #define TGL_DE_PORT_AUX_USBC6 (1 << 13)
>--
>2.26.2
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
More information about the Intel-gfx
mailing list