Remaining ICL display patches, v2
Subsystems (2)
cover Remaining ICL display patches, v2
Hi
This new version of the series excludes the controversial patch about the HPD connect flow. Let's reach an agreement on this part first, then we discuss what to do without having to rebase too many times the patches we already agree on. Only patches 1 and 2 need review.
Thanks,
Paulo
Animesh Manna (1):
drm/i915/icl: Update FIA supported lane count for hpd.
Paulo Zanoni (4):
drm/i915/icl: implement icl_digital_port_connected() drm/i915/icl: store the port type for TC ports drm/i915/icl: program MG_DP_MODE
drm/i915/icl: toggle PHY clock gating around link training
drivers/gpu/drm/i915/i915_reg.h | 46 +++++ drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_display.h | 7 + drivers/gpu/drm/i915/intel_dp.c | 256 ++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 4 + 5 files changed, 316 insertions(+), 2 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/icl: implement icl_digital_port_connected()
Do like the other functions and check for the status bits. The "Hot Plug Detection" page from our documentation says we can't just use the ISR bits on the CPU side, so use the correct registers.
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganize is_gen if ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.
--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)
My understanding is that there's agreement on this patch since it just mimicks what the other gens do. Let's have this one agreed on (merged) first before we continue the discussions, especially since this one significantly affects the CI system.
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLUG | \ GEN11_TC3_HOTPLUG | \ GEN11_TC2_HOTPLUG | \
@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTPLUG | \ GEN11_TBT3_HOTPLUG | \ GEN11_TBT2_HOTPLUG | \
@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \ SDE_DDIA_HOTPLUG_ICP)#define SDE_TC_MASK_ICP (SDE_TC4_HOTPLUG_ICP | \
@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_THRESH_1_UDW_PB, \ _ICL_DSC1_RC_BUF_THRESH_1_UDW_PC) +#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6)) +#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dp.c +54 -1
68 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/icl: implement icl_digital_port_connected()
Quoted 3 lines · Paulo Zanoni
Do like the other functions and check for the status bits. The "Hot Plug Detection" page from our documentation says we can't just use the ISR bits on the CPU side, so use the correct registers.
nit: here you are saying it's for all of them rather than just a subset. My suggestion is:
Do like the other functions and check for the status bits. For TypeC/TBT on North Display Engine the "Hot Plug Detection" page from our documentation says we can't just use the ISR bits to find the live state, so use the correct registers: DFLEXDPSP TC Live State field.
Quoted 80 lines
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganizeis_genif ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.Cc Animesh Manna <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)My understanding is that there's agreement on this patch since it just mimicks what the other gens do. Let's have this one agreed on (merged) first before we continue the discussions, especially since this one significantly affects the CI system.
drivers/gpu/drm/i915/i915_reg.h +8
-0@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLUG | \ GEN11_TC3_HOTPLUG | \ GEN11_TC2_HOTPLUG | \@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTPLUG | \ GEN11_TBT3_HOTPLUG | \ GEN11_TBT2_HOTPLUG | \@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \ SDE_DDIA_HOTPLUG_ICP)#define SDE_TC_MASK_ICP (SDE_TC4_HOTPLUG_ICP | \@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_THRESH_1_UDW_PB, \ _ICL_DSC1_RC_BUF_THRESH_1_UDW_PC) +#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6)) +#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +13
-0@@ -4586,6 +4586,57 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder)return I915_READ (GEN8_DE_PORT_ISR ) & bit; } +static bool icl_combo_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; + +return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); +} + +static bool icl_tc_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; +enum tc_port tc_port =intel_port_to_tc (dev_priv, port);
drivers/gpu/drm/i915/intel_dp.c static bool bxt_digital_port_connected(struct intel_encoder *encoder) · line 4611
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+bool is_legacy, is_typec, is_tbt; +u32 dpsp; + + is_legacy =I915_READ (SDEISR ) &SDE_TC_HOTPLUG_ICP (tc_port); + +/* +* The spec says we shouldn't be using the ISR bits for detecting +* between TC and TBT. We should use DFLEXDPSP. +*/ + dpsp =I915_READ (PORT_TX_DFLEXDPSP );
I only wonder if we should be reading the North DE even if is_legacy is true above rather than using an early return. Anyway:
Lucas De Marchi
Quoted 50 lines
drivers/gpu/drm/i915/intel_dp.c +31
-1+ is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); + is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); + +WARN_ON (is_legacy + is_typec + is_tbt >1 ); + +return is_legacy || is_typec || is_tbt; +} + +static bool icl_digital_port_connected (struct intel_encoder *encoder) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base); + +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : +return icl_combo_port_connected (dev_priv, dig_port); +case HPD_PORT_C : +case HPD_PORT_D : +case HPD_PORT_E : +case HPD_PORT_F : +return icl_tc_port_connected (dev_priv, dig_port); +default : +MISSING_CASE (encoder->hpd_pin); +return false; + } +} +/* * intel_digital_port_connected - is the specified port connected? * @encoder: intel_encoder @@ -4613,8 +4664,10 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)return bdw_digital_port_connected (encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder); - else + else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv)) return spt_digital_port_connected(encoder); + else + return icl_digital_port_connected(encoder); } static struct edid *Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/icl: implement icl_digital_port_connected()
Em Ter, 2018-07-24 às 18:19 -0700, Lucas De Marchi escreveu:
Quoted 8 lines · Paulo Zanoni
Quoted 4 lines
Do like the other functions and check for the status bits. The "Hot Plug Detection" page from our documentation says we can't just use the
ISR bits on the CPU side, so use the correct registers.nit: here you are saying it's for all of them rather than just a subset.
No, I'm saying it's for the CPU side, the CPU side is a subset which excludes the PCH. There are 3 types: the legacy ones (on the PCH, not CPU), the TC ones (on the CPU) and the TBT ones (on the CPU too). On our driver, "CPU" in these contexts has been used as a synonym for North Display since the PCH was introduced.
But I can be more explicit if you want, no problem.
Quoted 181 lines
My suggestion is:
Do like the other functions and check for the status bits. For TypeC/TBT
on North Display Engine the "Hot Plug Detection" page from our documentation says we can't just use the ISR bits to find the live state, so use the correct registers: DFLEXDPSP TC Live State field.Quoted 113 lines
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganizeis_genif ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.Cc Animesh Manna <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)My understanding is that there's agreement on this patch since it just
mimicks what the other gens do. Let's have this one agreed on (merged)
first before we continue the discussions, especially since this one significantly affects the CI system.drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLUG | \GEN11_TC3_HOTPLUG | \
GEN11_TC2_HOTPLUG
| \drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTP LUG | \
GEN11_TBT3_HOTPLU
G | \
GEN11_TBT2_HOTPLU
G | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \ SDE_DDIA_HOTPLUG_ICP)#define
SDE_TC_MASK_ICP(SDE_TC4_HOTPLUG_IC
P | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_T HRESH_1_UDW_PB, \ _ICL_DSC1_RC_BUF_T HRESH_1_UDW_PC) +#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 <<((
tc_port) * 8 + 6))
+#defineTC_LIVE_STATE_TC(tc_port)(1 <<
((tc_port) * 8 + 5))drivers/gpu/drm/i915/i915_reg.h +1
-0+#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +9
-0@@ -4586,6 +4586,57 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder) return I915_READ(GEN8_DE_PORT_ISR) & bit; } +static bool icl_combo_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; + +return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); +} + +static bool icl_tc_port_connected(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_dp.c +1
-0+struct intel_digital_port
*intel_dig_port)drivers/gpu/drm/i915/intel_dp.c +7
-0+{ +enum port port = intel_dig_port->base.port; +enum tc_port tc_port =intel_port_to_tc (dev_priv, port); +bool is_legacy, is_typec, is_tbt; +u32 dpsp; + + is_legacy = I915_READ(SDEISR) &
SDE_TC_HOTPLUG_ICP(tc_port);drivers/gpu/drm/i915/intel_dp.c +3
-0+ +/* +* The spec says we shouldn't be using the ISR bits for detecting
drivers/gpu/drm/i915/intel_dp.c static bool bxt_digital_port_connected(struct intel_encoder *encoder) · line 4611
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+* between TC and TBT. We should use DFLEXDPSP. +*/ + dpsp =I915_READ (PORT_TX_DFLEXDPSP );I only wonder if we should be reading the North DE even if
is_legacyis
true above rather than using an early return. Anyway:Reviewed-by Lucas De Marchi <[email protected]>Lucas De Marchi
Quoted 47 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+ is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); + is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); + +WARN_ON (is_legacy + is_typec + is_tbt >1 ); + +return is_legacy || is_typec || is_tbt; +} + +static bool icl_digital_port_connected(struct intel_encoder*encoder)
drivers/gpu/drm/i915/intel_dp.c +2
-0+{ + struct drm_i915_private *dev_priv = to_i915(encoder-Quoted 1 line
base.dev);
drivers/gpu/drm/i915/intel_dp.c +1
-0+ struct intel_digital_port *dig_port =
enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_dp.c +5
-0+ +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : + return icl_combo_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +14
-1+case HPD_PORT_C : +case HPD_PORT_D : +case HPD_PORT_E : +case HPD_PORT_F : +return icl_tc_port_connected (dev_priv, dig_port); +default : +MISSING_CASE (encoder->hpd_pin); +return false; + } +} +/* * intel_digital_port_connected - is the specified port connected? * @encoder: intel_encoder @@ -4613,8 +4664,10 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)return bdw_digital_port_connected (encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder); - else + else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv)) return spt_digital_port_connected(encoder); + else + return icl_digital_port_connected(encoder); }
Quoted 8 lines
Quoted 8 lines
static struct edid *
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/icl: implement icl_digital_port_connected()
In reply to Lucas De MarchiEm Ter, 2018-07-24 às 18:19 -0700, Lucas De Marchi escreveu:
Quoted 129 lines · Paulo Zanoni
Quoted 4 lines
Do like the other functions and check for the status bits. The "Hot Plug Detection" page from our documentation says we can't just use the
ISR bits on the CPU side, so use the correct registers.nit: here you are saying it's for all of them rather than just a subset.
My suggestion is:Do like the other functions and check for the status bits. For TypeC/TBT
on North Display Engine the "Hot Plug Detection" page from our documentation says we can't just use the ISR bits to find the live state, so use the correct registers: DFLEXDPSP TC Live State field.Quoted 112 lines
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganizeis_genif ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.Cc Animesh Manna <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)My understanding is that there's agreement on this patch since it just
mimicks what the other gens do. Let's have this one agreed on (merged)
first before we continue the discussions, especially since this one significantly affects the CI system.drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLUG | \GEN11_TC3_HOTPLUG | \
GEN11_TC2_HOTPLUG
| \drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTP LUG | \
GEN11_TBT3_HOTPLU
G | \
GEN11_TBT2_HOTPLU
G | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \ SDE_DDIA_HOTPLUG_ICP)#define
SDE_TC_MASK_ICP(SDE_TC4_HOTPLUG_IC
P | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_T HRESH_1_UDW_PB, \ _ICL_DSC1_RC_BUF_T HRESH_1_UDW_PC) +#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 <<((
tc_port) * 8 + 6))
+#defineTC_LIVE_STATE_TC(tc_port)(1 <<
((tc_port) * 8 + 5))drivers/gpu/drm/i915/i915_reg.h +1
-0+#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +9
-0@@ -4586,6 +4586,57 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder) return I915_READ(GEN8_DE_PORT_ISR) & bit; } +static bool icl_combo_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; + +return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); +} + +static bool icl_tc_port_connected(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_dp.c +1
-0+struct intel_digital_port
*intel_dig_port)drivers/gpu/drm/i915/intel_dp.c +7
-0+{ +enum port port = intel_dig_port->base.port; +enum tc_port tc_port =intel_port_to_tc (dev_priv, port); +bool is_legacy, is_typec, is_tbt; +u32 dpsp; + + is_legacy = I915_READ(SDEISR) &
SDE_TC_HOTPLUG_ICP(tc_port);drivers/gpu/drm/i915/intel_dp.c +3
-0+ +/* +* The spec says we shouldn't be using the ISR bits for
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c static bool bxt_digital_port_connected(struct intel_encoder *encoder) · line 4611
Quoted 4 lines
detecting
drivers/gpu/drm/i915/intel_dp.c +3
-0+* between TC and TBT. We should use DFLEXDPSP. +*/ + dpsp =I915_READ (PORT_TX_DFLEXDPSP );I only wonder if we should be reading the North DE even if
is_legacyis
true above rather than using an early return. Anyway:
(missed this part in the other email)
That makes sense in the current state of the code. It would remove our ability to hit the WARN_ON below, but that doesn't seem to be a major issue.
Now when we go back to discussing our implementation for the connect flows we may end up having to revert to the current form, but we can always do that if we need it.
Quoted 2 lines
Reviewed-by Lucas De Marchi <[email protected]>
Thanks! I'll submit v4.
Quoted 50 lines
Lucas De Marchi
Quoted 47 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+ is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); + is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); + +WARN_ON (is_legacy + is_typec + is_tbt >1 ); + +return is_legacy || is_typec || is_tbt; +} + +static bool icl_digital_port_connected(struct intel_encoder*encoder)
drivers/gpu/drm/i915/intel_dp.c +2
-0+{ + struct drm_i915_private *dev_priv = to_i915(encoder-Quoted 1 line
base.dev);
drivers/gpu/drm/i915/intel_dp.c +1
-0+ struct intel_digital_port *dig_port =
enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_dp.c +5
-0+ +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : + return icl_combo_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +14
-1+case HPD_PORT_C : +case HPD_PORT_D : +case HPD_PORT_E : +case HPD_PORT_F : +return icl_tc_port_connected (dev_priv, dig_port); +default : +MISSING_CASE (encoder->hpd_pin); +return false; + } +} +/* * intel_digital_port_connected - is the specified port connected? * @encoder: intel_encoder @@ -4613,8 +4664,10 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)return bdw_digital_port_connected (encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder); - else + else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv)) return spt_digital_port_connected(encoder); + else + return icl_digital_port_connected(encoder); }
Quoted 8 lines
Quoted 8 lines
static struct edid *
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/icl: implement icl_digital_port_connected()
Em Qua, 2018-07-25 às 10:27 -0700, Paulo Zanoni escreveu:
Quoted 158 lines
Em Ter, 2018-07-24 às 18:19 -0700, Lucas De Marchi escreveu:
Quoted 146 lines · Paulo Zanoni
Quoted 6 lines
Do like the other functions and check for the status bits. The "Hot
Plug Detection" page from our documentation says we can't just use
the
ISR bits on the CPU side, so use the correct registers.nit: here you are saying it's for all of them rather than just a subset.
My suggestion is:Do like the other functions and check for the status bits. For TypeC/TBT
on North Display Engine the "Hot Plug Detection" page from our documentation says we can't just use the ISR bits to find the live state, so use the correct registers: DFLEXDPSP TC Live State field.Quoted 127 lines
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganizeis_genif ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.Cc Animesh Manna <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)My understanding is that there's agreement on this patch since it just
mimicks what the other gens do. Let's have this one agreed on (merged)
first before we continue the discussions, especially since this one
significantly affects the CI system.drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLU
G | \
GEN11_TC3_HOTPL
UGQuoted 1 line
\
GEN11_TC2_HOTPL
UGQuoted 1 line
\
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTP
LUG | \
GEN11_TBT3_HOTP
LU
G | \
GEN11_TBT2_HOTP
LU
G | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \
SDE_DDIA_HOTPLUG_ICP)
#defineSDE_TC_MASK_ICP(SDE_TC4_HOTPLUG_
IC
P | \drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_T
HRESH_1_UDW_PB, \
_ICL_DSC1_RC_BUF
_THRESH_1_UDW_PC)drivers/gpu/drm/i915/i915_reg.h +2
-0+#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 <<((
tc_port) * 8 + 6))
+#defineTC_LIVE_STATE_TC(tc_port)(1 <<
((tc_port) * 8 + 5))drivers/gpu/drm/i915/i915_reg.h +1
-0+#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +9
-0@@ -4586,6 +4586,57 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder) return I915_READ(GEN8_DE_PORT_ISR) & bit; } +static bool icl_combo_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; + +return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); +} + +static bool icl_tc_port_connected(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_dp.c +1
-0+struct intel_digital_port
*intel_dig_port)drivers/gpu/drm/i915/intel_dp.c +7
-0+{ +enum port port = intel_dig_port->base.port; +enum tc_port tc_port =intel_port_to_tc (dev_priv, port); +bool is_legacy, is_typec, is_tbt; +u32 dpsp; + + is_legacy = I915_READ(SDEISR) &
SDE_TC_HOTPLUG_ICP(tc_port);drivers/gpu/drm/i915/intel_dp.c +3
-0+ +/* +* The spec says we shouldn't be using the ISR bits for detecting
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c static bool bxt_digital_port_connected(struct intel_encoder *encoder) · line 4611
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+* between TC and TBT. We should use DFLEXDPSP. +*/ + dpsp =I915_READ (PORT_TX_DFLEXDPSP );I only wonder if we should be reading the North DE even if
is_legacy
is
true above rather than using an early return. Anyway:(missed this part in the other email)
Quoted 8 lines
That makes sense in the current state of the code. It would remove our
ability to hit theWARN_ONbelow, but that doesn't seem to be a major issue.Now when we go back to discussing our implementation for the connect flows we may end up having to revert to the current form, but we can always do that if we need it.
Forget what I just said: patch 2 will already have to revert the early return.
Quoted 63 lines
Quoted 3 lines
Reviewed-by Lucas De Marchi <[email protected]>Thanks! I'll submit v4.
Quoted 57 lines
Lucas De Marchi
Quoted 54 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+ is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); + is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); + +WARN_ON (is_legacy + is_typec + is_tbt >1 ); + +return is_legacy || is_typec || is_tbt; +} + +static bool icl_digital_port_connected(struct intel_encoder*encoder)
drivers/gpu/drm/i915/intel_dp.c +2
-0+{ + struct drm_i915_private *dev_priv = to_i915(encoder-Quoted 1 line
base.dev);
drivers/gpu/drm/i915/intel_dp.c +1
-0+ struct intel_digital_port *dig_port =
enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_dp.c +5
-0+ +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : + return icl_combo_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +5
-0+case HPD_PORT_C : +case HPD_PORT_D : +case HPD_PORT_E : +case HPD_PORT_F : + return icl_tc_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +6
-0+default : +MISSING_CASE (encoder->hpd_pin); +return false; + } +} +/* * intel_digital_port_connected - is the specified port connected?
* @encoder:intel_encoderdrivers/gpu/drm/i915/intel_dp.c +3
-1@@ -4613,8 +4664,10 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)return bdw_digital_port_connected (encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder); - else + else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv)) return spt_digital_port_connected(encoder); + else + return icl_digital_port_connected(encoder); }static struct edid *
Signature · 1 line
2.17.1
Quoted 9 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/icl: implement icl_digital_port_connected()
Quoted 164 lines · Paulo Zanoni
Em Qua, 2018-07-25 às 10:27 -0700, Paulo Zanoni escreveu:
Quoted 163 lines
Em Ter, 2018-07-24 às 18:19 -0700, Lucas De Marchi escreveu:
Quoted 146 lines · Paulo Zanoni
Quoted 6 lines
Do like the other functions and check for the status bits. The "Hot
Plug Detection" page from our documentation says we can't just use
the
ISR bits on the CPU side, so use the correct registers.nit: here you are saying it's for all of them rather than just a subset.
My suggestion is:Do like the other functions and check for the status bits. For TypeC/TBT
on North Display Engine the "Hot Plug Detection" page from our documentation says we can't just use the ISR bits to find the live state, so use the correct registers: DFLEXDPSP TC Live State field.Quoted 127 lines
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganizeis_genif ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.Cc Animesh Manna <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 8 +++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)My understanding is that there's agreement on this patch since it just
mimicks what the other gens do. Let's have this one agreed on (merged)
first before we continue the discussions, especially since this one
significantly affects the CI system.drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7210,6 +7210,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLU
G | \
GEN11_TC3_HOTPL
UGQuoted 1 line
\
GEN11_TC2_HOTPL
UGQuoted 1 line
\
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7218,6 +7219,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTP
LUG | \
GEN11_TBT3_HOTP
LU
G | \
GEN11_TBT2_HOTP
LU
G | \drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7590,6 +7592,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \
SDE_DDIA_HOTPLUG_ICP)
#defineSDE_TC_MASK_ICP(SDE_TC4_HOTPLUG_
IC
P | \drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -10654,4 +10658,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_T
HRESH_1_UDW_PB, \
_ICL_DSC1_RC_BUF
_THRESH_1_UDW_PC)drivers/gpu/drm/i915/i915_reg.h +2
-0+#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 <<((
tc_port) * 8 + 6))
+#defineTC_LIVE_STATE_TC(tc_port)(1 <<
((tc_port) * 8 + 5))drivers/gpu/drm/i915/i915_reg.h +1
-0+#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +9
-0@@ -4586,6 +4586,57 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder) return I915_READ(GEN8_DE_PORT_ISR) & bit; } +static bool icl_combo_port_connected (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port) +{ +enum port port = intel_dig_port->base.port; + +return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); +} + +static bool icl_tc_port_connected(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_dp.c +1
-0+struct intel_digital_port
*intel_dig_port)drivers/gpu/drm/i915/intel_dp.c +7
-0+{ +enum port port = intel_dig_port->base.port; +enum tc_port tc_port =intel_port_to_tc (dev_priv, port); +bool is_legacy, is_typec, is_tbt; +u32 dpsp; + + is_legacy = I915_READ(SDEISR) &
SDE_TC_HOTPLUG_ICP(tc_port);drivers/gpu/drm/i915/intel_dp.c +3
-0+ +/* +* The spec says we shouldn't be using the ISR bits for detecting
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c static bool bxt_digital_port_connected(struct intel_encoder *encoder) · line 4611
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+* between TC and TBT. We should use DFLEXDPSP. +*/ + dpsp =I915_READ (PORT_TX_DFLEXDPSP );I only wonder if we should be reading the North DE even if
is_legacy
is
true above rather than using an early return. Anyway:(missed this part in the other email)
That makes sense in the current state of the code. It would remove our
ability to hit theWARN_ONbelow, but that doesn't seem to be a major issue.
Quoted 6 lines
Quoted 3 lines
Now when we go back to discussing our implementation for the connect flows we may end up having to revert to the current form, but we can always do that if we need it.
Forget what I just said: patch 2 will already have to revert the early return.
yeah, I should have read patch 2 before commenting here. I thought we were moving away from updating the type while we check if it's connected.
LGTM
Lucas De Marchi
Quoted 64 lines
Quoted 64 lines
Quoted 4 lines
Reviewed-by Lucas De Marchi <[email protected]>Thanks! I'll submit v4.
Quoted 57 lines
Lucas De Marchi
Quoted 54 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+ is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); + is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); + +WARN_ON (is_legacy + is_typec + is_tbt >1 ); + +return is_legacy || is_typec || is_tbt; +} + +static bool icl_digital_port_connected(struct intel_encoder*encoder)
drivers/gpu/drm/i915/intel_dp.c +2
-0+{ + struct drm_i915_private *dev_priv = to_i915(encoder-Quoted 1 line
base.dev);
drivers/gpu/drm/i915/intel_dp.c +1
-0+ struct intel_digital_port *dig_port =
enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_dp.c +5
-0+ +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : + return icl_combo_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +5
-0+case HPD_PORT_C : +case HPD_PORT_D : +case HPD_PORT_E : +case HPD_PORT_F : + return icl_tc_port_connected(dev_priv,
dig_port);drivers/gpu/drm/i915/intel_dp.c +6
-0+default : +MISSING_CASE (encoder->hpd_pin); +return false; + } +} +/* * intel_digital_port_connected - is the specified port connected?
* @encoder:intel_encoderdrivers/gpu/drm/i915/intel_dp.c +3
-1@@ -4613,8 +4664,10 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)return bdw_digital_port_connected (encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder); - else + else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv)) return spt_digital_port_connected(encoder); + else + return icl_digital_port_connected(encoder); }static struct edid *
Signature · 1 line
2.17.1
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/5 drm/i915/icl: implement icl_digital_port_connected()
In reply to Paulo ZanoniDo like the other functions and check for the status bits. The "Hot Plug Detection" page from our documentation says we can't just use the ISR bits on the CPU side (North Display, which has the TC and TBT modes), so use the correct
register: DFLEXDPSP, TC Live State field.
v2: Rebase.
v3:
- Simplify true/false assignment (Rodrigo).
- Reorganize is_gen if ladder (Rodrigo).
- Don't use the ISR for TC/TBT CPU bits.
v4:
- Improve commit message wording (Lucas).
--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++ drivers/gpu/drm/i915/intel_dp.c | 55 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -7254,6 +7254,7 @@ enum {#define GEN11_TC3_HOTPLUG (1 << 18)#define GEN11_TC2_HOTPLUG (1 << 17)#define GEN11_TC1_HOTPLUG (1 << 16) +#define GEN11_TC_HOTPLUG (tc_port) (1 << ((tc_port) + 16))#define GEN11_DE_TC_HOTPLUG_MASK (GEN11_TC4_HOTPLUG | \ GEN11_TC3_HOTPLUG | \ GEN11_TC2_HOTPLUG | \
@@ -7262,6 +7263,7 @@ enum {#define GEN11_TBT3_HOTPLUG (1 << 2)#define GEN11_TBT2_HOTPLUG (1 << 1)#define GEN11_TBT1_HOTPLUG (1 << 0) +#define GEN11_TBT_HOTPLUG (tc_port) (1 << (tc_port))#define GEN11_DE_TBT_HOTPLUG_MASK (GEN11_TBT4_HOTPLUG | \ GEN11_TBT3_HOTPLUG | \ GEN11_TBT2_HOTPLUG | \
@@ -7634,6 +7636,8 @@ enum {#define SDE_GMBUS_ICP (1 << 23)#define SDE_DDIB_HOTPLUG_ICP (1 << 17)#define SDE_DDIA_HOTPLUG_ICP (1 << 16) +#define SDE_TC_HOTPLUG_ICP (tc_port) (1 << ((tc_port) + 24)) +#define SDE_DDI_HOTPLUG_ICP (port) (1 << ((port) + 16))#define SDE_DDI_MASK_ICP (SDE_DDIB_HOTPLUG_ICP | \ SDE_DDIA_HOTPLUG_ICP)#define SDE_TC_MASK_ICP (SDE_TC4_HOTPLUG_ICP | \
@@ -10698,4 +10702,8 @@ enum skl_power_gate { _ICL_DSC1_RC_BUF_THRESH_1_UDW_PB, \ _ICL_DSC1_RC_BUF_THRESH_1_UDW_PC) +#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0) +#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6)) +#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dp.c +54 -1
68 lines not on this page · raw message
Signature · 6 lines
2.14.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915/icl: store the port type for TC ports
In reply to Paulo ZanoniThe type is detected based on the live status bits. Once detected, it's not supposed to be changed, so we have some sanity checks for that.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_display.h | 7 +++++ drivers/gpu/drm/i915/intel_dp.c | 40 ++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 46 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.h +7 -0
@@ -137,6 +137,13 @@ enum tc_port {I915_MAX_TC_PORTS }; +enum tc_port_type { +TC_PORT_UNKNOWN =0 , +TC_PORT_TYPEC , +TC_PORT_TBT , +TC_PORT_LEGACY , +}; +enum dpio_channel {DPIO_CH0 ,DPIO_CH1
drivers/gpu/drm/i915/intel_dp.c +38 -2
@@ -4594,6 +4594,38 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); } +static void icl_update_tc_port_type (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port, +bool is_legacy,bool is_typec,bool is_tbt) +{ +enum port port = intel_dig_port->base.port; +enum tc_port_type old_type = intel_dig_port->tc_type; +const char *type_str; + +WARN_ON (is_legacy + is_typec + is_tbt !=1 ); + +if (is_legacy) { + intel_dig_port->tc_type =TC_PORT_LEGACY ; + type_str ="legacy" ; + }else if (is_typec) { + intel_dig_port->tc_type =TC_PORT_TYPEC ; + type_str ="typec" ; + }else if (is_tbt) { + intel_dig_port->tc_type =TC_PORT_TBT ; + type_str ="tbt" ; + }else { +return ; + } + +/* Types are not supposed to be changed at runtime. */ +WARN_ON (old_type !=TC_PORT_UNKNOWN && + old_type != intel_dig_port->tc_type); + +if (old_type != intel_dig_port->tc_type) +DRM_DEBUG_KMS ("Port %c has TC type %s\n" ,port_name (port), + type_str); +} +static bool icl_tc_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *intel_dig_port) {
@@ -4612,9 +4644,13 @@ static bool icl_tc_port_connected(struct drm_i915_private *dev_priv, is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); -WARN_ON (is_legacy + is_typec + is_tbt >1 ); +if (!is_legacy && !is_typec && !is_tbt) +return false; + +icl_update_tc_port_type (dev_priv, intel_dig_port, is_legacy, is_typec, + is_tbt); -return is_legacy || is_typec || is_tbt; +return true; }static bool icl_digital_port_connected (struct intel_encoder *encoder)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1164,6 +1164,7 @@ struct intel_digital_port {bool release_cl2_override;uint8_t max_lanes;enum intel_display_power_domain ddi_io_power_domain; +enum tc_port_type tc_type; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/5] drm/i915/icl: store the port type for TC ports
Quoted 53 lines · Paulo Zanoni
The type is detected based on the live status bits. Once detected, it's not supposed to be changed, so we have some sanity checks for that.
v2: Rebase.
Cc Animesh Manna <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/intel_display.h | 7 +++++ drivers/gpu/drm/i915/intel_dp.c | 40 ++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 46 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_display.h +7
-0@@ -137,6 +137,13 @@ enum tc_port {I915_MAX_TC_PORTS }; +enum tc_port_type { +TC_PORT_UNKNOWN =0 , +TC_PORT_TYPEC , +TC_PORT_TBT , +TC_PORT_LEGACY , +}; +enum dpio_channel {DPIO_CH0 ,DPIO_CH1 drivers/gpu/drm/i915/intel_dp.c +12
-0@@ -4594,6 +4594,38 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); } +static void icl_update_tc_port_type (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port, +bool is_legacy,bool is_typec,bool is_tbt) +{ +enum port port = intel_dig_port->base.port; +enum tc_port_type old_type = intel_dig_port->tc_type; +const char *type_str; + +WARN_ON (is_legacy + is_typec + is_tbt !=1 ); + +if (is_legacy) { + intel_dig_port->tc_type =TC_PORT_LEGACY ;
drivers/gpu/drm/i915/intel_dp.c static bool icl_combo_port_connected(struct drm_i915_private *dev_priv, · line 4618
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+ type_str ="legacy" ; + }else if (is_typec) { + intel_dig_port->tc_type =TC_PORT_TYPEC ; + type_str ="typec" ; + }else if (is_tbt) { + intel_dig_port->tc_type =TC_PORT_TBT ; + type_str ="tbt" ; + }else { +return ; + }
nip: switch seems more appropriate for this block.
Anyway:
Quoted 48 lines
drivers/gpu/drm/i915/intel_dp.c +16
-2+ +/* Types are not supposed to be changed at runtime. */ +WARN_ON (old_type !=TC_PORT_UNKNOWN && + old_type != intel_dig_port->tc_type); + +if (old_type != intel_dig_port->tc_type) +DRM_DEBUG_KMS ("Port %c has TC type %s\n" ,port_name (port), + type_str); +} +static bool icl_tc_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *intel_dig_port) {@@ -4612,9 +4644,13 @@ static bool icl_tc_port_connected(struct drm_i915_private *dev_priv, is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); -WARN_ON (is_legacy + is_typec + is_tbt >1 ); +if (!is_legacy && !is_typec && !is_tbt) +return false; + +icl_update_tc_port_type (dev_priv, intel_dig_port, is_legacy, is_typec, + is_tbt); -return is_legacy || is_typec || is_tbt; +return true; }static bool icl_digital_port_connected (struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1164,6 +1164,7 @@ struct intel_digital_port {bool release_cl2_override;uint8_t max_lanes;enum intel_display_power_domain ddi_io_power_domain; +enum tc_port_type tc_type; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH 2/5] drm/i915/icl: store the port type for TC ports
Quoted 67 lines · Rodrigo Vivi
Quoted 53 lines · Paulo Zanoni
The type is detected based on the live status bits. Once detected, it's not supposed to be changed, so we have some sanity checks for that.
v2: Rebase.
Cc Animesh Manna <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/intel_display.h | 7 +++++ drivers/gpu/drm/i915/intel_dp.c | 40 ++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 46 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_display.h +7
-0@@ -137,6 +137,13 @@ enum tc_port {I915_MAX_TC_PORTS }; +enum tc_port_type { +TC_PORT_UNKNOWN =0 , +TC_PORT_TYPEC , +TC_PORT_TBT , +TC_PORT_LEGACY , +}; +enum dpio_channel {DPIO_CH0 ,DPIO_CH1 drivers/gpu/drm/i915/intel_dp.c +12
-0@@ -4594,6 +4594,38 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (port); } +static void icl_update_tc_port_type (struct drm_i915_private *dev_priv, +struct intel_digital_port *intel_dig_port, +bool is_legacy,bool is_typec,bool is_tbt) +{ +enum port port = intel_dig_port->base.port; +enum tc_port_type old_type = intel_dig_port->tc_type; +const char *type_str; + +WARN_ON (is_legacy + is_typec + is_tbt !=1 ); + +if (is_legacy) { + intel_dig_port->tc_type =TC_PORT_LEGACY ;drivers/gpu/drm/i915/intel_dp.c static bool icl_combo_port_connected(struct drm_i915_private *dev_priv, · line 4618
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+ type_str ="legacy" ; + }else if (is_typec) { + intel_dig_port->tc_type =TC_PORT_TYPEC ; + type_str ="typec" ; + }else if (is_tbt) { + intel_dig_port->tc_type =TC_PORT_TBT ; + type_str ="tbt" ; + }else { +return ; + }nip: switch seems more appropriate for this block.
Quoted 1 line
Anyway:
ops... ignore this part above... arguments come separated... coffee didn't kick off yet today :P
Quoted 46 lines
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 44 lines
drivers/gpu/drm/i915/intel_dp.c +16
-2+ +/* Types are not supposed to be changed at runtime. */ +WARN_ON (old_type !=TC_PORT_UNKNOWN && + old_type != intel_dig_port->tc_type); + +if (old_type != intel_dig_port->tc_type) +DRM_DEBUG_KMS ("Port %c has TC type %s\n" ,port_name (port), + type_str); +} +static bool icl_tc_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *intel_dig_port) {@@ -4612,9 +4644,13 @@ static bool icl_tc_port_connected(struct drm_i915_private *dev_priv, is_typec = dpsp &TC_LIVE_STATE_TC (tc_port); is_tbt = dpsp &TC_LIVE_STATE_TBT (tc_port); -WARN_ON (is_legacy + is_typec + is_tbt >1 ); +if (!is_legacy && !is_typec && !is_tbt) +return false; + +icl_update_tc_port_type (dev_priv, intel_dig_port, is_legacy, is_typec, + is_tbt); -return is_legacy || is_typec || is_tbt; +return true; }static bool icl_digital_port_connected (struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1164,6 +1164,7 @@ struct intel_digital_port {bool release_cl2_override;uint8_t max_lanes;enum intel_display_power_domain ddi_io_power_domain; +enum tc_port_type tc_type; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,Signature · 1 line
2.17.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915/icl: Update FIA supported lane count for hpd.
In reply to Paulo ZanoniFrom: Animesh Manna <[email protected]>
In ICL, Flexible IO Adapter (FIA) muxes data and clocks of USB 3.1, tbt and display controller. In DP alt mode FIA configure the number of lanes and will be used apart from DPCD read to calculate max available lanes for DP enablement.
v2 (from Paulo): Simple rebase.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_dp.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -10705,5 +10705,8 @@ enum skl_power_gate {#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0)#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6))#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#define DP_LANE_ASSIGNMENT_SHIFT (tc_port) ((tc_port) * 8) +#define DP_LANE_ASSIGNMENT_MASK (tc_port) (0xf << ((tc_port) * 8)) +#define DP_LANE_ASSIGNMENT (tc_port, x) ((x) << ((tc_port) * 8))#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dp.c +32 -1
@@ -176,14 +176,45 @@ static int intel_dp_max_common_rate(struct intel_dp *intel_dp)return intel_dp->common_rates[intel_dp->num_common_rates -1 ]; } +static int intel_dp_get_fia_supported_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); +enum tc_port tc_port =intel_port_to_tc (dev_priv, dig_port->base.port); +u32 lane_info; + +if (tc_port ==PORT_TC_NONE || dig_port->tc_type !=TC_PORT_TYPEC ) +return 4 ; + + lane_info = (I915_READ (PORT_TX_DFLEXDPSP ) & +DP_LANE_ASSIGNMENT_MASK (tc_port)) >> +DP_LANE_ASSIGNMENT_SHIFT (tc_port); + +switch (lane_info) { +default : +MISSING_CASE (lane_info); +case 1 : +case 2 : +case 4 : +case 8 : +return 1 ; +case 3 : +case 12 : +return 2 ; +case 15 : +return 4 ; + } +} +/* Theoretical max between source and sink */ static int intel_dp_max_common_lane_count (struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);int source_max = intel_dig_port->max_lanes;int sink_max =drm_dp_max_lane_count (intel_dp->dpcd); +int fia_max =intel_dp_get_fia_supported_lane_count (intel_dp); -return min (source_max, sink_max); +return min3 (source_max, sink_max, fia_max); }int intel_dp_max_lane_count (struct intel_dp *intel_dp)
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH 3/5] drm/i915/icl: Update FIA supported lane count for hpd.
Quoted 56 lines · Paulo Zanoni
From: Animesh Manna <[email protected]>
In ICL, Flexible IO Adapter (FIA) muxes data and clocks of USB 3.1, tbt and display controller. In DP alt mode FIA configure the number of lanes and will be used apart from DPCD read to calculate max available lanes for DP enablement.
v2 (from Paulo): Simple rebase.
Reviewed-by Anusha Srivatsa <[email protected]> (v1).Signed-off-by Animesh Manna <[email protected]>[Paulo: significant rewrite of the patch.]Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_dp.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -10705,5 +10705,8 @@ enum skl_power_gate {#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0)#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6))#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#define DP_LANE_ASSIGNMENT_SHIFT (tc_port) ((tc_port) * 8) +#define DP_LANE_ASSIGNMENT_MASK (tc_port) (0xf << ((tc_port) * 8)) +#define DP_LANE_ASSIGNMENT (tc_port, x) ((x) << ((tc_port) * 8))#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +17
-0@@ -176,14 +176,45 @@ static int intel_dp_max_common_rate(struct intel_dp *intel_dp)return intel_dp->common_rates[intel_dp->num_common_rates -1 ]; } +static int intel_dp_get_fia_supported_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); +enum tc_port tc_port =intel_port_to_tc (dev_priv, dig_port->base.port); +u32 lane_info; + +if (tc_port ==PORT_TC_NONE || dig_port->tc_type !=TC_PORT_TYPEC ) +return 4 ; + + lane_info = (I915_READ (PORT_TX_DFLEXDPSP ) & +DP_LANE_ASSIGNMENT_MASK (tc_port)) >> +DP_LANE_ASSIGNMENT_SHIFT (tc_port); + +switch (lane_info) { +default : +MISSING_CASE (lane_info);
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_max_common_rate(struct intel_dp *intel_dp) · line 205
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+case 1 : +case 2 : +case 4 : +case 8 : +return 1 ; +case 3 : +case 12 : +return 2 ; +case 15 : +return 4 ;
what about replacing this entire switch per a simple
return hweight8(lane_info);
?
Quoted 23 lines
drivers/gpu/drm/i915/intel_dp.c +5
-1+ } +} +/* Theoretical max between source and sink */ static int intel_dp_max_common_lane_count (struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);int source_max = intel_dig_port->max_lanes;int sink_max =drm_dp_max_lane_count (intel_dp->dpcd); +int fia_max =intel_dp_get_fia_supported_lane_count (intel_dp); -return min (source_max, sink_max); +return min3 (source_max, sink_max, fia_max); }int intel_dp_max_lane_count (struct intel_dp *intel_dp)Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915/icl: Update FIA supported lane count for hpd.
Em Qua, 2018-07-25 às 09:52 -0700, Rodrigo Vivi escreveu:
Quoted 85 lines · Paulo Zanoni
Quoted 71 lines
From: Animesh Manna <[email protected]>
In ICL, Flexible IO Adapter (FIA) muxes data and clocks of USB 3.1, tbt and display controller. In DP alt mode FIA configure the number of lanes and will be used apart from DPCD read to calculate max
available lanes for DP enablement.v2 (from Paulo): Simple rebase.
Reviewed-by Anusha Srivatsa <[email protected]> (v1).Signed-off-by Animesh Manna <[email protected]>[Paulo: significant rewrite of the patch.]Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_dp.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -10705,5 +10705,8 @@ enum skl_power_gate {#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0)#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6))#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#define DP_LANE_ASSIGNMENT_SHIFT (tc_port) ((tc_port) * 8) +#define DP_LANE_ASSIGNMENT_MASK (tc_port) (0xf <<((
tc_port) * 8))
+#defineDP_LANE_ASSIGNMENT(tc_port, x)((x) << ((tc_port)
* 8))#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_dp.c +17
-0@@ -176,14 +176,45 @@ static int intel_dp_max_common_rate(struct intel_dp *intel_dp)return intel_dp->common_rates[intel_dp->num_common_rates -1 ]; } +static int intel_dp_get_fia_supported_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port- >base.base.dev); +enum tc_port tc_port =intel_port_to_tc (dev_priv, dig_port->base.port); +u32 lane_info; + +if (tc_port ==PORT_TC_NONE || dig_port->tc_type !=TC_PORT_TYPEC ) +return 4 ; + + lane_info = (I915_READ (PORT_TX_DFLEXDPSP ) & +DP_LANE_ASSIGNMENT_MASK (tc_port)) >> +DP_LANE_ASSIGNMENT_SHIFT (tc_port); + +switch (lane_info) { +default : +MISSING_CASE (lane_info);drivers/gpu/drm/i915/intel_dp.c static int intel_dp_max_common_rate(struct · line 212
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+case 1 : +case 2 : +case 4 : +case 8 : +return 1 ; +case 3 : +case 12 : +return 2 ; +case 15 : +return 4 ;what about replacing this entire switch per a simple
Quoted 3 lines
return
hweight8(lane_info);?
It kills our ability to hit MISSING_CASE for 5, 6, 7, 9, 10, 11, 13 and
14. I think it's always good to revalidate our hardware/spec assumptions for the newer platforms (although we don't seem to be hitting this as far as I have tested).
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+ } +} +/* Theoretical max between source and sink */ static int intel_dp_max_common_lane_count (struct intel_dp *intel_dp) { struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_dp.c +1
-0int source_max = intel_dig_port->max_lanes;int sink_max =drm_dp_max_lane_count (intel_dp->dpcd); + int fia_max =
intel_dp_get_fia_supported_lane_count(intel_dp);drivers/gpu/drm/i915/intel_dp.c +1
-1-return min (source_max, sink_max); +return min3 (source_max, sink_max, fia_max); }
Quoted 8 lines
Quoted 8 lines
int
intel_dp_max_lane_count(struct intel_dp *intel_dp)Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915/icl: Update FIA supported lane count for hpd.
In reply to Rodrigo ViviQuoted 70 lines · Rodrigo Vivi
Quoted 56 lines · Paulo Zanoni
From: Animesh Manna <[email protected]>
In ICL, Flexible IO Adapter (FIA) muxes data and clocks of USB 3.1, tbt and display controller. In DP alt mode FIA configure the number of lanes and will be used apart from DPCD read to calculate max available lanes for DP enablement.
v2 (from Paulo): Simple rebase.
Reviewed-by Anusha Srivatsa <[email protected]> (v1).Signed-off-by Animesh Manna <[email protected]>[Paulo: significant rewrite of the patch.]Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_dp.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -10705,5 +10705,8 @@ enum skl_power_gate {#define PORT_TX_DFLEXDPSP _MMIO(0x1638A0)#define TC_LIVE_STATE_TBT (tc_port) (1 << ((tc_port) * 8 + 6))#define TC_LIVE_STATE_TC (tc_port) (1 << ((tc_port) * 8 + 5)) +#define DP_LANE_ASSIGNMENT_SHIFT (tc_port) ((tc_port) * 8) +#define DP_LANE_ASSIGNMENT_MASK (tc_port) (0xf << ((tc_port) * 8)) +#define DP_LANE_ASSIGNMENT (tc_port, x) ((x) << ((tc_port) * 8))#endif /* _I915_REG_H_ */ drivers/gpu/drm/i915/intel_dp.c +17
-0@@ -176,14 +176,45 @@ static int intel_dp_max_common_rate(struct intel_dp *intel_dp)return intel_dp->common_rates[intel_dp->num_common_rates -1 ]; } +static int intel_dp_get_fia_supported_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); +enum tc_port tc_port =intel_port_to_tc (dev_priv, dig_port->base.port); +u32 lane_info; + +if (tc_port ==PORT_TC_NONE || dig_port->tc_type !=TC_PORT_TYPEC ) +return 4 ; + + lane_info = (I915_READ (PORT_TX_DFLEXDPSP ) & +DP_LANE_ASSIGNMENT_MASK (tc_port)) >> +DP_LANE_ASSIGNMENT_SHIFT (tc_port); + +switch (lane_info) { +default : +MISSING_CASE (lane_info);drivers/gpu/drm/i915/intel_dp.c static int intel_dp_max_common_rate(struct intel_dp *intel_dp) · line 205
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+case 1 : +case 2 : +case 4 : +case 8 : +return 1 ; +case 3 : +case 12 : +return 2 ; +case 15 : +return 4 ;what about replacing this entire switch per a simple
Quoted 1 line
return
hweight8(lane_info);
ignore this.
specially considering that SOC FW sets these bits, not HW, I agree that MISSING_CASE is very important.
Quoted 18 lines
?
Quoted 15 lines
drivers/gpu/drm/i915/intel_dp.c +5
-1+ } +} +/* Theoretical max between source and sink */ static int intel_dp_max_common_lane_count (struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);int source_max = intel_dig_port->max_lanes;int sink_max =drm_dp_max_lane_count (intel_dp->dpcd); +int fia_max =intel_dp_get_fia_supported_lane_count (intel_dp); -return min (source_max, sink_max); +return min3 (source_max, sink_max, fia_max); }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0int intel_dp_max_lane_count (struct intel_dp *intel_dp)Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915/icl: program MG_DP_MODE
In reply to Paulo ZanoniProgramming this register is part of the Enable Sequence for DisplayPort on ICL. Do as the spec says.
v2: Simple rebase.
--- drivers/gpu/drm/i915/i915_reg.h | 15 ++++++++ drivers/gpu/drm/i915/intel_ddi.c | 2 + drivers/gpu/drm/i915/intel_dp.c | 66 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + 4 files changed, 84 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +15 -0
@@ -2092,6 +2092,21 @@ enum i915_power_well_id {#define CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK (0x3 << 25)#define CFG_AMI_CK_DIV_OVERRIDE_EN (1 << 24) +#define MG_DP_MODE_LN0_ACU_PORT1 0x1683A0 +#define MG_DP_MODE_LN1_ACU_PORT1 0x1687A0 +#define MG_DP_MODE_LN0_ACU_PORT2 0x1693A0 +#define MG_DP_MODE_LN1_ACU_PORT2 0x1697A0 +#define MG_DP_MODE_LN0_ACU_PORT3 0x16A3A0 +#define MG_DP_MODE_LN1_ACU_PORT3 0x16A7A0 +#define MG_DP_MODE_LN0_ACU_PORT4 0x16B3A0 +#define MG_DP_MODE_LN1_ACU_PORT4 0x16B7A0 +#define MG_DP_MODE (port, ln) \ + MG_PHY_PORT_LN(port, ln, MG_DP_MODE_LN0_ACU_PORT1, \ + MG_DP_MODE_LN0_ACU_PORT2, \ + MG_DP_MODE_LN1_ACU_PORT1) +#define MG_DP_MODE_CFG_DP_X2_MODE (1 << 7) +#define MG_DP_MODE_CFG_DP_X1_MODE (1 << 6) +/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel. */
drivers/gpu/drm/i915/intel_ddi.c +2 -0
@@ -2809,6 +2809,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain); +icl_program_mg_dp_mode (intel_dp); +if (IS_ICELAKE (dev_priv))icl_ddi_vswing_sequence (encoder, crtc_state->port_clock, level, encoder->type);
drivers/gpu/drm/i915/intel_dp.c +66 -0
72 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1714,6 +1714,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv, unsigned int frontbuffer_bits);void intel_edp_drrs_flush (struct drm_i915_private *dev_priv,unsigned int frontbuffer_bits); +void icl_program_mg_dp_mode (struct intel_dp *intel_dp); void intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915/icl: toggle PHY clock gating around link training
In reply to Paulo ZanoniThe Gen11 TypeC PHY DDI Buffer chapter, PHY Clock Gating Programming section says that PHY clock gating should be disabled before starting voltage swing programming, then enabled after any link training is complete.
v2: Simple rebase.
--- drivers/gpu/drm/i915/i915_reg.h | 20 ++++++++++ drivers/gpu/drm/i915/intel_ddi.c | 3 ++ drivers/gpu/drm/i915/intel_dp.c | 66 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 + 4 files changed, 91 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +20 -0
@@ -2106,6 +2106,26 @@ enum i915_power_well_id { MG_DP_MODE_LN1_ACU_PORT1)#define MG_DP_MODE_CFG_DP_X2_MODE (1 << 7)#define MG_DP_MODE_CFG_DP_X1_MODE (1 << 6) +#define MG_DP_MODE_CFG_TR2PWR_GATING (1 << 5) +#define MG_DP_MODE_CFG_TRPWR_GATING (1 << 4) +#define MG_DP_MODE_CFG_CLNPWR_GATING (1 << 3) +#define MG_DP_MODE_CFG_DIGPWR_GATING (1 << 2) +#define MG_DP_MODE_CFG_GAONPWR_GATING (1 << 1) + +#define MG_MISC_SUS0_PORT1 0x168814 +#define MG_MISC_SUS0_PORT2 0x169814 +#define MG_MISC_SUS0_PORT3 0x16A814 +#define MG_MISC_SUS0_PORT4 0x16B814 +#define MG_MISC_SUS0 (tc_port) \ + _MMIO(_PORT(tc_port, MG_MISC_SUS0_PORT1, MG_MISC_SUS0_PORT2)) +#define MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE_MASK (3 << 14) +#define MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE (x) ((x) << 14) +#define MG_MISC_SUS0_CFG_TR2PWR_GATING (1 << 12) +#define MG_MISC_SUS0_CFG_CL2PWR_GATING (1 << 11) +#define MG_MISC_SUS0_CFG_GAONPWR_GATING (1 << 10) +#define MG_MISC_SUS0_CFG_TRPWR_GATING (1 << 7) +#define MG_MISC_SUS0_CFG_CL1PWR_GATING (1 << 6) +#define MG_MISC_SUS0_CFG_DGPWR_GATING (1 << 5)/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel.
drivers/gpu/drm/i915/intel_ddi.c +3 -0
@@ -2810,6 +2810,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain);icl_program_mg_dp_mode (intel_dp); +icl_disable_phy_clock_gating (dig_port);if (IS_ICELAKE (dev_priv)) icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
@@ -2828,6 +2829,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train (intel_dp); +icl_enable_phy_clock_gating (dig_port); +intel_ddi_enable_pipe_clock (crtc_state); }
drivers/gpu/drm/i915/intel_dp.c +66 -0
72 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1715,6 +1715,8 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,void intel_edp_drrs_flush (struct drm_i915_private *dev_priv,unsigned int frontbuffer_bits);void icl_program_mg_dp_mode (struct intel_dp *intel_dp); +void icl_enable_phy_clock_gating (struct intel_digital_port *dig_port); +void icl_disable_phy_clock_gating (struct intel_digital_port *dig_port); void intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915/icl: implement icl_digital_port_connected() (rev2)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev2)
URL : https://patchwork.freedesktop.org/series/47151/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/icl: implement icl_digital_port_connected() Okay!
Commit: drm/i915/icl: store the port type for TC ports Okay!
Commit: drm/i915/icl: Update FIA supported lane count for hpd. -O:drivers/gpu/drm/i915/intel_dp.c:186:16: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_dp.c:186:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: program MG_DP_MODE
Okay!
Commit: drm/i915/icl: toggle PHY clock gating around link training Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: implement icl_digital_port_connected() (rev2)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev2)
URL : https://patchwork.freedesktop.org/series/47151/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4537 -> Patchwork_9760 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47151/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_9760 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: PASS -> DMESG-FAIL (fdo#106947, fdo#106560)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-bdw-5557u: DMESG-FAIL (fdo#106560) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
== Participating hosts (49 -> 41) ==
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-caroline fi-byt-clapper fi-bdw-samus
== Build changes ==
* Linux: CI_DRM_4537 -> Patchwork_9760
CI_DRM_4537: d14ba41a37d886280f69ba42c82c34654de09efc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9760: a800e1f994246df689b693d76b41ea631d5df2fd @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a800e1f99424 drm/i915/icl: toggle PHY clock gating around link training 52d60f864c4d drm/i915/icl: program MG_DP_MODE055dce408288 drm/i915/icl: Update FIA supported lane count for hpd. 198919f4ca28 drm/i915/icl: store the port type for TC ports 33275d39deb6 drm/i915/icl: implement icl_digital_port_connected()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9760/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/icl: implement icl_digital_port_connected() (rev2)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev2)
URL : https://patchwork.freedesktop.org/series/47151/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4537_full -> Patchwork_9760_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9760_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9760_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9760_full:
=== IGT changes ===
==== Warnings ====
igt@kms_plane_lowres@pipe-b-tiling-none:
shard-snb: PASS -> SKIP +2== Known issues ==
Here are the changes found in Patchwork_9760_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@forcewake:
shard-snb: PASS -> DMESG-WARN (fdo#102365)
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-hsw: PASS -> FAIL (fdo#105363)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@gem_exec_await@wide-contexts:
shard-glk: FAIL (fdo#105900) -> PASS
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-hsw: INCOMPLETE (fdo#103540) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105189) -> PASS
igt@kms_flip@dpms-vs-vblank-race:
shard-snb: FAIL (fdo#103060) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105900 https://bugs.freedesktop.org/show_bug.cgi?id=105900
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4537 -> Patchwork_9760
CI_DRM_4537: d14ba41a37d886280f69ba42c82c34654de09efc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9760: a800e1f994246df689b693d76b41ea631d5df2fd @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9760/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: implement icl_digital_port_connected() (rev2)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev2)
URL : https://patchwork.freedesktop.org/series/47151/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4539 -> Patchwork_9762 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47151/revisions/2/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9762:
=== IGT changes ===
==== Possible regressions ====
igt@debugfs_test@read_all_entries:
{fi-icl-u}: NOTRUN -> DMESG-WARN +5
{igt@kms_psr@primary_page_flip}:
{fi-icl-u}: NOTRUN -> FAIL +3== Known issues ==
Here are the changes found in Patchwork_9762 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
fi-kbl-guc: PASS -> DMESG-FAIL (fdo#106947)
fi-bxt-dsi: PASS -> DMESG-FAIL (fdo#106560)
igt@drv_selftest@live_objects:
{fi-icl-u}: NOTRUN -> DMESG-FAIL (fdo#107339)
igt@gem_ctx_param@basic-default:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)
igt@gem_workarounds@basic-read:
{fi-icl-u}: NOTRUN -> FAIL (fdo#107338)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: PASS -> FAIL (fdo#100368)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@drv_selftest@live_hangcheck:
fi-kbl-7567u: DMESG-FAIL (fdo#106560, fdo#106947) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b:
fi-glk-j4005: DMESG-WARN (fdo#106097) -> PASS
{igt@kms_psr@primary_mmap_gtt}:
fi-cnl-psr: DMESG-WARN (fdo#107372) -> PASS
==== Warnings ====
{igt@kms_psr@primary_page_flip}:
fi-cnl-psr: DMESG-FAIL (fdo#107372) -> DMESG-WARN (fdo#107372) {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107338 https://bugs.freedesktop.org/show_bug.cgi?id=107338
fdo#107339 https://bugs.freedesktop.org/show_bug.cgi?id=107339
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
== Participating hosts (51 -> 46) ==
Additional (1): fi-icl-u
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper
== Build changes ==
* Linux: CI_DRM_4539 -> Patchwork_9762
CI_DRM_4539: 764eb9fdd5683545c98da3e1c144824519306876 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9762: 640806fc157865b6078add10a6ee3dc59c39ed26 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
640806fc1578 drm/i915/icl: toggle PHY clock gating around link training a477e462b9ab drm/i915/icl: program MG_DP_MODE857c57ed0253 drm/i915/icl: Update FIA supported lane count for hpd. d19a5f3fb312 drm/i915/icl: store the port type for TC ports 779d73b3ab5d drm/i915/icl: implement icl_digital_port_connected()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9762/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/icl: implement icl_digital_port_connected() (rev2)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev2)
URL : https://patchwork.freedesktop.org/series/47151/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4539_full -> Patchwork_9762_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9762_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9762_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9762_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-render:
shard-kbl: SKIP -> PASS
igt@kms_busy@extended-modeset-hang-oldfb-render-b:
shard-snb: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9762_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: PASS -> INCOMPLETE (fdo#106023, fdo#103665)
{igt@gem_userptr_blits@readonly-unsync}:
shard-apl: PASS -> INCOMPLETE (fdo#103927)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL (fdo#106947, fdo#106560) -> PASS
igt@gem_workarounds@suspend-resume:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
igt@kms_cursor_legacy@cursor-vs-flip-toggle:
shard-hsw: FAIL (fdo#103355) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105189) -> PASS
igt@kms_flip@plain-flip-ts-check:
shard-glk: FAIL (fdo#100368) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4539 -> Patchwork_9762
CI_DRM_4539: 764eb9fdd5683545c98da3e1c144824519306876 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9762: 640806fc157865b6078add10a6ee3dc59c39ed26 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9762/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915/icl: implement icl_digital_port_connected() (rev3)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev3)
URL : https://patchwork.freedesktop.org/series/47151/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 82dbbab3500e drm/i915/icl: implement icl_digital_port_connected() -:7: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #7: Detection" page from our documentation says we can't just use the ISR bits on
total: 0 errors, 1 warnings, 0 checks, 98 lines checked e2119a7b93d3 drm/i915/icl: store the port type for TC ports 3d2f8c9f4cbd drm/i915/icl: Update FIA supported lane count for hpd. c797f962af7e drm/i915/icl: program MG_DP_MODE7d1f77f586ea drm/i915/icl: toggle PHY clock gating around link training
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915/icl: implement icl_digital_port_connected() (rev3)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev3)
URL : https://patchwork.freedesktop.org/series/47151/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/icl: implement icl_digital_port_connected() Okay!
Commit: drm/i915/icl: store the port type for TC ports Okay!
Commit: drm/i915/icl: Update FIA supported lane count for hpd. -O:drivers/gpu/drm/i915/intel_dp.c:186:16: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_dp.c:186:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:217:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: program MG_DP_MODE
Okay!
Commit: drm/i915/icl: toggle PHY clock gating around link training Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/icl: implement icl_digital_port_connected() (rev3)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: drm/i915/icl: implement icl_digital_port_connected() (rev3)
URL : https://patchwork.freedesktop.org/series/47151/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4542 -> Patchwork_9769 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9769 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9769, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47151/revisions/3/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9769:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_objects:
fi-cnl-psr: NOTRUN -> DMESG-FAIL== Known issues ==
Here are the changes found in Patchwork_9769 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
igt@drv_module_reload@basic-no-display:
fi-cnl-psr: NOTRUN -> DMESG-WARN (fdo#105395) +5
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: PASS -> DMESG-FAIL (fdo#106560, fdo#106947)
fi-bdw-5557u: PASS -> DMESG-FAIL (fdo#106560)
igt@drv_selftest@live_workarounds:
fi-cnl-psr: NOTRUN -> DMESG-FAIL (fdo#107292)
igt@gem_exec_nop@basic-series:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106097, fdo#106000)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-glk-j4005: PASS -> FAIL (fdo#106211)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
{fi-cfl-8109u}: PASS -> INCOMPLETE (fdo#106070)
{igt@kms_psr@cursor_plane_move}:
fi-cnl-psr: NOTRUN -> DMESG-FAIL (fdo#107372)
{igt@kms_psr@primary_mmap_gtt}:
fi-cnl-psr: NOTRUN -> DMESG-WARN (fdo#107372) +1
==== Possible fixes ====
igt@kms_chamelium@dp-edid-read:
fi-kbl-7500u: FAIL (fdo#103841) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: FAIL (fdo#100368) -> PASS
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: FAIL (fdo#104008) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#105395 https://bugs.freedesktop.org/show_bug.cgi?id=105395
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106070 https://bugs.freedesktop.org/show_bug.cgi?id=106070
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106211 https://bugs.freedesktop.org/show_bug.cgi?id=106211
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
== Participating hosts (50 -> 45) ==
Additional (1): fi-cnl-psr
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper
== Build changes ==
* Linux: CI_DRM_4542 -> Patchwork_9769
CI_DRM_4542: b804f30998ca9919cf37c73fc37fbd6a4c6c5e38 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4575: fe908a01012c9daafafb3410b9407725ca9d4f21 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9769: 7d1f77f586ea723387bb3c4866f8218e0975a6b5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7d1f77f586ea drm/i915/icl: toggle PHY clock gating around link training c797f962af7e drm/i915/icl: program MG_DP_MODE3d2f8c9f4cbd drm/i915/icl: Update FIA supported lane count for hpd. e2119a7b93d3 drm/i915/icl: store the port type for TC ports 82dbbab3500e drm/i915/icl: implement icl_digital_port_connected()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9769/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx