* [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly
@ 2020-01-17 14:29 Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Jani Nikula
` (11 more replies)
0 siblings, 12 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
My long term plan is to reference all post-setup VBT child device
details through the encoder. We can add an (opaque) encoder->child
pointer, and forgo the dance to get to the relevant VBT details. This
will be helpful in, for example, adding support for multiple local
panels; the data must be made encoder specific instead of just using
i915->vbt.edp or i915->vbt.dsi directly.
The i915->vbt.ddi_port_info[] array stands in the way. Start hiding it
in intel_bios.c. We do gain a lot of intel_bios_*() accessors which may
seem noisy. But it seems to me this is a helpful iterative step no
matter what.
BR,
Jani.
Jani Nikula (9):
drm/i915/bios: add intel_bios_max_tmds_encoder()
drm/i915/bios: add intel_bios_hdmi_level_shift()
drm/i915/bios: intel_bios_dp_boost_level()
drm/i915/bios: intel_bios_hdmi_boost_level()
drm/i915/bios: add intel_bios_dp_max_link_rate()
drm/i915/bios: add intel_bios_alternate_ddc_pin()
drm/i915/bios: add intel_bios_port_supports_*()
drm/i915/bios: check port presence based on child device
drm/i915: use intel_bios_is_port_present()
drivers/gpu/drm/i915/display/intel_bios.c | 74 ++++++++++++++++++-
drivers/gpu/drm/i915/display/intel_bios.h | 11 +++
.../gpu/drm/i915/display/intel_combo_phy.c | 4 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 36 ++++-----
drivers/gpu/drm/i915/display/intel_dp.c | 6 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++----
6 files changed, 115 insertions(+), 41 deletions(-)
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:43 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift() Jani Nikula
` (10 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_hdmi.c | 9 ++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 9a891ef72118..b231fafc03ca 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2562,3 +2562,10 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
return aux_ch;
}
+
+int intel_bios_max_tmds_clock(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+ return i915->vbt.ddi_port_info[encoder->port].max_tmds_clock;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index d6a0c29d37ac..519e983ee9e7 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -247,5 +247,6 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port
bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
int dsc_max_bpc);
+int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 93ac0f296852..e8f8c87cd3e6 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2090,9 +2090,7 @@ static void pch_post_disable_hdmi(struct intel_encoder *encoder,
static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
{
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
- const struct ddi_vbt_port_info *info =
- &dev_priv->vbt.ddi_port_info[encoder->port];
- int max_tmds_clock;
+ int max_tmds_clock, vbt_max_tmds_clock;
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
max_tmds_clock = 594000;
@@ -2103,8 +2101,9 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
else
max_tmds_clock = 165000;
- if (info->max_tmds_clock)
- max_tmds_clock = min(max_tmds_clock, info->max_tmds_clock);
+ vbt_max_tmds_clock = intel_bios_max_tmds_clock(encoder);
+ if (vbt_max_tmds_clock)
+ max_tmds_clock = min(max_tmds_clock, vbt_max_tmds_clock);
return max_tmds_clock;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:45 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 3/9] drm/i915/bios: intel_bios_dp_boost_level() Jani Nikula
` (9 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 9 +++++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_ddi.c | 14 ++++++--------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index b231fafc03ca..50bff4e7d5c2 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2569,3 +2569,12 @@ int intel_bios_max_tmds_clock(struct intel_encoder *encoder)
return i915->vbt.ddi_port_info[encoder->port].max_tmds_clock;
}
+
+int intel_bios_hdmi_level_shift(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ const struct ddi_vbt_port_info *info =
+ &i915->vbt.ddi_port_info[encoder->port];
+
+ return info->hdmi_level_shift_set ? info->hdmi_level_shift : -1;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index 519e983ee9e7..c6cc413bf8ec 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -248,5 +248,6 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
int dsc_max_bpc);
int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
+int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 32ea3c7e8b62..cfaa64df9892 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -944,11 +944,11 @@ tgl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate,
return tgl_combo_phy_ddi_translations_dp_hbr;
}
-static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port)
+static int intel_ddi_hdmi_level(struct intel_encoder *encoder)
{
- struct ddi_vbt_port_info *port_info = &dev_priv->vbt.ddi_port_info[port];
+ struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
int n_entries, level, default_entry;
- enum phy phy = intel_port_to_phy(dev_priv, port);
+ enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
if (INTEL_GEN(dev_priv) >= 12) {
if (intel_phy_is_combo(dev_priv, phy))
@@ -987,9 +987,8 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por
if (WARN_ON_ONCE(n_entries == 0))
return 0;
- if (port_info->hdmi_level_shift_set)
- level = port_info->hdmi_level_shift;
- else
+ level = intel_bios_hdmi_level_shift(encoder);
+ if (level < 0)
level = default_entry;
if (WARN_ON_ONCE(level >= n_entries))
@@ -3665,8 +3664,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
- enum port port = encoder->port;
- int level = intel_ddi_hdmi_level(dev_priv, port);
+ int level = intel_ddi_hdmi_level(encoder);
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 3/9] drm/i915/bios: intel_bios_dp_boost_level()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 4/9] drm/i915/bios: intel_bios_hdmi_boost_level() Jani Nikula
` (8 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_ddi.c | 5 ++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 50bff4e7d5c2..88b78eae8bb2 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2578,3 +2578,10 @@ int intel_bios_hdmi_level_shift(struct intel_encoder *encoder)
return info->hdmi_level_shift_set ? info->hdmi_level_shift : -1;
}
+
+int intel_bios_dp_boost_level(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+ return i915->vbt.ddi_port_info[encoder->port].dp_boost_level;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index c6cc413bf8ec..5e68c58b58ca 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -249,5 +249,6 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
int dsc_max_bpc);
int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
+int intel_bios_dp_boost_level(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index cfaa64df9892..7bd5858b1f4a 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1022,8 +1022,7 @@ static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder,
&n_entries);
/* If we're boosting the current, set bit 31 of trans1 */
- if (IS_GEN9_BC(dev_priv) &&
- dev_priv->vbt.ddi_port_info[port].dp_boost_level)
+ if (IS_GEN9_BC(dev_priv) && intel_bios_dp_boost_level(encoder))
iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
for (i = 0; i < n_entries; i++) {
@@ -2344,7 +2343,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
if (type == INTEL_OUTPUT_HDMI)
iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level;
else
- iboost = dev_priv->vbt.ddi_port_info[port].dp_boost_level;
+ iboost = intel_bios_dp_boost_level(encoder);
if (iboost == 0) {
const struct ddi_buf_trans *ddi_translations;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 4/9] drm/i915/bios: intel_bios_hdmi_boost_level()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (2 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 3/9] drm/i915/bios: intel_bios_dp_boost_level() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 5/9] drm/i915/bios: add intel_bios_dp_max_link_rate() Jani Nikula
` (7 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_ddi.c | 5 ++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 88b78eae8bb2..5882ffc1b2a6 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2585,3 +2585,10 @@ int intel_bios_dp_boost_level(struct intel_encoder *encoder)
return i915->vbt.ddi_port_info[encoder->port].dp_boost_level;
}
+
+int intel_bios_hdmi_boost_level(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+ return i915->vbt.ddi_port_info[encoder->port].hdmi_boost_level;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index 5e68c58b58ca..b1c11b9bea41 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -250,5 +250,6 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
int intel_bios_dp_boost_level(struct intel_encoder *encoder);
+int intel_bios_hdmi_boost_level(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 7bd5858b1f4a..3697fa047362 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1055,8 +1055,7 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder,
level = n_entries - 1;
/* If we're boosting the current, set bit 31 of trans1 */
- if (IS_GEN9_BC(dev_priv) &&
- dev_priv->vbt.ddi_port_info[port].hdmi_boost_level)
+ if (IS_GEN9_BC(dev_priv) && intel_bios_hdmi_boost_level(encoder))
iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
/* Entry 9 is for HDMI: */
@@ -2341,7 +2340,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
u8 iboost;
if (type == INTEL_OUTPUT_HDMI)
- iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level;
+ iboost = intel_bios_hdmi_boost_level(encoder);
else
iboost = intel_bios_dp_boost_level(encoder);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 5/9] drm/i915/bios: add intel_bios_dp_max_link_rate()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (3 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 4/9] drm/i915/bios: intel_bios_hdmi_boost_level() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 6/9] drm/i915/bios: add intel_bios_alternate_ddc_pin() Jani Nikula
` (6 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_dp.c | 6 +++---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 5882ffc1b2a6..dd3968456aea 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2592,3 +2592,10 @@ int intel_bios_hdmi_boost_level(struct intel_encoder *encoder)
return i915->vbt.ddi_port_info[encoder->port].hdmi_boost_level;
}
+
+int intel_bios_dp_max_link_rate(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+ return i915->vbt.ddi_port_info[encoder->port].dp_max_link_rate;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index b1c11b9bea41..179d2eb49d7e 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -251,5 +251,6 @@ int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
int intel_bios_dp_boost_level(struct intel_encoder *encoder);
int intel_bios_hdmi_boost_level(struct intel_encoder *encoder);
+int intel_bios_dp_max_link_rate(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 4074d83b1a5f..8718f079b0d4 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -323,11 +323,10 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
162000, 270000
};
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+ struct intel_encoder *encoder = &dig_port->base;
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
- const struct ddi_vbt_port_info *info =
- &dev_priv->vbt.ddi_port_info[dig_port->base.port];
const int *source_rates;
- int size, max_rate = 0, vbt_max_rate = info->dp_max_link_rate;
+ int size, max_rate = 0, vbt_max_rate;
/* This should only be done once */
WARN_ON(intel_dp->source_rates || intel_dp->num_source_rates);
@@ -354,6 +353,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
size = ARRAY_SIZE(g4x_rates);
}
+ vbt_max_rate = intel_bios_dp_max_link_rate(encoder);
if (max_rate && vbt_max_rate)
max_rate = min(max_rate, vbt_max_rate);
else if (vbt_max_rate)
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 6/9] drm/i915/bios: add intel_bios_alternate_ddc_pin()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (4 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 5/9] drm/i915/bios: add intel_bios_dp_max_link_rate() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*() Jani Nikula
` (5 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
drivers/gpu/drm/i915/display/intel_bios.h | 1 +
drivers/gpu/drm/i915/display/intel_hdmi.c | 16 ++++++++--------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index dd3968456aea..23cbbe32e22f 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2599,3 +2599,10 @@ int intel_bios_dp_max_link_rate(struct intel_encoder *encoder)
return i915->vbt.ddi_port_info[encoder->port].dp_max_link_rate;
}
+
+int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder)
+{
+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+ return i915->vbt.ddi_port_info[encoder->port].alternate_ddc_pin;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index 179d2eb49d7e..077828d77642 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -252,5 +252,6 @@ int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
int intel_bios_dp_boost_level(struct intel_encoder *encoder);
int intel_bios_hdmi_boost_level(struct intel_encoder *encoder);
int intel_bios_dp_max_link_rate(struct intel_encoder *encoder);
+int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index e8f8c87cd3e6..f471b495a0b8 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3051,17 +3051,17 @@ static u8 g4x_port_to_ddc_pin(struct drm_i915_private *dev_priv,
return ddc_pin;
}
-static u8 intel_hdmi_ddc_pin(struct drm_i915_private *dev_priv,
- enum port port)
+static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)
{
- const struct ddi_vbt_port_info *info =
- &dev_priv->vbt.ddi_port_info[port];
+ struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+ enum port port = encoder->port;
u8 ddc_pin;
- if (info->alternate_ddc_pin) {
+ ddc_pin = intel_bios_alternate_ddc_pin(encoder);
+ if (ddc_pin) {
DRM_DEBUG_KMS("Using DDC pin 0x%x for port %c (VBT)\n",
- info->alternate_ddc_pin, port_name(port));
- return info->alternate_ddc_pin;
+ ddc_pin, port_name(port));
+ return ddc_pin;
}
if (HAS_PCH_MCC(dev_priv))
@@ -3147,7 +3147,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
intel_encoder->base.name))
return;
- intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
+ intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(intel_encoder);
ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
drm_connector_init_with_ddc(dev, connector,
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (5 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 6/9] drm/i915/bios: add intel_bios_alternate_ddc_pin() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 15:10 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device Jani Nikula
` (4 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 26 +++++++++++++++++++++++
drivers/gpu/drm/i915/display/intel_bios.h | 5 +++++
drivers/gpu/drm/i915/display/intel_ddi.c | 12 +++++------
3 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 23cbbe32e22f..4c69253739ec 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2606,3 +2606,29 @@ int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder)
return i915->vbt.ddi_port_info[encoder->port].alternate_ddc_pin;
}
+
+bool intel_bios_port_supports_dvi(struct drm_i915_private *i915, enum port port)
+{
+ return i915->vbt.ddi_port_info[port].supports_dvi;
+}
+
+bool intel_bios_port_supports_hdmi(struct drm_i915_private *i915, enum port port)
+{
+ return i915->vbt.ddi_port_info[port].supports_hdmi;
+}
+
+bool intel_bios_port_supports_dp(struct drm_i915_private *i915, enum port port)
+{
+ return i915->vbt.ddi_port_info[port].supports_dp;
+}
+
+bool intel_bios_port_supports_typec_usb(struct drm_i915_private *i915,
+ enum port port)
+{
+ return i915->vbt.ddi_port_info[port].supports_typec_usb;
+}
+
+bool intel_bios_port_supports_tbt(struct drm_i915_private *i915, enum port port)
+{
+ return i915->vbt.ddi_port_info[port].supports_tbt;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index 077828d77642..c17199caeff8 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -253,5 +253,10 @@ int intel_bios_dp_boost_level(struct intel_encoder *encoder);
int intel_bios_hdmi_boost_level(struct intel_encoder *encoder);
int intel_bios_dp_max_link_rate(struct intel_encoder *encoder);
int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder);
+bool intel_bios_port_supports_dvi(struct drm_i915_private *i915, enum port port);
+bool intel_bios_port_supports_hdmi(struct drm_i915_private *i915, enum port port);
+bool intel_bios_port_supports_dp(struct drm_i915_private *i915, enum port port);
+bool intel_bios_port_supports_typec_usb(struct drm_i915_private *i915, enum port port);
+bool intel_bios_port_supports_tbt(struct drm_i915_private *i915, enum port port);
#endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 3697fa047362..18a8186699f9 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4780,15 +4780,14 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport)
void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
{
- struct ddi_vbt_port_info *port_info =
- &dev_priv->vbt.ddi_port_info[port];
struct intel_digital_port *intel_dig_port;
struct intel_encoder *encoder;
bool init_hdmi, init_dp, init_lspcon = false;
enum phy phy = intel_port_to_phy(dev_priv, port);
- init_hdmi = port_info->supports_dvi || port_info->supports_hdmi;
- init_dp = port_info->supports_dp;
+ init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) ||
+ intel_bios_port_supports_hdmi(dev_priv, port);
+ init_dp = intel_bios_port_supports_dp(dev_priv, port);
if (intel_bios_is_lspcon_present(dev_priv, port)) {
/*
@@ -4849,8 +4848,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
if (intel_phy_is_tc(dev_priv, phy)) {
- bool is_legacy = !port_info->supports_typec_usb &&
- !port_info->supports_tbt;
+ bool is_legacy =
+ !intel_bios_port_supports_typec_usb(dev_priv, port) &&
+ !intel_bios_port_supports_tbt(dev_priv, port);
intel_tc_port_init(intel_dig_port, is_legacy);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (6 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*() Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 15:12 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present() Jani Nikula
` (3 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Affects only two calls in output setup, and ddi init will check the
features in more fine grained way.
This will make future changes easier.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 4c69253739ec..70fb87e7afb6 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
const struct ddi_vbt_port_info *port_info =
&dev_priv->vbt.ddi_port_info[port];
- return port_info->supports_dp ||
- port_info->supports_dvi ||
- port_info->supports_hdmi;
+ return port_info->child;
}
/* FIXME maybe deal with port A as well? */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present()
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (7 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device Jani Nikula
@ 2020-01-17 14:29 ` Jani Nikula
2020-01-17 15:14 ` Ville Syrjälä
2020-01-17 23:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/bios: stop using vbt.ddi_port_info directly Patchwork
` (2 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 14:29 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Don't access i915->vbt.ddi_port_info[] directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_combo_phy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
index 44bbc7e74fc3..5f54aca7c36f 100644
--- a/drivers/gpu/drm/i915/display/intel_combo_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c
@@ -265,8 +265,8 @@ void intel_combo_phy_power_up_lanes(struct drm_i915_private *dev_priv,
static u32 ehl_combo_phy_a_mux(struct drm_i915_private *i915, u32 val)
{
- bool ddi_a_present = i915->vbt.ddi_port_info[PORT_A].child != NULL;
- bool ddi_d_present = i915->vbt.ddi_port_info[PORT_D].child != NULL;
+ bool ddi_a_present = intel_bios_is_port_present(i915, PORT_A);
+ bool ddi_d_present = intel_bios_is_port_present(i915, PORT_D);
bool dsi_present = intel_bios_is_dsi_present(i915, NULL);
/*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder()
2020-01-17 14:29 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Jani Nikula
@ 2020-01-17 14:43 ` Ville Syrjälä
0 siblings, 0 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 14:43 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 04:29:21PM +0200, Jani Nikula wrote:
> Don't access i915->vbt.ddi_port_info[] directly.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
> drivers/gpu/drm/i915/display/intel_bios.h | 1 +
> drivers/gpu/drm/i915/display/intel_hdmi.c | 9 ++++-----
> 3 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 9a891ef72118..b231fafc03ca 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -2562,3 +2562,10 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
>
> return aux_ch;
> }
> +
> +int intel_bios_max_tmds_clock(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> +
> + return i915->vbt.ddi_port_info[encoder->port].max_tmds_clock;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> index d6a0c29d37ac..519e983ee9e7 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.h
> +++ b/drivers/gpu/drm/i915/display/intel_bios.h
> @@ -247,5 +247,6 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port
> bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> int dsc_max_bpc);
> +int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
>
> #endif /* _INTEL_BIOS_H_ */
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 93ac0f296852..e8f8c87cd3e6 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2090,9 +2090,7 @@ static void pch_post_disable_hdmi(struct intel_encoder *encoder,
> static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - const struct ddi_vbt_port_info *info =
> - &dev_priv->vbt.ddi_port_info[encoder->port];
> - int max_tmds_clock;
> + int max_tmds_clock, vbt_max_tmds_clock;
>
> if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> max_tmds_clock = 594000;
> @@ -2103,8 +2101,9 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
> else
> max_tmds_clock = 165000;
>
> - if (info->max_tmds_clock)
> - max_tmds_clock = min(max_tmds_clock, info->max_tmds_clock);
> + vbt_max_tmds_clock = intel_bios_max_tmds_clock(encoder);
> + if (vbt_max_tmds_clock)
> + max_tmds_clock = min(max_tmds_clock, vbt_max_tmds_clock);
>
> return max_tmds_clock;
> }
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift()
2020-01-17 14:29 ` [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift() Jani Nikula
@ 2020-01-17 14:45 ` Ville Syrjälä
0 siblings, 0 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 14:45 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 04:29:22PM +0200, Jani Nikula wrote:
> Don't access i915->vbt.ddi_port_info[] directly.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 9 +++++++++
> drivers/gpu/drm/i915/display/intel_bios.h | 1 +
> drivers/gpu/drm/i915/display/intel_ddi.c | 14 ++++++--------
> 3 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index b231fafc03ca..50bff4e7d5c2 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -2569,3 +2569,12 @@ int intel_bios_max_tmds_clock(struct intel_encoder *encoder)
>
> return i915->vbt.ddi_port_info[encoder->port].max_tmds_clock;
> }
> +
> +int intel_bios_hdmi_level_shift(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + const struct ddi_vbt_port_info *info =
> + &i915->vbt.ddi_port_info[encoder->port];
> +
> + return info->hdmi_level_shift_set ? info->hdmi_level_shift : -1;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> index 519e983ee9e7..c6cc413bf8ec 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.h
> +++ b/drivers/gpu/drm/i915/display/intel_bios.h
> @@ -248,5 +248,6 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> int dsc_max_bpc);
> int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
> +int intel_bios_hdmi_level_shift(struct intel_encoder *encoder);
>
> #endif /* _INTEL_BIOS_H_ */
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 32ea3c7e8b62..cfaa64df9892 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -944,11 +944,11 @@ tgl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate,
> return tgl_combo_phy_ddi_translations_dp_hbr;
> }
>
> -static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port)
> +static int intel_ddi_hdmi_level(struct intel_encoder *encoder)
> {
> - struct ddi_vbt_port_info *port_info = &dev_priv->vbt.ddi_port_info[port];
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> int n_entries, level, default_entry;
> - enum phy phy = intel_port_to_phy(dev_priv, port);
> + enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>
> if (INTEL_GEN(dev_priv) >= 12) {
> if (intel_phy_is_combo(dev_priv, phy))
> @@ -987,9 +987,8 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por
> if (WARN_ON_ONCE(n_entries == 0))
> return 0;
>
> - if (port_info->hdmi_level_shift_set)
> - level = port_info->hdmi_level_shift;
> - else
> + level = intel_bios_hdmi_level_shift(encoder);
> + if (level < 0)
> level = default_entry;
>
> if (WARN_ON_ONCE(level >= n_entries))
> @@ -3665,8 +3664,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
> struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - enum port port = encoder->port;
> - int level = intel_ddi_hdmi_level(dev_priv, port);
> + int level = intel_ddi_hdmi_level(encoder);
> struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>
> intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*()
2020-01-17 14:29 ` [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*() Jani Nikula
@ 2020-01-17 15:10 ` Ville Syrjälä
0 siblings, 0 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:10 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 04:29:27PM +0200, Jani Nikula wrote:
> Don't access i915->vbt.ddi_port_info[] directly.
3-7
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 26 +++++++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_bios.h | 5 +++++
> drivers/gpu/drm/i915/display/intel_ddi.c | 12 +++++------
> 3 files changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 23cbbe32e22f..4c69253739ec 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -2606,3 +2606,29 @@ int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder)
>
> return i915->vbt.ddi_port_info[encoder->port].alternate_ddc_pin;
> }
> +
> +bool intel_bios_port_supports_dvi(struct drm_i915_private *i915, enum port port)
> +{
> + return i915->vbt.ddi_port_info[port].supports_dvi;
> +}
> +
> +bool intel_bios_port_supports_hdmi(struct drm_i915_private *i915, enum port port)
> +{
> + return i915->vbt.ddi_port_info[port].supports_hdmi;
> +}
> +
> +bool intel_bios_port_supports_dp(struct drm_i915_private *i915, enum port port)
> +{
> + return i915->vbt.ddi_port_info[port].supports_dp;
> +}
> +
> +bool intel_bios_port_supports_typec_usb(struct drm_i915_private *i915,
> + enum port port)
> +{
> + return i915->vbt.ddi_port_info[port].supports_typec_usb;
> +}
> +
> +bool intel_bios_port_supports_tbt(struct drm_i915_private *i915, enum port port)
> +{
> + return i915->vbt.ddi_port_info[port].supports_tbt;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> index 077828d77642..c17199caeff8 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.h
> +++ b/drivers/gpu/drm/i915/display/intel_bios.h
> @@ -253,5 +253,10 @@ int intel_bios_dp_boost_level(struct intel_encoder *encoder);
> int intel_bios_hdmi_boost_level(struct intel_encoder *encoder);
> int intel_bios_dp_max_link_rate(struct intel_encoder *encoder);
> int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder);
> +bool intel_bios_port_supports_dvi(struct drm_i915_private *i915, enum port port);
> +bool intel_bios_port_supports_hdmi(struct drm_i915_private *i915, enum port port);
> +bool intel_bios_port_supports_dp(struct drm_i915_private *i915, enum port port);
> +bool intel_bios_port_supports_typec_usb(struct drm_i915_private *i915, enum port port);
> +bool intel_bios_port_supports_tbt(struct drm_i915_private *i915, enum port port);
>
> #endif /* _INTEL_BIOS_H_ */
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 3697fa047362..18a8186699f9 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4780,15 +4780,14 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport)
>
> void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> {
> - struct ddi_vbt_port_info *port_info =
> - &dev_priv->vbt.ddi_port_info[port];
> struct intel_digital_port *intel_dig_port;
> struct intel_encoder *encoder;
> bool init_hdmi, init_dp, init_lspcon = false;
> enum phy phy = intel_port_to_phy(dev_priv, port);
>
> - init_hdmi = port_info->supports_dvi || port_info->supports_hdmi;
> - init_dp = port_info->supports_dp;
> + init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) ||
> + intel_bios_port_supports_hdmi(dev_priv, port);
> + init_dp = intel_bios_port_supports_dp(dev_priv, port);
>
> if (intel_bios_is_lspcon_present(dev_priv, port)) {
> /*
> @@ -4849,8 +4848,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
>
> if (intel_phy_is_tc(dev_priv, phy)) {
> - bool is_legacy = !port_info->supports_typec_usb &&
> - !port_info->supports_tbt;
> + bool is_legacy =
> + !intel_bios_port_supports_typec_usb(dev_priv, port) &&
> + !intel_bios_port_supports_tbt(dev_priv, port);
>
> intel_tc_port_init(intel_dig_port, is_legacy);
>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 14:29 ` [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device Jani Nikula
@ 2020-01-17 15:12 ` Ville Syrjälä
2020-01-17 15:13 ` Ville Syrjälä
0 siblings, 1 reply; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
> Affects only two calls in output setup, and ddi init will check the
> features in more fine grained way.
>
> This will make future changes easier.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 4c69253739ec..70fb87e7afb6 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
> const struct ddi_vbt_port_info *port_info =
> &dev_priv->vbt.ddi_port_info[port];
>
> - return port_info->supports_dp ||
> - port_info->supports_dvi ||
> - port_info->supports_hdmi;
> + return port_info->child;
Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
VBT... I guess those should not have their dvo port set to anything we
accept?
> }
>
> /* FIXME maybe deal with port A as well? */
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 15:12 ` Ville Syrjälä
@ 2020-01-17 15:13 ` Ville Syrjälä
2020-01-17 15:23 ` Ville Syrjälä
2020-01-17 15:28 ` Jani Nikula
0 siblings, 2 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:13 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 05:12:38PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
> > Affects only two calls in output setup, and ddi init will check the
> > features in more fine grained way.
> >
> > This will make future changes easier.
> >
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> > index 4c69253739ec..70fb87e7afb6 100644
> > --- a/drivers/gpu/drm/i915/display/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> > @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
> > const struct ddi_vbt_port_info *port_info =
> > &dev_priv->vbt.ddi_port_info[port];
> >
> > - return port_info->supports_dp ||
> > - port_info->supports_dvi ||
> > - port_info->supports_hdmi;
> > + return port_info->child;
>
> Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
> VBT... I guess those should not have their dvo port set to anything we
> accept?
Umm, no. We accept DVO_PORT_CRT as PORT_E.
>
> > }
> >
> > /* FIXME maybe deal with port A as well? */
> > --
> > 2.20.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present()
2020-01-17 14:29 ` [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present() Jani Nikula
@ 2020-01-17 15:14 ` Ville Syrjälä
0 siblings, 0 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 04:29:29PM +0200, Jani Nikula wrote:
> Don't access i915->vbt.ddi_port_info[] directly.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_combo_phy.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
> index 44bbc7e74fc3..5f54aca7c36f 100644
> --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c
> @@ -265,8 +265,8 @@ void intel_combo_phy_power_up_lanes(struct drm_i915_private *dev_priv,
>
> static u32 ehl_combo_phy_a_mux(struct drm_i915_private *i915, u32 val)
> {
> - bool ddi_a_present = i915->vbt.ddi_port_info[PORT_A].child != NULL;
> - bool ddi_d_present = i915->vbt.ddi_port_info[PORT_D].child != NULL;
> + bool ddi_a_present = intel_bios_is_port_present(i915, PORT_A);
> + bool ddi_d_present = intel_bios_is_port_present(i915, PORT_D);
> bool dsi_present = intel_bios_is_dsi_present(i915, NULL);
>
> /*
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 15:13 ` Ville Syrjälä
@ 2020-01-17 15:23 ` Ville Syrjälä
2020-01-17 15:28 ` Jani Nikula
1 sibling, 0 replies; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:23 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 05:13:25PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 17, 2020 at 05:12:38PM +0200, Ville Syrjälä wrote:
> > On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
> > > Affects only two calls in output setup, and ddi init will check the
> > > features in more fine grained way.
> > >
> > > This will make future changes easier.
> > >
> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > > ---
> > > drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
> > > 1 file changed, 1 insertion(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> > > index 4c69253739ec..70fb87e7afb6 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_bios.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> > > @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
> > > const struct ddi_vbt_port_info *port_info =
> > > &dev_priv->vbt.ddi_port_info[port];
> > >
> > > - return port_info->supports_dp ||
> > > - port_info->supports_dvi ||
> > > - port_info->supports_hdmi;
> > > + return port_info->child;
> >
> > Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
> > VBT... I guess those should not have their dvo port set to anything we
> > accept?
>
> Umm, no. We accept DVO_PORT_CRT as PORT_E.
Maybe it doesn't matter though. Hopefully no VBT has that on skl+,
and on hsw/bdw the current CRT init code doesn't seem to care
what this says.
>
> >
> > > }
> > >
> > > /* FIXME maybe deal with port A as well? */
> > > --
> > > 2.20.1
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> > --
> > Ville Syrjälä
> > Intel
>
> --
> Ville Syrjälä
> Intel
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 15:13 ` Ville Syrjälä
2020-01-17 15:23 ` Ville Syrjälä
@ 2020-01-17 15:28 ` Jani Nikula
2020-01-17 15:37 ` Ville Syrjälä
1 sibling, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2020-01-17 15:28 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Fri, 17 Jan 2020, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Jan 17, 2020 at 05:12:38PM +0200, Ville Syrjälä wrote:
>> On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
>> > Affects only two calls in output setup, and ddi init will check the
>> > features in more fine grained way.
>> >
>> > This will make future changes easier.
>> >
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> > ---
>> > drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
>> > 1 file changed, 1 insertion(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> > index 4c69253739ec..70fb87e7afb6 100644
>> > --- a/drivers/gpu/drm/i915/display/intel_bios.c
>> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
>> > @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
>> > const struct ddi_vbt_port_info *port_info =
>> > &dev_priv->vbt.ddi_port_info[port];
>> >
>> > - return port_info->supports_dp ||
>> > - port_info->supports_dvi ||
>> > - port_info->supports_hdmi;
>> > + return port_info->child;
>>
>> Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
>> VBT... I guess those should not have their dvo port set to anything we
>> accept?
>
> Umm, no. We accept DVO_PORT_CRT as PORT_E.
My argument is this:
- Shouldn't intel_bios_is_port_present(PORT_E) return true in that case?
- Where does the change make a functional difference in the
intel_bios_is_port_present() users anyway? AFAICT all the cases will
also check the supports_X flags anyway (or have checked before).
BR,
Jani.
>
>>
>> > }
>> >
>> > /* FIXME maybe deal with port A as well? */
>> > --
>> > 2.20.1
>> >
>> > _______________________________________________
>> > Intel-gfx mailing list
>> > Intel-gfx@lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>> --
>> Ville Syrjälä
>> Intel
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 15:28 ` Jani Nikula
@ 2020-01-17 15:37 ` Ville Syrjälä
2020-01-21 9:44 ` Jani Nikula
0 siblings, 1 reply; 23+ messages in thread
From: Ville Syrjälä @ 2020-01-17 15:37 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Jan 17, 2020 at 05:28:23PM +0200, Jani Nikula wrote:
> On Fri, 17 Jan 2020, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> > On Fri, Jan 17, 2020 at 05:12:38PM +0200, Ville Syrjälä wrote:
> >> On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
> >> > Affects only two calls in output setup, and ddi init will check the
> >> > features in more fine grained way.
> >> >
> >> > This will make future changes easier.
> >> >
> >> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> > ---
> >> > drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
> >> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> >> > index 4c69253739ec..70fb87e7afb6 100644
> >> > --- a/drivers/gpu/drm/i915/display/intel_bios.c
> >> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> >> > @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
> >> > const struct ddi_vbt_port_info *port_info =
> >> > &dev_priv->vbt.ddi_port_info[port];
> >> >
> >> > - return port_info->supports_dp ||
> >> > - port_info->supports_dvi ||
> >> > - port_info->supports_hdmi;
> >> > + return port_info->child;
> >>
> >> Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
> >> VBT... I guess those should not have their dvo port set to anything we
> >> accept?
> >
> > Umm, no. We accept DVO_PORT_CRT as PORT_E.
>
> My argument is this:
>
> - Shouldn't intel_bios_is_port_present(PORT_E) return true in that case?
Only on hsw/bdw really.
>
> - Where does the change make a functional difference in the
> intel_bios_is_port_present() users anyway? AFAICT all the cases will
> also check the supports_X flags anyway (or have checked before).
After some trawling I can't see anything that should break from this,
so probably fine. But the commit message should probably elaborate
on this a bit more, just in case there is a regression.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>
> BR,
> Jani.
>
>
> >
> >>
> >> > }
> >> >
> >> > /* FIXME maybe deal with port A as well? */
> >> > --
> >> > 2.20.1
> >> >
> >> > _______________________________________________
> >> > Intel-gfx mailing list
> >> > Intel-gfx@lists.freedesktop.org
> >> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >>
> >> --
> >> Ville Syrjälä
> >> Intel
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/bios: stop using vbt.ddi_port_info directly
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (8 preceding siblings ...)
2020-01-17 14:29 ` [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present() Jani Nikula
@ 2020-01-17 23:44 ` Patchwork
2020-01-17 23:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
2020-01-20 18:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
11 siblings, 0 replies; 23+ messages in thread
From: Patchwork @ 2020-01-17 23:44 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: stop using vbt.ddi_port_info directly
URL : https://patchwork.freedesktop.org/series/72190/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7768 -> Patchwork_16155
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/index.html
Known issues
------------
Here are the changes found in Patchwork_16155 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_close_race@basic-threads:
- fi-byt-n2820: [PASS][1] -> [TIMEOUT][2] ([fdo#112271] / [i915#816])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-byt-n2820/igt@gem_close_race@basic-threads.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-byt-n2820/igt@gem_close_race@basic-threads.html
* igt@gem_exec_suspend@basic-s3:
- fi-cml-s: [PASS][3] -> [DMESG-WARN][4] ([fdo#111764])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-cml-s/igt@gem_exec_suspend@basic-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-cml-s/igt@gem_exec_suspend@basic-s3.html
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6700k2: [PASS][5] -> [DMESG-WARN][6] ([i915#889])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-skl-6700k2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_rpm@module-reload:
- fi-kbl-guc: [PASS][7] -> [FAIL][8] ([i915#579])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_mman:
- fi-bxt-dsi: [PASS][9] -> [DMESG-WARN][10] ([i915#889]) +23 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-bxt-dsi/igt@i915_selftest@live_mman.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-bxt-dsi/igt@i915_selftest@live_mman.html
* igt@i915_selftest@live_reset:
- fi-bxt-dsi: [PASS][11] -> [DMESG-FAIL][12] ([i915#889]) +7 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-bxt-dsi/igt@i915_selftest@live_reset.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-bxt-dsi/igt@i915_selftest@live_reset.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [PASS][13] -> [FAIL][14] ([fdo#109635])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
#### Possible fixes ####
* igt@gem_close_race@basic-threads:
- fi-byt-j1900: [TIMEOUT][15] ([fdo#112271] / [i915#816]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-byt-j1900/igt@gem_close_race@basic-threads.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-byt-j1900/igt@gem_close_race@basic-threads.html
* igt@gem_exec_suspend@basic-s0:
- fi-cml-s: [FAIL][17] ([fdo#103375]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-cml-s/igt@gem_exec_suspend@basic-s0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-cml-s/igt@gem_exec_suspend@basic-s0.html
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [DMESG-WARN][19] ([i915#889]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-skl-6770hq/igt@i915_module_load@reload-with-fault-injection.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-skl-6770hq/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [INCOMPLETE][21] ([i915#151]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_blt:
- fi-ivb-3770: [DMESG-FAIL][23] ([i915#563]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/fi-ivb-3770/igt@i915_selftest@live_blt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/fi-ivb-3770/igt@i915_selftest@live_blt.html
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#151]: https://gitlab.freedesktop.org/drm/intel/issues/151
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
[i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889
Participating hosts (47 -> 38)
------------------------------
Additional (2): fi-hsw-4770r fi-hsw-4770
Missing (11): fi-kbl-soraka fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ilk-650 fi-kbl-7500u fi-gdg-551 fi-skl-lmem fi-blb-e6850 fi-byt-clapper fi-snb-2600
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7768 -> Patchwork_16155
CI-20190529: 20190529
CI_DRM_7768: 7db45c7ebc9f6ce2c31c543f26ebdb385a7a52a0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5372: 0d00a27fbbd4d4a77d24499ea9811e07e65eb0ac @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16155: 4f5452230c5fe14e7e8b3aa38bd77009ad6c12bc @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/Patchwork_16155/build_32bit.log
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 122 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
scripts/Makefile.modpost:93: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1
Makefile:1282: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
4f5452230c5f drm/i915: use intel_bios_is_port_present()
b398cb09f8f7 drm/i915/bios: check port presence based on child device
3d64cfc44cff drm/i915/bios: add intel_bios_port_supports_*()
e23ef1fe6721 drm/i915/bios: add intel_bios_alternate_ddc_pin()
f2a2e324ae62 drm/i915/bios: add intel_bios_dp_max_link_rate()
d9346f6331a2 drm/i915/bios: intel_bios_hdmi_boost_level()
753306c79f99 drm/i915/bios: intel_bios_dp_boost_level()
6d3530d67b2f drm/i915/bios: add intel_bios_hdmi_level_shift()
11fb4f0453ef drm/i915/bios: add intel_bios_max_tmds_encoder()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: warning for drm/i915/bios: stop using vbt.ddi_port_info directly
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (9 preceding siblings ...)
2020-01-17 23:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/bios: stop using vbt.ddi_port_info directly Patchwork
@ 2020-01-17 23:44 ` Patchwork
2020-01-20 18:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
11 siblings, 0 replies; 23+ messages in thread
From: Patchwork @ 2020-01-17 23:44 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: stop using vbt.ddi_port_info directly
URL : https://patchwork.freedesktop.org/series/72190/
State : warning
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 122 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
scripts/Makefile.modpost:93: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1
Makefile:1282: recipe for target 'modules' failed
make: *** [modules] Error 2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/build_32bit.log
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/bios: stop using vbt.ddi_port_info directly
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
` (10 preceding siblings ...)
2020-01-17 23:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
@ 2020-01-20 18:33 ` Patchwork
11 siblings, 0 replies; 23+ messages in thread
From: Patchwork @ 2020-01-20 18:33 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: stop using vbt.ddi_port_info directly
URL : https://patchwork.freedesktop.org/series/72190/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7768_full -> Patchwork_16155_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16155_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@bcs0-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#180])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-apl1/igt@gem_ctx_isolation@bcs0-s3.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-apl1/igt@gem_ctx_isolation@bcs0-s3.html
* igt@gem_ctx_persistence@vcs1-mixed:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [fdo#112080]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@gem_ctx_persistence@vcs1-mixed.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@gem_ctx_persistence@vcs1-mixed.html
* igt@gem_eio@unwedge-stress:
- shard-snb: [PASS][5] -> [FAIL][6] ([i915#232])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-snb5/igt@gem_eio@unwedge-stress.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-snb2/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#110854])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@gem_exec_balancer@smoke.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_schedule@pi-userfault-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([i915#677])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb8/igt@gem_exec_schedule@pi-userfault-bsd.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb2/igt@gem_exec_schedule@pi-userfault-bsd.html
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#112146]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb6/igt@gem_exec_schedule@reorder-wide-bsd.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb4/igt@gem_exec_schedule@reorder-wide-bsd.html
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +8 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl4/igt@gem_exec_suspend@basic-s3.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl1/igt@gem_exec_suspend@basic-s3.html
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-apl: [PASS][15] -> [INCOMPLETE][16] ([fdo#103927] / [i915#530])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-apl7/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-apl3/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive:
- shard-kbl: [PASS][17] -> [TIMEOUT][18] ([fdo#112271] / [i915#530])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl7/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl4/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-kbl: [PASS][19] -> [INCOMPLETE][20] ([fdo#103665] / [i915#530]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl7/igt@gem_persistent_relocs@forked-thrashing.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl2/igt@gem_persistent_relocs@forked-thrashing.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#644])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk7/igt@gem_ppgtt@flink-and-close-vma-leak.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk3/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][23] -> [DMESG-WARN][24] ([i915#716])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl7/igt@gen9_exec_parse@allowed-single.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl2/igt@gen9_exec_parse@allowed-single.html
* igt@kms_color@pipe-b-ctm-0-75:
- shard-skl: [PASS][25] -> [DMESG-WARN][26] ([i915#109])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl10/igt@kms_color@pipe-b-ctm-0-75.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl5/igt@kms_color@pipe-b-ctm-0-75.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: [PASS][27] -> [FAIL][28] ([i915#79])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk9/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [PASS][29] -> [INCOMPLETE][30] ([i915#221])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl7/igt@kms_flip@flip-vs-suspend-interruptible.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl4/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: [PASS][31] -> [FAIL][32] ([i915#34])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl2/igt@kms_flip@plain-flip-fb-recreate.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl8/igt@kms_flip@plain-flip-fb-recreate.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109642] / [fdo#111068]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][35] -> [SKIP][36] ([fdo#109441]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@kms_psr@psr2_no_drrs.html
* igt@perf_pmu@busy-vcs1:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#112080]) +10 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@perf_pmu@busy-vcs1.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb6/igt@perf_pmu@busy-vcs1.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][39] -> [SKIP][40] ([fdo#109276]) +24 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb1/igt@prime_busy@hang-bsd2.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb6/igt@prime_busy@hang-bsd2.html
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][41] ([i915#180]) -> [PASS][42] +5 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl2/igt@gem_ctx_isolation@rcs0-s3.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl4/igt@gem_ctx_isolation@rcs0-s3.html
* igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [SKIP][43] ([fdo#109276] / [fdo#112080]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb8/igt@gem_ctx_persistence@vcs1-mixed-process.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb2/igt@gem_ctx_persistence@vcs1-mixed-process.html
* igt@gem_eio@reset-stress:
- shard-snb: [FAIL][45] ([i915#232]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-snb1/igt@gem_eio@reset-stress.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-snb5/igt@gem_eio@reset-stress.html
* igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [SKIP][47] ([fdo#112146]) -> [PASS][48] +8 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb1/igt@gem_exec_async@concurrent-writes-bsd.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb6/igt@gem_exec_async@concurrent-writes-bsd.html
* igt@gem_exec_balancer@hang:
- shard-iclb: [INCOMPLETE][49] ([i915#140]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb1/igt@gem_exec_balancer@hang.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@gem_exec_balancer@hang.html
* igt@gem_exec_schedule@out-order-bsd2:
- shard-iclb: [SKIP][51] ([fdo#109276]) -> [PASS][52] +19 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb8/igt@gem_exec_schedule@out-order-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb2/igt@gem_exec_schedule@out-order-bsd2.html
* igt@gem_exec_schedule@pi-shared-iova-bsd:
- shard-iclb: [SKIP][53] ([i915#677]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@gem_exec_schedule@pi-shared-iova-bsd.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb8/igt@gem_exec_schedule@pi-shared-iova-bsd.html
* igt@gem_persistent_relocs@forked-interruptible-thrash-inactive:
- shard-kbl: [TIMEOUT][55] ([fdo#112271] / [i915#530]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl6/igt@gem_persistent_relocs@forked-interruptible-thrash-inactive.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl4/igt@gem_persistent_relocs@forked-interruptible-thrash-inactive.html
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-skl: [TIMEOUT][57] ([fdo#112271] / [i915#530]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl4/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl9/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
- shard-apl: [TIMEOUT][59] ([fdo#112271] / [i915#530]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-apl2/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-apl2/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [DMESG-WARN][61] ([i915#716]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk2/igt@gen9_exec_parse@allowed-single.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk9/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_rpm@system-suspend:
- shard-kbl: [INCOMPLETE][63] ([fdo#103665] / [i915#151]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-kbl2/igt@i915_pm_rpm@system-suspend.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-kbl7/igt@i915_pm_rpm@system-suspend.html
* igt@i915_suspend@fence-restore-untiled:
- shard-skl: [INCOMPLETE][65] ([i915#69]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl6/igt@i915_suspend@fence-restore-untiled.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl6/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [FAIL][67] ([i915#72]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk9/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk8/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_flip@2x-plain-flip-ts-check:
- shard-glk: [FAIL][69] ([i915#34]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk7/igt@kms_flip@2x-plain-flip-ts-check.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk3/igt@kms_flip@2x-plain-flip-ts-check.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][71] ([i915#79]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl3/igt@kms_flip@flip-vs-expired-vblank.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl4/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [DMESG-WARN][73] ([i915#180]) -> [PASS][74] +3 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][75] ([fdo#108145] / [i915#265]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_plane_scaling@pipe-b-scaler-with-rotation:
- shard-glk: [DMESG-WARN][77] ([i915#118] / [i915#95]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk4/igt@kms_plane_scaling@pipe-b-scaler-with-rotation.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk2/igt@kms_plane_scaling@pipe-b-scaler-with-rotation.html
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [SKIP][79] ([fdo#109441]) -> [PASS][80] +2 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb8/igt@kms_psr@psr2_cursor_blt.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][81] ([i915#31]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-apl8/igt@kms_setmode@basic.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-apl6/igt@kms_setmode@basic.html
* igt@perf_pmu@busy-check-all-vcs1:
- shard-iclb: [SKIP][83] ([fdo#112080]) -> [PASS][84] +13 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb6/igt@perf_pmu@busy-check-all-vcs1.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb1/igt@perf_pmu@busy-check-all-vcs1.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][85] ([IGT#28]) -> [SKIP][86] ([fdo#109276] / [fdo#112080])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-iclb6/igt@gem_ctx_isolation@vcs1-nonpriv.html
* igt@gem_tiled_blits@normal:
- shard-hsw: [FAIL][87] ([i915#818]) -> [FAIL][88] ([i915#694])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-hsw2/igt@gem_tiled_blits@normal.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-hsw7/igt@gem_tiled_blits@normal.html
* igt@runner@aborted:
- shard-glk: [FAIL][89] ([k.org#202321]) -> ([FAIL][90], [FAIL][91]) ([i915#997] / [k.org#202321])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7768/shard-glk2/igt@runner@aborted.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk2/igt@runner@aborted.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16155/shard-glk2/igt@runner@aborted.html
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#140]: https://gitlab.freedesktop.org/drm/intel/issues/140
[i915#151]: https://gitlab.freedesktop.org/drm/intel/issues/151
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#232]: https://gitlab.freedesktop.org/drm/intel/issues/232
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#530]: https://gitlab.freedesktop.org/drm/intel/issues/530
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#997]: https://gitlab.freedesktop.org/drm/intel/issues/997
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7768 -> Patchwork_16155
CI-20190529: 20190529
CI_DRM_7768: 7db45c7ebc9f6ce2c31c543f26ebdb385a7a52a0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5372: 0d00a27fbbd4d4a77d24499ea9811e07e65eb0ac @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16155: 4f5452230c5fe14e7e8b3aa38bd77009ad6c12bc @ 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_16155/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device
2020-01-17 15:37 ` Ville Syrjälä
@ 2020-01-21 9:44 ` Jani Nikula
0 siblings, 0 replies; 23+ messages in thread
From: Jani Nikula @ 2020-01-21 9:44 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Fri, 17 Jan 2020, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Jan 17, 2020 at 05:28:23PM +0200, Jani Nikula wrote:
>> On Fri, 17 Jan 2020, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
>> > On Fri, Jan 17, 2020 at 05:12:38PM +0200, Ville Syrjälä wrote:
>> >> On Fri, Jan 17, 2020 at 04:29:28PM +0200, Jani Nikula wrote:
>> >> > Affects only two calls in output setup, and ddi init will check the
>> >> > features in more fine grained way.
>> >> >
>> >> > This will make future changes easier.
>> >> >
>> >> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> >> > ---
>> >> > drivers/gpu/drm/i915/display/intel_bios.c | 4 +---
>> >> > 1 file changed, 1 insertion(+), 3 deletions(-)
>> >> >
>> >> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> >> > index 4c69253739ec..70fb87e7afb6 100644
>> >> > --- a/drivers/gpu/drm/i915/display/intel_bios.c
>> >> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
>> >> > @@ -2236,9 +2236,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
>> >> > const struct ddi_vbt_port_info *port_info =
>> >> > &dev_priv->vbt.ddi_port_info[port];
>> >> >
>> >> > - return port_info->supports_dp ||
>> >> > - port_info->supports_dvi ||
>> >> > - port_info->supports_hdmi;
>> >> > + return port_info->child;
>> >>
>> >> Pondering what happens if there's a non-DP/DVI/HDMI port declared in the
>> >> VBT... I guess those should not have their dvo port set to anything we
>> >> accept?
>> >
>> > Umm, no. We accept DVO_PORT_CRT as PORT_E.
>>
>> My argument is this:
>>
>> - Shouldn't intel_bios_is_port_present(PORT_E) return true in that case?
>
> Only on hsw/bdw really.
>
>>
>> - Where does the change make a functional difference in the
>> intel_bios_is_port_present() users anyway? AFAICT all the cases will
>> also check the supports_X flags anyway (or have checked before).
>
> After some trawling I can't see anything that should break from this,
> so probably fine. But the commit message should probably elaborate
> on this a bit more, just in case there is a regression.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for all the reviews! Expanded on the commit message on this one,
and pushed the lot.
BR,
Jani.
>
>>
>>
>> BR,
>> Jani.
>>
>>
>> >
>> >>
>> >> > }
>> >> >
>> >> > /* FIXME maybe deal with port A as well? */
>> >> > --
>> >> > 2.20.1
>> >> >
>> >> > _______________________________________________
>> >> > Intel-gfx mailing list
>> >> > Intel-gfx@lists.freedesktop.org
>> >> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> >>
>> >> --
>> >> Ville Syrjälä
>> >> Intel
>>
>> --
>> Jani Nikula, Intel Open Source Graphics Center
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2020-01-21 9:44 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Jani Nikula
2020-01-17 14:43 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift() Jani Nikula
2020-01-17 14:45 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 3/9] drm/i915/bios: intel_bios_dp_boost_level() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 4/9] drm/i915/bios: intel_bios_hdmi_boost_level() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 5/9] drm/i915/bios: add intel_bios_dp_max_link_rate() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 6/9] drm/i915/bios: add intel_bios_alternate_ddc_pin() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*() Jani Nikula
2020-01-17 15:10 ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device Jani Nikula
2020-01-17 15:12 ` Ville Syrjälä
2020-01-17 15:13 ` Ville Syrjälä
2020-01-17 15:23 ` Ville Syrjälä
2020-01-17 15:28 ` Jani Nikula
2020-01-17 15:37 ` Ville Syrjälä
2020-01-21 9:44 ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present() Jani Nikula
2020-01-17 15:14 ` Ville Syrjälä
2020-01-17 23:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/bios: stop using vbt.ddi_port_info directly Patchwork
2020-01-17 23:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
2020-01-20 18:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).