drm/i915: Introduce intel_crtc_state_alloc()
Subsystems (3)
PATCH v5 1/7 drm/i915: Introduce intel_crtc_state_alloc()
From: Ville Syrjälä <[email protected]>
We have several places where we want to allocate a pristine crtc state. Some of those currently call intel_crtc_state_reset() to properly initialize all the non-zero defaults in the state, but some places do not. Let's add intel_crtc_state_alloc() to do both the alloc and the reset, and call that everywhere we need a fresh crtc state.
--- drivers/gpu/drm/i915/display/intel_display.c | 30 +++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +19 -11
@@ -168,6 +168,7 @@ static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state);static void ironlake_pfit_enable (const struct intel_crtc_state *crtc_state);static void intel_modeset_setup_hw_state (struct drm_device *dev,struct drm_modeset_acquire_ctx *ctx); +static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc); struct intel_limit { struct {
@@ -8051,11 +8052,10 @@ int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,struct intel_crtc *crtc =intel_get_crtc_for_pipe (dev_priv, pipe);struct intel_crtc_state *pipe_config; - pipe_config =kzalloc (sizeof (*pipe_config),GFP_KERNEL ); + pipe_config =intel_crtc_state_alloc (crtc);if (!pipe_config)return -ENOMEM ; - pipe_config->uapi.crtc = &crtc->base; pipe_config->cpu_transcoder = (enum transcoder )pipe; pipe_config->pixel_multiplier =1 ; pipe_config->dpll = *dpll;
@@ -11646,6 +11646,18 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->scaler_state.scaler_id =-1 ; } +static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc) +{ +struct intel_crtc_state *crtc_state; + + crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); + +if (crtc_state) +intel_crtc_state_reset (crtc_state, crtc); + +return crtc_state; +} +/* Returns the currently programmed mode of the given encoder. */ struct drm_display_mode *intel_encoder_current_mode (struct intel_encoder *encoder)
@@ -11665,14 +11677,12 @@ intel_encoder_current_mode(struct intel_encoder *encoder)if (!mode)return NULL ; - crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =intel_crtc_state_alloc (crtc);if (!crtc_state) {kfree (mode);return NULL ; } -intel_crtc_state_reset (crtc_state, crtc); -if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) {kfree (crtc_state);kfree (mode);
@@ -12609,11 +12619,11 @@ static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_statestatic int intel_crtc_prepare_cleared_state (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv = -to_i915 (crtc_state->uapi.crtc->dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_crtc_state *saved_state; - saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL ); + saved_state =intel_crtc_state_alloc (crtc);if (!saved_state)return -ENOMEM ;
@@ -15734,14 +15744,12 @@ static struct intel_crtc *intel_crtc_alloc(void)if (!crtc)return ERR_PTR (-ENOMEM ); - crtc_state =kzalloc (sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =intel_crtc_state_alloc (crtc);if (!crtc_state) {kfree (crtc);return ERR_PTR (-ENOMEM ); } -intel_crtc_state_reset (crtc_state, crtc); - crtc->base.state = &crtc_state->uapi; crtc->config = crtc_state;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 2/7 drm/i915/display: Share intel_connector_needs_modeset()
intel_connector_needs_modeset() will be used outside of intel_display.c in a future patch so it would only be necessary to remove the state and add the prototype to the header file.
But while at it, I simplified the arguments and moved it to a better place intel_atomic.c.
No behavior changes intended here.
v3:
- removed digital from exported version of intel_connector_needs_modeset
- rollback connector to drm type
v4:
- Renamed new_connector_state to new_conn_state
- Going back to drm_connector_state in intel_encoders_update_prepare/complete as we also have intel_tv_connector_state
--- drivers/gpu/drm/i915/display/intel_atomic.c | 18 ++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 45 ++++++-------------- 3 files changed, 34 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +18 -0
@@ -174,6 +174,24 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)return &state->base; } +/** +* intel_connector_needs_modeset - check if connector needs a modeset +*/ +bool +intel_connector_needs_modeset (struct intel_atomic_state *state, +struct drm_connector *connector) +{ +const struct drm_connector_state *old_conn_state, *new_conn_state; + + old_conn_state =drm_atomic_get_old_connector_state (&state->base, connector); + new_conn_state =drm_atomic_get_new_connector_state (&state->base, connector); + +return old_conn_state->crtc != new_conn_state->crtc || + (new_conn_state->crtc && +drm_atomic_crtc_needs_modeset (drm_atomic_get_new_crtc_state (&state->base, + new_conn_state->crtc))); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc
drivers/gpu/drm/i915/display/intel_atomic.h +2 -0
@@ -32,6 +32,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, struct drm_atomic_state *state);struct drm_connector_state *intel_digital_connector_duplicate_state (struct drm_connector *connector); +bool intel_connector_needs_modeset (struct intel_atomic_state *state, +struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc); void intel_crtc_destroy_state(struct drm_crtc *crtc,
drivers/gpu/drm/i915/display/intel_display.c +14 -31
75 lines not on this page · raw message
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 2/7] drm/i915/display: Share intel_connector_needs_modeset()
Quoted 19 lines · José Roberto de Souza
intel_connector_needs_modeset()will be used outside ofintel_display.cin a future patch so it would only be necessary to remove the state and add the prototype to the header file.But while at it, I simplified the arguments and moved it to a better place
intel_atomic.c.No behavior changes intended here.
v3:
- removed digital from exported version ofintel_connector_needs_modeset
- rollback connector to drm typev4:
- Renamednew_connector_statetonew_conn_state
- Going back todrm_connector_statein intel_encoders_update_prepare/complete as we also haveintel_tv_connector_state
Quoted 4 lines
Reviewed-by Ville Syrjälä <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>
Quoted 131 lines
--- drivers/gpu/drm/i915/display/intel_atomic.c | 18 ++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 45 ++++++-------------- 3 files changed, 34 insertions(+), 31 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +18
-0@@ -174,6 +174,24 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)return &state->base; } +/** +* intel_connector_needs_modeset - check if connector needs a modeset +*/ +bool +intel_connector_needs_modeset (struct intel_atomic_state *state, +struct drm_connector *connector) +{ +const struct drm_connector_state *old_conn_state, *new_conn_state; + + old_conn_state =drm_atomic_get_old_connector_state (&state->base, connector); + new_conn_state =drm_atomic_get_new_connector_state (&state->base, connector); + +return old_conn_state->crtc != new_conn_state->crtc || + (new_conn_state->crtc && +drm_atomic_crtc_needs_modeset (drm_atomic_get_new_crtc_state (&state->base, + new_conn_state->crtc))); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -32,6 +32,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, struct drm_atomic_state *state);struct drm_connector_state *intel_digital_connector_duplicate_state (struct drm_connector *connector); +bool intel_connector_needs_modeset (struct intel_atomic_state *state, +struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc); void intel_crtc_destroy_state(struct drm_crtc *crtc,drivers/gpu/drm/i915/display/intel_display.c +14
-31@@ -6166,39 +6166,23 @@ intel_connector_primary_encoder(struct intel_connector *connector)return encoder; } -static bool -intel_connector_needs_modeset (struct intel_atomic_state *state, -const struct drm_connector_state *old_conn_state, -const struct drm_connector_state *new_conn_state) -{ -struct intel_crtc *old_crtc = old_conn_state->crtc ? -to_intel_crtc (old_conn_state->crtc) :NULL ; -struct intel_crtc *new_crtc = new_conn_state->crtc ? -to_intel_crtc (new_conn_state->crtc) :NULL ; - -return new_crtc != old_crtc || - (new_crtc && -needs_modeset (intel_atomic_get_new_crtc_state (state, new_crtc))); -} -static void intel_encoders_update_prepare (struct intel_atomic_state *state) { -struct drm_connector_state *old_conn_state;struct drm_connector_state *new_conn_state; -struct drm_connector *conn; +struct drm_connector *connector;int i; -for_each_oldnew_connector_in_state (&state->base, conn, - old_conn_state, new_conn_state, i) { +for_each_new_connector_in_state (&state->base, connector, new_conn_state, + i) { +struct intel_connector *intel_connector;struct intel_encoder *encoder;struct intel_crtc *crtc; -if (!intel_connector_needs_modeset (state, - old_conn_state, - new_conn_state)) +if (!intel_connector_needs_modeset (state, connector))continue ; - encoder =intel_connector_primary_encoder (to_intel_connector (conn)); + intel_connector =to_intel_connector (connector); + encoder =intel_connector_primary_encoder (intel_connector);if (!encoder->update_prepare)continue ;@@ -6210,22 +6194,21 @@ static void intel_encoders_update_prepare(struct intel_atomic_state *state)static void intel_encoders_update_complete (struct intel_atomic_state *state) { -struct drm_connector_state *old_conn_state;struct drm_connector_state *new_conn_state; -struct drm_connector *conn; +struct drm_connector *connector;int i; -for_each_oldnew_connector_in_state (&state->base, conn, - old_conn_state, new_conn_state, i) { +for_each_new_connector_in_state (&state->base, connector, new_conn_state, + i) { +struct intel_connector *intel_connector;struct intel_encoder *encoder;struct intel_crtc *crtc; -if (!intel_connector_needs_modeset (state, - old_conn_state, - new_conn_state)) +if (!intel_connector_needs_modeset (state, connector))continue ; - encoder =intel_connector_primary_encoder (to_intel_connector (conn)); + intel_connector =to_intel_connector (connector); + encoder =intel_connector_primary_encoder (intel_connector);if (!encoder->update_complete)continue ;Signature · 1 line
2.24.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 3/7 drm/i915/tgl: Select master transcoder for MST stream
In reply to José Roberto de SouzaOn TGL the blending of all the streams have moved from DDI to transcoder, so now every transcoder working over the same MST port must send its stream to a master transcoder and master will send to DDI respecting the time slots.
So here adding all the CRTCs that shares the same MST stream if needed and computing their state again, it will pick the lowest pipe/transcoder among the ones in the same stream to be master.
Most of the time skl_commit_modeset_enables() enables pipes in a crescent order but due DDB overlapping it might not happen, this scenarios will be handled in the next patch.
v2:
- Using recently added intel_crtc_state_reset() to set mst_master_transcoder to invalid transcoder for all non gen12 & MST code paths
- Setting lowest pipe/transcoder as master, previously it was the first one but setting a predictable one will help in future MST e port sync integration
- Moving to intel type as much as we can
v3:
- Now intel_dp_mst_master_trans_compute() returns the MST master transcoder
- Replaced stdbool.h by linux/types.h
- Skip the connector being checked in intel_dp_mst_atomic_master_trans_check()
- Using pipe instead of transcoder to compute MST master
v4:
- renamed connector_state to conn_state
v5:
- Improved the parameters of intel_dp_mst_master_trans_compute() to simply code
- Added call drm_atomic_add_affected_planes() in intel_dp_mst_atomic_master_trans_check() as helper could not do it for us
- Removed "if (ret)" left over from v3 changes
BSpec: 50493
BSpec: 49190
--- drivers/gpu/drm/i915/display/intel_atomic.c | 14 ++ drivers/gpu/drm/i915/display/intel_atomic.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + 7 files changed, 179 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +14 -0
@@ -192,6 +192,20 @@ intel_connector_needs_modeset(struct intel_atomic_state *state, new_conn_state->crtc))); } +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, +struct intel_connector *connector) +{ +struct drm_connector_state *conn_state; + + conn_state =drm_atomic_get_connector_state (&state->base, + &connector->base); +if (IS_ERR (conn_state)) +return ERR_CAST (conn_state); + +return to_intel_digital_connector_state (conn_state); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc
drivers/gpu/drm/i915/display/intel_atomic.h +4 -0
@@ -17,6 +17,7 @@ struct drm_device;struct drm_i915_private ;struct drm_property ;struct intel_atomic_state ; +struct intel_connector ;struct intel_crtc ;struct intel_crtc_state ;
@@ -34,6 +35,9 @@ struct drm_connector_state * intel_digital_connector_duplicate_state(struct drm_connector *connector);bool intel_connector_needs_modeset (struct intel_atomic_state *state,struct drm_connector *connector); +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, +struct intel_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc); void intel_crtc_destroy_state(struct drm_crtc *crtc,
drivers/gpu/drm/i915/display/intel_ddi.c +12 -2
@@ -1899,8 +1899,13 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state) temp |=TRANS_DDI_MODE_SELECT_DP_MST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count); -if (INTEL_GEN (dev_priv) >=12 ) - temp |=TRANS_DDI_MST_TRANSPORT_SELECT (crtc_state->cpu_transcoder); +if (INTEL_GEN (dev_priv) >=12 ) { +enum transcoder master; + + master = crtc_state->mst_master_transcoder; +WARN_ON (master ==INVALID_TRANSCODER ); + temp |=TRANS_DDI_MST_TRANSPORT_SELECT (master); + } }else { temp |=TRANS_DDI_MODE_SELECT_DP_SST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count);
@@ -4405,6 +4410,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; + +if (INTEL_GEN (dev_priv) >=12 ) + pipe_config->mst_master_transcoder = +REG_FIELD_GET (TRANS_DDI_MST_TRANSPORT_SELECT_MASK , temp); +intel_dp_get_m_n (intel_crtc, pipe_config);break ;default :
drivers/gpu/drm/i915/display/intel_display.c +10 -2
@@ -46,6 +46,7 @@#include "display/intel_crt.h" #include "display/intel_ddi.h" #include "display/intel_dp.h" +#include "display/intel_dp_mst.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h"
@@ -11627,6 +11628,7 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->hsw_workaround_pipe =INVALID_PIPE ; crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; }static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc)
@@ -12484,6 +12486,9 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, pipe_config->csc_mode, pipe_config->gamma_mode, pipe_config->gamma_enable, pipe_config->csc_enable); +DRM_DEBUG_KMS ("MST master transcoder: %s\n" , +transcoder_name (pipe_config->mst_master_transcoder)); + dump_planes:if (!state)return ;
@@ -13264,6 +13269,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_I (dsc.dsc_split);PIPE_CONF_CHECK_I (dsc.compressed_bpp); +PIPE_CONF_CHECK_I (mst_master_transcoder); +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef PIPE_CONF_CHECK_BOOL
@@ -14348,7 +14355,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)u32 handled =0 ;int i; -/* Only disable port sync slaves */ +/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {if (!needs_modeset (new_crtc_state))
@@ -14362,7 +14369,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)* slave CRTCs are disabled first and then master CRTC since * Slave vblanks are masked till Master Vblanks. */ -if (!is_trans_port_sync_slave (old_crtc_state)) +if (!is_trans_port_sync_slave (old_crtc_state) && + !intel_dp_mst_is_slave_trans (old_crtc_state))continue ;intel_pre_plane_update (state, crtc);
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -1054,6 +1054,9 @@ struct intel_crtc_state {/* Bitmask to indicate slaves attached */ u8 sync_mode_slaves_mask; + +/* Only valid on TGL+ */ +enum transcoder mst_master_transcoder; };struct intel_crtc {
drivers/gpu/drm/i915/display/intel_dp_mst.c +131 -9
199 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp_mst.h +5 -0
@@ -6,10 +6,15 @@#ifndef __INTEL_DP_MST_H__#define __INTEL_DP_MST_H__ +#include <linux/types.h> +struct intel_digital_port ; +struct intel_crtc_state ;int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_id);void intel_dp_mst_encoder_cleanup (struct intel_digital_port *intel_dig_port);int intel_dp_mst_encoder_active_links (struct intel_digital_port *intel_dig_port); +bool intel_dp_mst_is_master_trans (const struct intel_crtc_state *crtc_state); +bool intel_dp_mst_is_slave_trans (const struct intel_crtc_state *crtc_state);#endif /* __INTEL_DP_MST_H__ */
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 3/7] drm/i915/tgl: Select master transcoder for MST stream
Quoted 241 lines · José Roberto de Souza
On TGL the blending of all the streams have moved from DDI to transcoder, so now every transcoder working over the same MST port must send its stream to a master transcoder and master will send to DDI respecting the time slots.
So here adding all the CRTCs that shares the same MST stream if needed and computing their state again, it will pick the lowest pipe/transcoder among the ones in the same stream to be master.
Most of the time
skl_commit_modeset_enables()enables pipes in a crescent order but due DDB overlapping it might not happen, this scenarios will be handled in the next patch.v2:
- Using recently addedintel_crtc_state_reset()to setmst_master_transcoderto invalid transcoder for all non gen12 & MST code paths
- Setting lowest pipe/transcoder as master, previously it was the first one but setting a predictable one will help in future MST e port sync integration
- Moving to intel type as much as we canv3:
- Nowintel_dp_mst_master_trans_compute()returns the MST master transcoder
- Replacedstdbool.hbylinux/types.h
- Skip the connector being checked inintel_dp_mst_atomic_master_trans_check()
- Using pipe instead of transcoder to compute MST masterv4:
- renamedconnector_statetoconn_statev5:
- Improved the parameters ofintel_dp_mst_master_trans_compute()to simply code
- Added calldrm_atomic_add_affected_planes()inintel_dp_mst_atomic_master_trans_check()as helper could not do it for us
- Removed "if (ret)" left over from v3 changesBSpec: 50493
BSpec: 49190Cc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 14 ++ drivers/gpu/drm/i915/display/intel_atomic.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + 7 files changed, 179 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +14
-0@@ -192,6 +192,20 @@ intel_connector_needs_modeset(struct intel_atomic_state *state, new_conn_state->crtc))); } +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, +struct intel_connector *connector) +{ +struct drm_connector_state *conn_state; + + conn_state =drm_atomic_get_connector_state (&state->base, + &connector->base); +if (IS_ERR (conn_state)) +return ERR_CAST (conn_state); + +return to_intel_digital_connector_state (conn_state); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc drivers/gpu/drm/i915/display/intel_atomic.h +4
-0@@ -17,6 +17,7 @@ struct drm_device;struct drm_i915_private ;struct drm_property ;struct intel_atomic_state ; +struct intel_connector ;struct intel_crtc ;struct intel_crtc_state ;@@ -34,6 +35,9 @@ struct drm_connector_state * intel_digital_connector_duplicate_state(struct drm_connector *connector);bool intel_connector_needs_modeset (struct intel_atomic_state *state,struct drm_connector *connector); +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, +struct intel_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc); void intel_crtc_destroy_state(struct drm_crtc *crtc,drivers/gpu/drm/i915/display/intel_ddi.c +12
-2@@ -1899,8 +1899,13 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state) temp |=TRANS_DDI_MODE_SELECT_DP_MST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count); -if (INTEL_GEN (dev_priv) >=12 ) - temp |=TRANS_DDI_MST_TRANSPORT_SELECT (crtc_state->cpu_transcoder); +if (INTEL_GEN (dev_priv) >=12 ) { +enum transcoder master; + + master = crtc_state->mst_master_transcoder; +WARN_ON (master ==INVALID_TRANSCODER ); + temp |=TRANS_DDI_MST_TRANSPORT_SELECT (master); + } }else { temp |=TRANS_DDI_MODE_SELECT_DP_SST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count);@@ -4405,6 +4410,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; + +if (INTEL_GEN (dev_priv) >=12 ) + pipe_config->mst_master_transcoder = +REG_FIELD_GET (TRANS_DDI_MST_TRANSPORT_SELECT_MASK , temp); +intel_dp_get_m_n (intel_crtc, pipe_config);break ;default :drivers/gpu/drm/i915/display/intel_display.c +10
-2@@ -46,6 +46,7 @@#include "display/intel_crt.h" #include "display/intel_ddi.h" #include "display/intel_dp.h" +#include "display/intel_dp_mst.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h" @@ -11627,6 +11628,7 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->hsw_workaround_pipe =INVALID_PIPE ; crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; }static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc)@@ -12484,6 +12486,9 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, pipe_config->csc_mode, pipe_config->gamma_mode, pipe_config->gamma_enable, pipe_config->csc_enable); +DRM_DEBUG_KMS ("MST master transcoder: %s\n" , +transcoder_name (pipe_config->mst_master_transcoder)); + dump_planes:if (!state)return ;@@ -13264,6 +13269,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_I (dsc.dsc_split);PIPE_CONF_CHECK_I (dsc.compressed_bpp); +PIPE_CONF_CHECK_I (mst_master_transcoder); +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef PIPE_CONF_CHECK_BOOL@@ -14348,7 +14355,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)u32 handled =0 ;int i; -/* Only disable port sync slaves */ +/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {if (!needs_modeset (new_crtc_state))@@ -14362,7 +14369,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)* slave CRTCs are disabled first and then master CRTC since * Slave vblanks are masked till Master Vblanks. */ -if (!is_trans_port_sync_slave (old_crtc_state)) +if (!is_trans_port_sync_slave (old_crtc_state) && + !intel_dp_mst_is_slave_trans (old_crtc_state))continue ;intel_pre_plane_update (state, crtc);drivers/gpu/drm/i915/display/intel_display_types.h +3
-0@@ -1054,6 +1054,9 @@ struct intel_crtc_state {/* Bitmask to indicate slaves attached */ u8 sync_mode_slaves_mask; + +/* Only valid on TGL+ */ +enum transcoder mst_master_transcoder; };struct intel_crtc {drivers/gpu/drm/i915/display/intel_dp_mst.c +27
-0@@ -87,10 +87,53 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,return 0 ; } +/* +* Iterate over all connectors and return the smallest transcoder in the MST +* stream +*/ +static enum transcoder +intel_dp_mst_master_trans_compute (struct intel_atomic_state *state, +struct intel_dp *mst_port) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_digital_connector_state *conn_state; +struct intel_connector *connector; +enum pipe ret =I915_MAX_PIPES ; +int i; + +if (INTEL_GEN (dev_priv) <12 ) +return INVALID_TRANSCODER ; + +for_each_new_intel_connector_in_state (state, connector, conn_state, i) { +struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; + +if (connector->mst_port != mst_port || !conn_state->base.crtc) +continue ; + + crtc =to_intel_crtc (conn_state->base.crtc); + crtc_state =intel_atomic_get_new_crtc_state (state, crtc); +if (!crtc_state->uapi.active)
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, · line 126
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +10
-0+continue ; + +/* +* Using crtc->pipe because crtc_state->cpu_transcoder is +* computed, so others CRTCs could have non-computed +* cpu_transcoder +*/ +if (crtc->pipe < ret) + ret = crtc->pipe; + }
Still has the problem that ret==I915_MAX_PIPES if no active crtcs in the state.
I guess a simple
if (ret == MAX_PIPES)
return INVALID;
should do here. Or something similar.
With that fixed this is
Future thoughts based on what I prototyped ingit://github.com/vsyrjala/linux.git port_sync_stuff
would be to simply compute the bitmask of transcoders here, and then let the caller pick the first with ffs()-1. We could potentially optimize that approach a bit by only computing each distinct bitmask only once and storing them temporarult in eg. intel_atomic_state. Then each encoder would just assign:mst_master = ffs(precomputed_mst_bitmask[cpu_transcoder]) - 1;
Quoted 187 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +94
-9+ +/* Simple cast works because TGL don't have a eDP transcoder */ +return (enum transcoder )ret; +} +static int intel_dp_mst_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state) { +struct intel_atomic_state *state =to_intel_atomic_state (conn_state->state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_dp *intel_dp = &intel_mst->primary->dp;@@ -154,24 +197,91 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,intel_ddi_compute_min_voltage_level (dev_priv, pipe_config); + pipe_config->mst_master_transcoder =intel_dp_mst_master_trans_compute (state, intel_dp); + +return 0 ; +} + +/* +* If one of the connectors in a MST stream needs a modeset, mark all CRTCs +* that shares the same MST stream as mode changed, +* intel_modeset_pipe_config()+intel_crtc_check_fastset() will take care to do +* a fastset when possible. +*/ +static int +intel_dp_mst_atomic_master_trans_check (struct intel_connector *connector, +struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct drm_connector_list_iter connector_list_iter; +struct intel_connector *connector_iter; + +if (INTEL_GEN (dev_priv) <12 ) +return 0 ; + +if (!intel_connector_needs_modeset (state, &connector->base)) +return 0 ; + +drm_connector_list_iter_begin (&dev_priv->drm, &connector_list_iter); +for_each_intel_connector_iter (connector_iter, &connector_list_iter) { +struct intel_digital_connector_state *conn_iter_state; +struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; +int ret; + +if (connector_iter->mst_port != connector->mst_port || + connector_iter == connector) +continue ; + + conn_iter_state =intel_atomic_get_digital_connector_state (state, + connector_iter); +if (IS_ERR (conn_iter_state)) { +drm_connector_list_iter_end (&connector_list_iter); +return PTR_ERR (conn_iter_state); + } + +if (!conn_iter_state->base.crtc) +continue ; + + crtc =to_intel_crtc (conn_iter_state->base.crtc); + crtc_state =intel_atomic_get_crtc_state (&state->base, crtc); +if (IS_ERR (crtc_state)) { +drm_connector_list_iter_end (&connector_list_iter); +return PTR_ERR (crtc_state); + } + + ret =drm_atomic_add_affected_planes (&state->base, &crtc->base); +if (ret) { +drm_connector_list_iter_end (&connector_list_iter); +return ret; + } + crtc_state->uapi.mode_changed = true; + } +drm_connector_list_iter_end (&connector_list_iter); +return 0 ; }static int intel_dp_mst_atomic_check (struct drm_connector *connector, -struct drm_atomic_state *state) +struct drm_atomic_state *_state) { +struct intel_atomic_state *state =to_intel_atomic_state (_state);struct drm_connector_state *new_conn_state = -drm_atomic_get_new_connector_state (state, connector); +drm_atomic_get_new_connector_state (&state->base, connector);struct drm_connector_state *old_conn_state = -drm_atomic_get_old_connector_state (state, connector); +drm_atomic_get_old_connector_state (&state->base, connector);struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_crtc *new_crtc = new_conn_state->crtc;struct drm_dp_mst_topology_mgr *mgr;int ret; - ret =intel_digital_connector_atomic_check (connector, state); + ret =intel_digital_connector_atomic_check (connector, &state->base); +if (ret) +return ret; + + ret =intel_dp_mst_atomic_master_trans_check (intel_connector, state);if (ret)return ret;@@ -182,12 +292,9 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,* connector */ if (new_crtc) { -struct intel_atomic_state *intel_state = -to_intel_atomic_state (state);struct intel_crtc *intel_crtc =to_intel_crtc (new_crtc);struct intel_crtc_state *crtc_state = -intel_atomic_get_new_crtc_state (intel_state, - intel_crtc); +intel_atomic_get_new_crtc_state (state, intel_crtc); if (!crtc_state || !drm_atomic_crtc_needs_modeset(&crtc_state->uapi) ||@@ -196,7 +303,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector, } mgr = &enc_to_mst (old_conn_state->best_encoder)->primary->dp.mst_mgr; - ret =drm_dp_atomic_release_vcpi_slots (state, mgr, + ret =drm_dp_atomic_release_vcpi_slots (&state->base, mgr, intel_connector->port);return ret;@@ -240,6 +347,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, intel_dp->active_mst_links--; last_mst_stream = intel_dp->active_mst_links ==0 ; +WARN_ON (INTEL_GEN (dev_priv) >=12 && last_mst_stream && + !intel_dp_mst_is_master_trans (old_crtc_state));intel_crtc_vblank_off (old_crtc_state);@@ -317,6 +426,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, connector->encoder = encoder; intel_mst->connector = connector; first_mst_stream = intel_dp->active_mst_links ==0 ; +WARN_ON (INTEL_GEN (dev_priv) >=12 && first_mst_stream && + !intel_dp_mst_is_master_trans (pipe_config));DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);@@ -722,3 +833,14 @@ intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port)drm_dp_mst_topology_mgr_destroy (&intel_dp->mst_mgr);/* encoders will get killed by normal cleanup */ } + +bool intel_dp_mst_is_master_trans (const struct intel_crtc_state *crtc_state) +{ +return crtc_state->mst_master_transcoder == crtc_state->cpu_transcoder; +} + +bool intel_dp_mst_is_slave_trans (const struct intel_crtc_state *crtc_state) +{ +return crtc_state->mst_master_transcoder !=INVALID_TRANSCODER && + crtc_state->mst_master_transcoder != crtc_state->cpu_transcoder; +}drivers/gpu/drm/i915/display/intel_dp_mst.h +5
-0@@ -6,10 +6,15 @@#ifndef __INTEL_DP_MST_H__#define __INTEL_DP_MST_H__ +#include <linux/types.h> +struct intel_digital_port ; +struct intel_crtc_state ;int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_id);void intel_dp_mst_encoder_cleanup (struct intel_digital_port *intel_dig_port);int intel_dp_mst_encoder_active_links (struct intel_digital_port *intel_dig_port); +bool intel_dp_mst_is_master_trans (const struct intel_crtc_state *crtc_state); +bool intel_dp_mst_is_slave_trans (const struct intel_crtc_state *crtc_state);#endif /* __INTEL_DP_MST_H__ */ Signature · 1 line
2.24.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 3/7] drm/i915/tgl: Select master transcoder for MST stream
Quoted 299 lines · Ville Syrjälä
Quoted 286 lines · José Roberto de Souza
On TGL the blending of all the streams have moved from DDI to transcoder, so now every transcoder working over the same MST port must
send its stream to a master transcoder and master will send to DDI respecting the time slots.So here adding all the CRTCs that shares the same MST stream if needed and computing their state again, it will pick the lowest pipe/transcoder among the ones in the same stream to be master.
Most of the time
skl_commit_modeset_enables()enables pipes in a crescent order but due DDB overlapping it might not happen, this scenarios will be handled in the next patch.v2:
- Using recently addedintel_crtc_state_reset()to setmst_master_transcoderto invalid transcoder for all non gen12 & MST code paths
- Setting lowest pipe/transcoder as master, previously it was the first one but setting a predictable one will help in future MST e port sync integration
- Moving to intel type as much as we canv3:
- Nowintel_dp_mst_master_trans_compute()returns the MST master transcoder
- Replacedstdbool.hbylinux/types.h
- Skip the connector being checked inintel_dp_mst_atomic_master_trans_check()
- Using pipe instead of transcoder to compute MST masterv4:
- renamedconnector_statetoconn_statev5:
- Improved the parameters ofintel_dp_mst_master_trans_compute()to simply code
- Added calldrm_atomic_add_affected_planes()inintel_dp_mst_atomic_master_trans_check()as helper could not do it for us
- Removed "if (ret)" left over from v3 changesBSpec: 50493
BSpec: 49190Cc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 14 ++ drivers/gpu/drm/i915/display/intel_atomic.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + 7 files changed, 179 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +3
-0@@ -192,6 +192,20 @@ intel_connector_needs_modeset(struct intel_atomic_state *state, new_conn_state->crtc))); } +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector)
drivers/gpu/drm/i915/display/intel_atomic.c +11
-0+{ +struct drm_connector_state *conn_state; + + conn_state =drm_atomic_get_connector_state (&state->base, + &connector->base); +if (IS_ERR (conn_state)) +return ERR_CAST (conn_state); + +return to_intel_digital_connector_state (conn_state); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc drivers/gpu/drm/i915/display/intel_atomic.h +4
-0@@ -17,6 +17,7 @@ struct drm_device;struct drm_i915_private ;struct drm_property ;struct intel_atomic_state ; +struct intel_connector ;struct intel_crtc ;struct intel_crtc_state ;@@ -34,6 +35,9 @@ struct drm_connector_state *intel_digital_connector_duplicate_state (struct drm_connector *connector);bool intel_connector_needs_modeset (struct intel_atomic_state *state,struct drm_connector *connector); +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector);
struct
drm_crtc_state*intel_crtc_duplicate_state(structdrm_crtc
*crtc);
void intel_crtc_destroy_state(structdrm_crtc*crtc,drivers/gpu/drm/i915/display/intel_ddi.c +7
-2@@ -1899,8 +1899,13 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state) temp |= TRANS_DDI_MODE_SELECT_DP_MST; temp |=DDI_PORT_WIDTH (crtc_state->lane_count); -if (INTEL_GEN (dev_priv) >=12 ) - temp |=TRANS_DDI_MST_TRANSPORT_SELECT (crtc_state->cpu_transcoder); +if (INTEL_GEN (dev_priv) >=12 ) { +enum transcoder master; + + master = crtc_state->mst_master_transcoder; +WARN_ON (master ==INVALID_TRANSCODER ); + temp |=TRANS_DDI_MST_TRANSPORT_SELECT (master); + } }else {drivers/gpu/drm/i915/display/intel_ddi.c +5
-0temp |=TRANS_DDI_MODE_SELECT_DP_SST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count);@@ -4405,6 +4410,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; + +if (INTEL_GEN (dev_priv) >=12 ) + pipe_config->mst_master_transcoder = + REG_FIELD_GET(TRANS_DDI_MST_TRANSPORT_SELECT_MASK , temp); +drivers/gpu/drm/i915/display/intel_ddi.c +0
-0intel_dp_get_m_n (intel_crtc, pipe_config);break ;default :drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -46,6 +46,7 @@#include "display/intel_crt.h" #include "display/intel_ddi.h" #include "display/intel_dp.h" +#include "display/intel_dp_mst.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h" @@ -11627,6 +11628,7 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->hsw_workaround_pipe =INVALID_PIPE ; crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; }static struct
intel_crtc_state*intel_crtc_state_alloc(structintel_crtc*crtc)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -12484,6 +12486,9 @@ static void intel_dump_pipe_config(conststruct intel_crtc_state *pipe_config, pipe_config->csc_mode, pipe_config- >gamma_mode, pipe_config->gamma_enable, pipe_config- >csc_enable); + DRM_DEBUG_KMS("MST master transcoder: %s\n", + transcoder_name(pipe_config-Quoted 1 line
mst_master_transcoder));drivers/gpu/drm/i915/display/intel_display.c +3
-0+ dump_planes:if (!state)return ;@@ -13264,6 +13269,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_I (dsc.dsc_split);PIPE_CONF_CHECK_I (dsc.compressed_bpp); +PIPE_CONF_CHECK_I (mst_master_transcoder); +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef
PIPE_CONF_CHECK_BOOLdrivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -14348,7 +14355,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) u32 handled = 0;int i; -/* Only disable port sync slaves */ +/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state,drivers/gpu/drm/i915/display/intel_display.c +0
-0new_crtc_state, i) {if (!needs_modeset (new_crtc_state))@@ -14362,7 +14369,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) * slave CRTCs are disabled first and then master CRTCsince
drivers/gpu/drm/i915/display/intel_display.c +2
-1* Slave vblanks are masked till Master Vblanks. */ -if (!is_trans_port_sync_slave (old_crtc_state)) +if (!is_trans_port_sync_slave (old_crtc_state) && + !intel_dp_mst_is_slave_trans (old_crtc_state))continue ;intel_pre_plane_update (state, crtc);drivers/gpu/drm/i915/display/intel_display_types.h +3
-0@@ -1054,6 +1054,9 @@ struct intel_crtc_state {/* Bitmask to indicate slaves attached */ u8 sync_mode_slaves_mask; + +/* Only valid on TGL+ */ +enum transcoder mst_master_transcoder; };struct intel_crtc {drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0@@ -87,10 +87,53 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; } +/* +* Iterate over all connectors and return the smallest transcoder in the MST
+ * stream
+ */drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+static enum transcoder +intel_dp_mst_master_trans_compute(struct intel_atomic_state*state,
drivers/gpu/drm/i915/display/intel_dp_mst.c +12
-0+ struct intel_dp *mst_port) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_digital_connector_state *conn_state; +struct intel_connector *connector; +enum pipe ret =I915_MAX_PIPES ; +int i; + +if (INTEL_GEN (dev_priv) <12 ) +return INVALID_TRANSCODER ; + + for_each_new_intel_connector_in_state(state, connector,
conn_state, i) {drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; + + if (connector->mst_port != mst_port || !conn_state-Quoted 1 line
base.crtc)
drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+continue ; + + crtc =to_intel_crtc (conn_state->base.crtc); + crtc_state = intel_atomic_get_new_crtc_state(state,crtc);
drivers/gpu/drm/i915/display/intel_dp_mst.c +5
-0+if (!crtc_state->uapi.active) +continue ; + +/* +* Using crtc->pipe because crtc_state->cpu_transcoder is
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, · line 126
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +6
-0+* computed, so others CRTCs could have non-computed +* cpu_transcoder +*/ +if (crtc->pipe < ret) + ret = crtc->pipe; + }Still has the problem that ret==I915_MAX_PIPES if no active crtcs in the
state.
Quoted 4 lines
I guess a simple
if (ret ==MAX_PIPES)return INVALID;should do here. Or something similar.
It would never happen, if it is computing state for this MST connector it is active, so it can be master. But okay adding it anyways.
Quoted 243 lines
With that fixed this is
Reviewed-by Ville Syrjälä <[email protected]>Future thoughts based on what I prototyped in
git://github.com/vsyrjala/linux.gitport_sync_stuff
would be to simply compute the bitmask of transcoders here, and then let the caller pick the first with ffs()-1. We could potentially optimize that approach a bit by only computing each distinct bitmask only once and storing them temporarult in eg.intel_atomic_state. Then each encoder would just assign:mst_master=ffs(precomputed_mst_bitmask[cpu_transcoder])- 1;Quoted 229 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +5
-0+ +/* Simple cast works because TGL don't have a eDP transcoder */ +return (enum transcoder )ret; +} + static int intel_dp_mst_compute_config(struct intel_encoder*encoder,
structintel_crtc_state*pipe_config,
structdrm_connector_state*conn_state)
{drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-0+ struct intel_atomic_state *state =
to_intel_atomic_state(conn_state->state);drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder-Quoted 1 line
base);
drivers/gpu/drm/i915/display/intel_dp_mst.c +7
-0struct intel_dp *intel_dp = &intel_mst->primary->dp;@@ -154,24 +197,91 @@ static int intel_dp_mst_compute_config(structintel_encoder *encoder,intel_ddi_compute_min_voltage_level (dev_priv ,pipe_config ); + pipe_config->mst_master_transcoder =intel_dp_mst_master_trans_compute (state, intel_dp); + +return 0 ; +} + +/* +* If one of the connectors in a MST stream needs a modeset, mark all CRTCs
+ * that shares the same MST stream as mode changed,
+ * intel_modeset_pipe_config()+intel_crtc_check_fastset() will take care to do
+ * a fastset when possible.
+ */drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+static int +intel_dp_mst_atomic_master_trans_check(struct intel_connector*connector,
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-0+struct intel_atomic_state *state)
drivers/gpu/drm/i915/display/intel_dp_mst.c +12
-0+{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct drm_connector_list_iter connector_list_iter; +struct intel_connector *connector_iter; + +if (INTEL_GEN (dev_priv) <12 ) +return 0 ; + +if (!intel_connector_needs_modeset (state, &connector->base)) +return 0 ; + + drm_connector_list_iter_begin(&dev_priv->drm,
&connector_list_iter);drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-0+ for_each_intel_connector_iter(connector_iter,
&connector_list_iter) {drivers/gpu/drm/i915/display/intel_dp_mst.c +10
-0+struct intel_digital_connector_state *conn_iter_state; +struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; +int ret; + +if (connector_iter->mst_port != connector->mst_port || + connector_iter == connector) +continue ; + + conn_iter_state =intel_atomic_get_digital_connector_state(state,
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-0+ connector_iter); +if (IS_ERR (conn_iter_state)) { + drm_connector_list_iter_end(&connector_list_iter);
drivers/gpu/drm/i915/display/intel_dp_mst.c +8
-0+return PTR_ERR (conn_iter_state); + } + +if (!conn_iter_state->base.crtc) +continue ; + + crtc =to_intel_crtc (conn_iter_state->base.crtc); + crtc_state = intel_atomic_get_crtc_state(&state->base,crtc);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+if (IS_ERR (crtc_state)) { + drm_connector_list_iter_end(&connector_list_iter);
drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+return PTR_ERR (crtc_state); + } + + ret = drm_atomic_add_affected_planes(&state->base,
&crtc->base);drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+if (ret) { + drm_connector_list_iter_end(&connector_list_iter);
drivers/gpu/drm/i915/display/intel_dp_mst.c +8
-1+return ret; + } + crtc_state->uapi.mode_changed = true; + } +drm_connector_list_iter_end (&connector_list_iter); +return 0 ; }static int intel_dp_mst_atomic_check (struct drm_connector *connector, -struct drm_atomic_state *state) +struct drm_atomic_state *_state) { + struct intel_atomic_state *state =
to_intel_atomic_state(_state);drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1struct drm_connector_state *new_conn_state = -drm_atomic_get_new_connector_state (state, connector); + drm_atomic_get_new_connector_state(&state->base,connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1struct drm_connector_state *old_conn_state = -drm_atomic_get_old_connector_state (state, connector); + drm_atomic_get_old_connector_state(&state->base,connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_crtc *new_crtc = new_conn_state->crtc;struct drm_dp_mst_topology_mgr *mgr;int ret; - ret =intel_digital_connector_atomic_check (connector, state); + ret = intel_digital_connector_atomic_check(connector, &state-Quoted 1 line
base);
drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+if (ret) +return ret; + + ret = intel_dp_mst_atomic_master_trans_check(intel_connector,state);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-4if (ret)return ret;@@ -182,12 +292,9 @@ intel_dp_mst_atomic_check(struct drm_connector*connector, * connector */ if (new_crtc) { -struct intel_atomic_state *intel_state = -to_intel_atomic_state (state);struct intel_crtc *intel_crtc =to_intel_crtc (new_crtc);struct intel_crtc_state *crtc_state = -intel_atomic_get_new_crtc_state (intel_state, - intel_crtc); +intel_atomic_get_new_crtc_state (state, intel_crtc);drivers/gpu/drm/i915/display/intel_dp_mst.c +0
-0if (!crtc_state || !drm_atomic_crtc_needs_modeset(&crtc_state->uapi)||
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1@@ -196,7 +303,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector, } mgr = &enc_to_mst (old_conn_state->best_encoder)->primary- >dp.mst_mgr; - ret =drm_dp_atomic_release_vcpi_slots (state, mgr, + ret =drm_dp_atomic_release_vcpi_slots (&state->base, mgr, intel_connector->port);drivers/gpu/drm/i915/display/intel_dp_mst.c +6
-0return ret;@@ -240,6 +347,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, intel_dp->active_mst_links--; last_mst_stream = intel_dp->active_mst_links ==0 ; +WARN_ON (INTEL_GEN (dev_priv) >=12 && last_mst_stream && + !intel_dp_mst_is_master_trans (old_crtc_state));intel_crtc_vblank_off (old_crtc_state);@@ -317,6 +426,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, connector->encoder = encoder; intel_mst->connector = connector; first_mst_stream = intel_dp->active_mst_links ==0 ; +WARN_ON (INTEL_GEN (dev_priv) >=12 && first_mst_stream && + !intel_dp_mst_is_master_trans (pipe_config));DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);@@ -722,3 +833,14 @@ intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port) drm_dp_mst_topology_mgr_destroy(&intel_dp->mst_mgr);/* encoders will get killed by normal cleanup */ } + +bool intel_dp_mst_is_master_trans(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+{ + return crtc_state->mst_master_transcoder == crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-0+} + +bool intel_dp_mst_is_slave_trans(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+{ +return crtc_state->mst_master_transcoder !=INVALID_TRANSCODER &&
drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-0+ crtc_state->mst_master_transcoder != crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-0+}drivers/gpu/drm/i915/display/intel_dp_mst.h +3
-0@@ -6,10 +6,15 @@#ifndef __INTEL_DP_MST_H__#define __INTEL_DP_MST_H__ +#include <linux/types.h> +struct intel_digital_port ; +struct intel_crtc_state ;int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_id);void intel_dp_mst_encoder_cleanup (struct intel_digital_port *intel_dig_port); int intel_dp_mst_encoder_active_links(struct intel_digital_port
*intel_dig_port);
+boolintel_dp_mst_is_master_trans(const struct intel_crtc_state *crtc_state);
+boolintel_dp_mst_is_slave_trans(const struct intel_crtc_state *crtc_state);
Quoted 3 lines
Quoted 3 lines
#endif /*
__INTEL_DP_MST_H__*/Signature · 1 line
2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 3/7] drm/i915/tgl: Select master transcoder for MST stream
Quoted 300 lines · Jose
Quoted 299 lines · Ville Syrjälä
Quoted 286 lines · José Roberto de Souza
On TGL the blending of all the streams have moved from DDI to transcoder, so now every transcoder working over the same MST port must
send its stream to a master transcoder and master will send to DDI respecting the time slots.So here adding all the CRTCs that shares the same MST stream if needed and computing their state again, it will pick the lowest pipe/transcoder among the ones in the same stream to be master.
Most of the time
skl_commit_modeset_enables()enables pipes in a crescent order but due DDB overlapping it might not happen, this scenarios will be handled in the next patch.v2:
- Using recently addedintel_crtc_state_reset()to setmst_master_transcoderto invalid transcoder for all non gen12 & MST code paths
- Setting lowest pipe/transcoder as master, previously it was the first one but setting a predictable one will help in future MST e port sync integration
- Moving to intel type as much as we canv3:
- Nowintel_dp_mst_master_trans_compute()returns the MST master transcoder
- Replacedstdbool.hbylinux/types.h
- Skip the connector being checked inintel_dp_mst_atomic_master_trans_check()
- Using pipe instead of transcoder to compute MST masterv4:
- renamedconnector_statetoconn_statev5:
- Improved the parameters ofintel_dp_mst_master_trans_compute()to simply code
- Added calldrm_atomic_add_affected_planes()inintel_dp_mst_atomic_master_trans_check()as helper could not do it for us
- Removed "if (ret)" left over from v3 changesBSpec: 50493
BSpec: 49190Cc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 14 ++ drivers/gpu/drm/i915/display/intel_atomic.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + 7 files changed, 179 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +3
-0@@ -192,6 +192,20 @@ intel_connector_needs_modeset(struct intel_atomic_state *state, new_conn_state->crtc))); } +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector)
drivers/gpu/drm/i915/display/intel_atomic.c +11
-0+{ +struct drm_connector_state *conn_state; + + conn_state =drm_atomic_get_connector_state (&state->base, + &connector->base); +if (IS_ERR (conn_state)) +return ERR_CAST (conn_state); + +return to_intel_digital_connector_state (conn_state); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc drivers/gpu/drm/i915/display/intel_atomic.h +4
-0@@ -17,6 +17,7 @@ struct drm_device;struct drm_i915_private ;struct drm_property ;struct intel_atomic_state ; +struct intel_connector ;struct intel_crtc ;struct intel_crtc_state ;@@ -34,6 +35,9 @@ struct drm_connector_state *intel_digital_connector_duplicate_state (struct drm_connector *connector);bool intel_connector_needs_modeset (struct intel_atomic_state *state,struct drm_connector *connector); +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector);
struct
drm_crtc_state*intel_crtc_duplicate_state(structdrm_crtc
*crtc);
void intel_crtc_destroy_state(structdrm_crtc*crtc,drivers/gpu/drm/i915/display/intel_ddi.c +7
-2@@ -1899,8 +1899,13 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state) temp |= TRANS_DDI_MODE_SELECT_DP_MST; temp |=DDI_PORT_WIDTH (crtc_state->lane_count); -if (INTEL_GEN (dev_priv) >=12 ) - temp |=TRANS_DDI_MST_TRANSPORT_SELECT (crtc_state->cpu_transcoder); +if (INTEL_GEN (dev_priv) >=12 ) { +enum transcoder master; + + master = crtc_state->mst_master_transcoder; +WARN_ON (master ==INVALID_TRANSCODER ); + temp |=TRANS_DDI_MST_TRANSPORT_SELECT (master); + } }else {drivers/gpu/drm/i915/display/intel_ddi.c +5
-0temp |=TRANS_DDI_MODE_SELECT_DP_SST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count);@@ -4405,6 +4410,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; + +if (INTEL_GEN (dev_priv) >=12 ) + pipe_config->mst_master_transcoder = + REG_FIELD_GET(TRANS_DDI_MST_TRANSPORT_SELECT_MASK , temp); +drivers/gpu/drm/i915/display/intel_ddi.c +0
-0intel_dp_get_m_n (intel_crtc, pipe_config);break ;default :drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -46,6 +46,7 @@#include "display/intel_crt.h" #include "display/intel_ddi.h" #include "display/intel_dp.h" +#include "display/intel_dp_mst.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h" @@ -11627,6 +11628,7 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->hsw_workaround_pipe =INVALID_PIPE ; crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; }static struct
intel_crtc_state*intel_crtc_state_alloc(structintel_crtc*crtc)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -12484,6 +12486,9 @@ static void intel_dump_pipe_config(conststruct intel_crtc_state *pipe_config, pipe_config->csc_mode, pipe_config- >gamma_mode, pipe_config->gamma_enable, pipe_config- >csc_enable); + DRM_DEBUG_KMS("MST master transcoder: %s\n", + transcoder_name(pipe_config-Quoted 1 line
mst_master_transcoder));drivers/gpu/drm/i915/display/intel_display.c +3
-0+ dump_planes:if (!state)return ;@@ -13264,6 +13269,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_I (dsc.dsc_split);PIPE_CONF_CHECK_I (dsc.compressed_bpp); +PIPE_CONF_CHECK_I (mst_master_transcoder); +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef
PIPE_CONF_CHECK_BOOLdrivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -14348,7 +14355,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) u32 handled = 0;int i; -/* Only disable port sync slaves */ +/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state,drivers/gpu/drm/i915/display/intel_display.c +0
-0new_crtc_state, i) {if (!needs_modeset (new_crtc_state))@@ -14362,7 +14369,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) * slave CRTCs are disabled first and then master CRTCsince
drivers/gpu/drm/i915/display/intel_display.c +2
-1* Slave vblanks are masked till Master Vblanks. */ -if (!is_trans_port_sync_slave (old_crtc_state)) +if (!is_trans_port_sync_slave (old_crtc_state) && + !intel_dp_mst_is_slave_trans (old_crtc_state))continue ;intel_pre_plane_update (state, crtc);drivers/gpu/drm/i915/display/intel_display_types.h +3
-0@@ -1054,6 +1054,9 @@ struct intel_crtc_state {/* Bitmask to indicate slaves attached */ u8 sync_mode_slaves_mask; + +/* Only valid on TGL+ */ +enum transcoder mst_master_transcoder; };struct intel_crtc {drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0@@ -87,10 +87,53 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; } +/* +* Iterate over all connectors and return the smallest transcoder in the MST
+ * stream
+ */drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+static enum transcoder +intel_dp_mst_master_trans_compute(struct intel_atomic_state*state,
drivers/gpu/drm/i915/display/intel_dp_mst.c +12
-0+ struct intel_dp *mst_port) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_digital_connector_state *conn_state; +struct intel_connector *connector; +enum pipe ret =I915_MAX_PIPES ; +int i; + +if (INTEL_GEN (dev_priv) <12 ) +return INVALID_TRANSCODER ; + + for_each_new_intel_connector_in_state(state, connector,
conn_state, i) {drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; + + if (connector->mst_port != mst_port || !conn_state-Quoted 1 line
base.crtc)
drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+continue ; + + crtc =to_intel_crtc (conn_state->base.crtc); + crtc_state = intel_atomic_get_new_crtc_state(state,crtc);
drivers/gpu/drm/i915/display/intel_dp_mst.c +5
-0+if (!crtc_state->uapi.active) +continue ; + +/* +* Using crtc->pipe because crtc_state->cpu_transcoder is
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, · line 126
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +6
-0+* computed, so others CRTCs could have non-computed +* cpu_transcoder +*/ +if (crtc->pipe < ret) + ret = crtc->pipe; + }Still has the problem that ret==I915_MAX_PIPES if no active crtcs in the
state.
Quoted 7 lines
Quoted 4 lines
I guess a simple
if (ret ==MAX_PIPES)return INVALID;should do here. Or something similar.
It would never happen, if it is computing state for this MST connector it is active, so it can be master. But okay adding it anyways.
active != enabled. Pretty sure it will happen.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 3/7] drm/i915/tgl: Select master transcoder for MST stream
Quoted 306 lines · Ville Syrjälä
Quoted 305 lines · Jose
Quoted 303 lines · Ville Syrjälä
Quoted 286 lines · José Roberto de Souza
On TGL the blending of all the streams have moved from DDI to transcoder, so now every transcoder working over the same MST port must
send its stream to a master transcoder and master will send to DDI respecting the time slots.So here adding all the CRTCs that shares the same MST stream if needed and computing their state again, it will pick the lowest pipe/transcoder among the ones in the same stream to be master.
Most of the time
skl_commit_modeset_enables()enables pipes in a crescent order but due DDB overlapping it might not happen, this scenarios will be handled in the next patch.v2:
- Using recently addedintel_crtc_state_reset()to setmst_master_transcoderto invalid transcoder for all non gen12 & MST code paths
- Setting lowest pipe/transcoder as master, previously it was the first one but setting a predictable one will help in future MST e port sync integration
- Moving to intel type as much as we canv3:
- Nowintel_dp_mst_master_trans_compute()returns the MST master transcoder
- Replacedstdbool.hbylinux/types.h
- Skip the connector being checked inintel_dp_mst_atomic_master_trans_check()
- Using pipe instead of transcoder to compute MST masterv4:
- renamedconnector_statetoconn_statev5:
- Improved the parameters ofintel_dp_mst_master_trans_compute()to simply code
- Added calldrm_atomic_add_affected_planes()inintel_dp_mst_atomic_master_trans_check()as helper could not do it for us
- Removed "if (ret)" left over from v3 changesBSpec: 50493
BSpec: 49190Cc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 14 ++ drivers/gpu/drm/i915/display/intel_atomic.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 ++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.h | 5 + 7 files changed, 179 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +3
-0@@ -192,6 +192,20 @@ intel_connector_needs_modeset(struct intel_atomic_state *state, new_conn_state->crtc))); } +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector)
drivers/gpu/drm/i915/display/intel_atomic.c +11
-0+{ +struct drm_connector_state *conn_state; + + conn_state =drm_atomic_get_connector_state (&state->base, + &connector->base); +if (IS_ERR (conn_state)) +return ERR_CAST (conn_state); + +return to_intel_digital_connector_state (conn_state); +} +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc drivers/gpu/drm/i915/display/intel_atomic.h +4
-0@@ -17,6 +17,7 @@ struct drm_device;struct drm_i915_private ;struct drm_property ;struct intel_atomic_state ; +struct intel_connector ;struct intel_crtc ;struct intel_crtc_state ;@@ -34,6 +35,9 @@ struct drm_connector_state *intel_digital_connector_duplicate_state (struct drm_connector *connector);bool intel_connector_needs_modeset (struct intel_atomic_state *state,struct drm_connector *connector); +struct intel_digital_connector_state * +intel_atomic_get_digital_connector_state (struct intel_atomic_state *state, + struct intel_connector*connector);
struct
drm_crtc_state*intel_crtc_duplicate_state(structdrm_crtc
*crtc);
void intel_crtc_destroy_state(structdrm_crtc*crtc,drivers/gpu/drm/i915/display/intel_ddi.c +7
-2@@ -1899,8 +1899,13 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state) temp |= TRANS_DDI_MODE_SELECT_DP_MST; temp |=DDI_PORT_WIDTH (crtc_state->lane_count); -if (INTEL_GEN (dev_priv) >=12 ) - temp |=TRANS_DDI_MST_TRANSPORT_SELECT (crtc_state->cpu_transcoder); +if (INTEL_GEN (dev_priv) >=12 ) { +enum transcoder master; + + master = crtc_state->mst_master_transcoder; +WARN_ON (master ==INVALID_TRANSCODER ); + temp |=TRANS_DDI_MST_TRANSPORT_SELECT (master); + } }else {drivers/gpu/drm/i915/display/intel_ddi.c +5
-0temp |=TRANS_DDI_MODE_SELECT_DP_SST ; temp |=DDI_PORT_WIDTH (crtc_state->lane_count);@@ -4405,6 +4410,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; + +if (INTEL_GEN (dev_priv) >=12 ) + pipe_config->mst_master_transcoder = + REG_FIELD_GET(TRANS_DDI_MST_TRANSPORT_SELECT_MASK , temp); +drivers/gpu/drm/i915/display/intel_ddi.c +0
-0intel_dp_get_m_n (intel_crtc, pipe_config);break ;default :drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -46,6 +46,7 @@#include "display/intel_crt.h" #include "display/intel_ddi.h" #include "display/intel_dp.h" +#include "display/intel_dp_mst.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" #include "display/intel_gmbus.h" @@ -11627,6 +11628,7 @@ static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state, crtc_state->hsw_workaround_pipe =INVALID_PIPE ; crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; }static struct
intel_crtc_state*intel_crtc_state_alloc(structintel_crtc*crtc)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -12484,6 +12486,9 @@ static void intel_dump_pipe_config(conststruct intel_crtc_state *pipe_config, pipe_config->csc_mode, pipe_config- >gamma_mode, pipe_config->gamma_enable, pipe_config- >csc_enable); + DRM_DEBUG_KMS("MST master transcoder: %s\n", + transcoder_name(pipe_config-Quoted 1 line
mst_master_transcoder));drivers/gpu/drm/i915/display/intel_display.c +3
-0+ dump_planes:if (!state)return ;@@ -13264,6 +13269,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_I (dsc.dsc_split);PIPE_CONF_CHECK_I (dsc.compressed_bpp); +PIPE_CONF_CHECK_I (mst_master_transcoder); +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef
PIPE_CONF_CHECK_BOOLdrivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -14348,7 +14355,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) u32 handled = 0;int i; -/* Only disable port sync slaves */ +/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state,drivers/gpu/drm/i915/display/intel_display.c +0
-0new_crtc_state, i) {if (!needs_modeset (new_crtc_state))@@ -14362,7 +14369,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) * slave CRTCs are disabled first and then master CRTCsince
drivers/gpu/drm/i915/display/intel_display.c +2
-1* Slave vblanks are masked till Master Vblanks. */ -if (!is_trans_port_sync_slave (old_crtc_state)) +if (!is_trans_port_sync_slave (old_crtc_state) && + !intel_dp_mst_is_slave_trans (old_crtc_state))continue ;intel_pre_plane_update (state, crtc);drivers/gpu/drm/i915/display/intel_display_types.h +3
-0@@ -1054,6 +1054,9 @@ struct intel_crtc_state {/* Bitmask to indicate slaves attached */ u8 sync_mode_slaves_mask; + +/* Only valid on TGL+ */ +enum transcoder mst_master_transcoder; };struct intel_crtc {drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0@@ -87,10 +87,53 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, return 0; } +/* +* Iterate over all connectors and return the smallest transcoder in the MST
+ * stream
+ */drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-0+static enum transcoder +intel_dp_mst_master_trans_compute(struct intel_atomic_state*state,
drivers/gpu/drm/i915/display/intel_dp_mst.c +12
-0+ struct intel_dp *mst_port) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_digital_connector_state *conn_state; +struct intel_connector *connector; +enum pipe ret =I915_MAX_PIPES ; +int i; + +if (INTEL_GEN (dev_priv) <12 ) +return INVALID_TRANSCODER ; + + for_each_new_intel_connector_in_state(state, connector,
conn_state, i) {drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; + + if (connector->mst_port != mst_port || !conn_state-Quoted 1 line
base.crtc)
drivers/gpu/drm/i915/display/intel_dp_mst.c +4
-0+continue ; + + crtc =to_intel_crtc (conn_state->base.crtc); + crtc_state = intel_atomic_get_new_crtc_state(state,crtc);
drivers/gpu/drm/i915/display/intel_dp_mst.c +5
-0+if (!crtc_state->uapi.active) +continue ; + +/* +* Using crtc->pipe because crtc_state->cpu_transcoder is
drivers/gpu/drm/i915/display/intel_dp_mst.c static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, · line 126
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +6
-0+* computed, so others CRTCs could have non-computed +* cpu_transcoder +*/ +if (crtc->pipe < ret) + ret = crtc->pipe; + }Still has the problem that ret==I915_MAX_PIPES if no active crtcs in the
state.I guess a simple
if (ret ==MAX_PIPES)return INVALID;should do here. Or something similar.
Quoted 4 lines
Quoted 2 lines
It would never happen, if it is computing state for this MST connector it is active, so it can be master. But okay adding it anyways.
active != enabled. Pretty sure it will happen.
BTW don't we have a testcase that just enable everything and then DPMS off everything? Someone should write one if there isn't one.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 4/7 drm/i915/display: Always enables MST master pipe first
In reply to José Roberto de SouzaDue to DDB overlaps the pipe enabling sequence is not always crescent. As the previous patch selects the smallest pipe/transcoder in the MST stream to be master and it needs to be enabled first, this changes were needed to guarantee that.
So first lets enable all pipes that do not need a fullmodeset as those don't have any external dependency and those are the ones that can overlap with each other.
Then on the second loop it will enable all the pipes that needs a modeset and don't depends on other pipes like MST master pipe/transcoder.
Then finally all the pipes that needs a modeset and have dependency on other pipes, that at this point are alread enabled.
v3: rebased
v4:
- added check for modeset_pipes too to decide if is necessary for a wait a vblank
- added DDB allocation overlap check for pipes that needs a modeset
--- drivers/gpu/drm/i915/display/intel_display.c | 108 ++++++++++++++----- 1 file changed, 83 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +83 -25
@@ -14523,15 +14523,21 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices;u8 required_slices = state->wm_results.ddb.enabled_slices;struct skl_ddb_entry entries[I915_MAX_PIPES ] = {}; -u8 dirty_pipes =0 ; +const u8 num_pipes =INTEL_NUM_PIPES (dev_priv); +u8 update_pipes =0 , modeset_pipes =0 ;int i;for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (!new_crtc_state->hw.active) +continue ; +/* ignore allocations for crtc's that have been turned off. */ -if (!needs_modeset (new_crtc_state) && new_crtc_state->hw.active) +if (!needs_modeset (new_crtc_state)) { entries[i] = old_crtc_state->wm.skl.ddb; -if (new_crtc_state->hw.active) - dirty_pipes |=BIT (crtc->pipe); + update_pipes |=BIT (crtc->pipe); + }else { + modeset_pipes |=BIT (crtc->pipe); + } }/* If 2nd DBuf slice required, enable it here */
@@ -14541,38 +14547,29 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)/* * Whenever the number of active pipes changes, we need to make sure we * update the pipes in the right order so that their ddb allocations -* never overlap with eachother inbetween CRTC updates. Otherwise we'll +* never overlap with each other between CRTC updates. Otherwise we'll * cause pipe underruns and other bad stuff. +* +* So first lets enable all pipes that do not need a fullmodeset as +* those don't have any external dependency. */ -while (dirty_pipes) { +while (update_pipes) {for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {enum pipe pipe = crtc->pipe; -bool modeset =needs_modeset (new_crtc_state); -if ((dirty_pipes &BIT (pipe)) ==0 ) +if ((update_pipes &BIT (pipe)) ==0 )continue ;if (skl_ddb_allocation_overlaps (&new_crtc_state->wm.skl.ddb, - entries, -INTEL_NUM_PIPES (dev_priv), i)) + entries, num_pipes, i))continue ; entries[i] = new_crtc_state->wm.skl.ddb; - dirty_pipes &= ~BIT (pipe); - -if (modeset &&is_trans_port_sync_mode (new_crtc_state)) { -if (is_trans_port_sync_master (new_crtc_state)) -intel_update_trans_port_sync_crtcs (crtc, - state, - old_crtc_state, - new_crtc_state); -else -continue ; - }else { -intel_update_crtc (crtc, state, old_crtc_state, - new_crtc_state); - } + update_pipes &= ~BIT (pipe); + +intel_update_crtc (crtc, state, old_crtc_state, + new_crtc_state);/* * If this is an already active pipe, it's DDB changed,
@@ -14582,11 +14579,72 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)*/ if (!skl_ddb_entry_equal (&new_crtc_state->wm.skl.ddb, &old_crtc_state->wm.skl.ddb) && - !modeset && dirty_pipes) + (update_pipes | modeset_pipes))intel_wait_for_vblank (dev_priv, pipe); } } +/* +* Enable all pipes that needs a modeset and do not depends on other +* pipes +*/ +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, + new_crtc_state, i) { +enum pipe pipe = crtc->pipe; + +if ((modeset_pipes &BIT (pipe)) ==0 ) +continue ; + +if (intel_dp_mst_is_slave_trans (new_crtc_state) || +is_trans_port_sync_slave (new_crtc_state)) +continue ; + +WARN_ON (skl_ddb_allocation_overlaps (&new_crtc_state->wm.skl.ddb, + entries, num_pipes, i)); + + entries[i] = new_crtc_state->wm.skl.ddb; + modeset_pipes &= ~BIT (pipe); + +if (is_trans_port_sync_mode (new_crtc_state)) { +struct intel_crtc *slave_crtc; + +intel_update_trans_port_sync_crtcs (crtc, state, + old_crtc_state, + new_crtc_state); + + slave_crtc =intel_get_slave_crtc (new_crtc_state); +/* TODO: update entries[] of slave */ + modeset_pipes &= ~BIT (slave_crtc->pipe); + + }else { +intel_update_crtc (crtc, state, old_crtc_state, + new_crtc_state); + } + } + +/* +* Finally enable all pipes that needs a modeset and depends on +* other pipes, right now it is only MST slaves as both port sync slave +* and master are enabled together +*/ +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, + new_crtc_state, i) { +enum pipe pipe = crtc->pipe; + +if ((modeset_pipes &BIT (pipe)) ==0 ) +continue ; + +WARN_ON (skl_ddb_allocation_overlaps (&new_crtc_state->wm.skl.ddb, + entries, num_pipes, i)); + + entries[i] = new_crtc_state->wm.skl.ddb; + modeset_pipes &= ~BIT (pipe); + +intel_update_crtc (crtc, state, old_crtc_state, new_crtc_state); + } + +WARN_ON (modeset_pipes); +/* If 2nd DBuf slice is no more required disable it */ if (INTEL_GEN (dev_priv) >=11 && required_slices < hw_enabled_slices)icl_dbuf_slices_update (dev_priv, required_slices);
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 5/7 drm/i915/dp: Fix MST disable sequence
In reply to José Roberto de SouzaThe disable sequence after wait for transcoder off was not correctly implemented.
The MST disable sequence is basically the same for HSW, SKL, ICL and TGL, with just minor changes for TGL.
With this last patch we finally fixed the hotplugs triggered by MST sinks during the disable/enable sequence, those were causing source to try to do a link training while it was not ready causing CPU pipe FIFO underrrus on TGL.
v2: Only unsetting TGL_TRANS_DDI_PORT_MASK for TGL on the post disable sequence
v4: Rebased, moved MST sequences to intel_mst_post_disable_dp()
BSpec: 4231
BSpec: 4163
BSpec: 22243
BSpec: 49190
--- drivers/gpu/drm/i915/display/intel_ddi.c | 31 +++++++++++++------ drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +++++++++++++-------- 2 files changed, 42 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +22 -9
@@ -34,6 +34,7 @@#include "intel_ddi.h" #include "intel_display_types.h" #include "intel_dp.h" +#include "intel_dp_mst.h" #include "intel_dp_link_training.h" #include "intel_dpio_phy.h" #include "intel_dsi.h"
@@ -1949,17 +1950,18 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_statestruct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder); -u32 val =I915_READ (reg); +u32 val; + + val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + val &= ~TRANS_DDI_FUNC_ENABLE ;if (INTEL_GEN (dev_priv) >=12 ) { - val &= ~(TRANS_DDI_FUNC_ENABLE |TGL_TRANS_DDI_PORT_MASK | -TRANS_DDI_DP_VC_PAYLOAD_ALLOC ); +if (!intel_dp_mst_is_master_trans (crtc_state)) + val &= ~TGL_TRANS_DDI_PORT_MASK ; }else { - val &= ~(TRANS_DDI_FUNC_ENABLE |TRANS_DDI_PORT_MASK | -TRANS_DDI_DP_VC_PAYLOAD_ALLOC ); + val &= ~TRANS_DDI_PORT_MASK ; } -I915_WRITE (reg, val); +I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), val);if (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {
@@ -3813,8 +3815,19 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,*/ intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF ); -if (INTEL_GEN (dev_priv) <12 && !is_mst) -intel_ddi_disable_pipe_clock (old_crtc_state); +if (INTEL_GEN (dev_priv) >=12 ) { +if (is_mst) { +enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder; +u32 val; + + val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + val &= ~TGL_TRANS_DDI_PORT_MASK ; +I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), val); + } + }else { +if (!is_mst) +intel_ddi_disable_pipe_clock (old_crtc_state); + }intel_disable_ddi_buf (encoder, old_crtc_state);
drivers/gpu/drm/i915/display/intel_dp_mst.c +20 -13
@@ -344,6 +344,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,to_intel_connector (old_conn_state->connector);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);bool last_mst_stream; +u32 val; intel_dp->active_mst_links--; last_mst_stream = intel_dp->active_mst_links ==0 ;
@@ -354,6 +355,19 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,intel_disable_pipe (old_crtc_state); +drm_dp_update_payload_part2 (&intel_dp->mst_mgr); + + val =I915_READ (TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder)); + val &= ~TRANS_DDI_DP_VC_PAYLOAD_ALLOC ; +I915_WRITE (TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder), val); + +if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status, +DP_TP_STATUS_ACT_SENT ,1 )) +DRM_ERROR ("Timed out waiting for ACT sent when disabling\n" ); +drm_dp_check_act_status (&intel_dp->mst_mgr); + +drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, connector->port); +intel_ddi_disable_transcoder_func (old_crtc_state);if (INTEL_GEN (dev_priv) >=9 )
@@ -361,6 +375,12 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,else ironlake_pfit_disable (old_crtc_state); +/* +* Power down mst path before disabling the port, otherwise we end +* up getting interrupts from the sink upon detecting link loss. +*/ +drm_dp_send_power_updown_phy (&intel_dp->mst_mgr, connector->port, + false);/* * From TGL spec: "If multi-stream slave transcoder: Configure * Transcoder Clock Select to direct no clock to the transcoder"
@@ -371,19 +391,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,if (INTEL_GEN (dev_priv) <12 || !last_mst_stream)intel_ddi_disable_pipe_clock (old_crtc_state); -/* this can fail */ -drm_dp_check_act_status (&intel_dp->mst_mgr); -/* and this can also fail */ -drm_dp_update_payload_part2 (&intel_dp->mst_mgr); - -drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, connector->port); - -/* -* Power down mst path before disabling the port, otherwise we end -* up getting interrupts from the sink upon detecting link loss. -*/ -drm_dp_send_power_updown_phy (&intel_dp->mst_mgr, connector->port, - false); intel_mst->connector =NULL ;if (last_mst_stream)
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 6/7 drm/i915/display: Check if pipe fastset is allowed by external dependencies
In reply to José Roberto de SouzaCheck if fastset is allowed by external dependencies like other pipes and transcoders.
Right now this patch only forces a fullmodeset in MST slaves of MST masters that needs a fullmodeset but it will be needed for port sync as well.
v3:
- moved handling to intel_atomic_check() this way is guarantee that all pipes will have its state computed
v4:
- added a function to return if MST master neeeds modeset to simply code in intel_atomic_check()
v5:
- fixed and moved code to check if MST master needs a modeset
--- drivers/gpu/drm/i915/display/intel_display.c | 70 ++++++++++++++++---- 1 file changed, 57 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +57 -13
@@ -13909,19 +13909,6 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_sta new_crtc_state->uapi.mode_changed = false; new_crtc_state->update_pipe = true; - -/* -* If we're not doing the full modeset we want to -* keep the current M/N values as they may be -* sufficiently different to the computed values -* to cause problems. -* -* FIXME: should really copy more fuzzy state here -*/ - new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; - new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; - new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; - new_crtc_state->has_drrs = old_crtc_state->has_drrs; } static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
@@ -14032,6 +14019,20 @@ static int intel_atomic_check_crtcs(struct intel_atomic_state *state)return 0 ; } +static bool intel_cpu_transcoder_needs_modeset (struct intel_atomic_state *state, +enum transcoder transcoder) +{ +struct intel_crtc_state *new_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) +if (new_crtc_state->cpu_transcoder == transcoder) +return needs_modeset (new_crtc_state); + +return false; +} +/** * intel_atomic_check - validate state object * @dev: drm device
@@ -14089,6 +14090,49 @@ static int intel_atomic_check(struct drm_device *dev, any_ms = true; } +/** +* Check if fastset is allowed by external dependencies like other +* pipes and transcoders. +* +* Right now it only forces a fullmodeset when the MST master +* transcoder did not changed but the pipe of the master transcoder +* needs a fullmodeset so all slaves also needs to do a fullmodeset. +*/ +for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { +enum transcoder master = new_crtc_state->mst_master_transcoder; + +if (!new_crtc_state->uapi.enable || + !intel_dp_mst_is_slave_trans (new_crtc_state) || +needs_modeset (new_crtc_state)) +continue ; + +if (intel_cpu_transcoder_needs_modeset (state, master)) { + new_crtc_state->uapi.mode_changed = true; + new_crtc_state->update_pipe = false; + } + } + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, + new_crtc_state, i) { +if (!new_crtc_state->uapi.enable || +needs_modeset (new_crtc_state) || + !new_crtc_state->update_pipe) +continue ; + +/* +* If we're not doing the full modeset we want to +* keep the current M/N values as they may be +* sufficiently different to the computed values +* to cause problems. +* +* FIXME: should really copy more fuzzy state here +*/ + new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; + new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; + new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; + new_crtc_state->has_drrs = old_crtc_state->has_drrs; + } +if (any_ms && !check_digital_port_conflicts (state)) {DRM_DEBUG_KMS ("rejecting conflicting digital port configuration\n" ); ret =EINVAL ;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 6/7] drm/i915/display: Check if pipe fastset is allowed by external dependencies
Quoted 59 lines · José Roberto de Souza
Check if fastset is allowed by external dependencies like other pipes and transcoders.
Right now this patch only forces a fullmodeset in MST slaves of MST masters that needs a fullmodeset but it will be needed for port sync as well.
v3:
- moved handling tointel_atomic_check()this way is guarantee that all pipes will have its state computedv4:
- added a function to return if MST master neeeds modeset to simply code inintel_atomic_check()v5:
- fixed and moved code to check if MST master needs a modesetCc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Manasi Navare <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 70 ++++++++++++++++---- 1 file changed, 57 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +3
-13@@ -13909,19 +13909,6 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_sta new_crtc_state->uapi.mode_changed = false; new_crtc_state->update_pipe = true; - -/* -* If we're not doing the full modeset we want to -* keep the current M/N values as they may be -* sufficiently different to the computed values -* to cause problems. -* -* FIXME: should really copy more fuzzy state here -*/ - new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; - new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; - new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; - new_crtc_state->has_drrs = old_crtc_state->has_drrs; } static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,@@ -14032,6 +14019,20 @@ static int intel_atomic_check_crtcs(struct intel_atomic_state *state)return 0 ; } +static bool intel_cpu_transcoder_needs_modeset (struct intel_atomic_state *state, +enum transcoder transcoder) +{
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check_crtcs(struct intel_atomic_state *state) · line 14034
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+struct intel_crtc_state *new_crtc_state; +struct intel_crtc *crtc; +int i; + +for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) +if (new_crtc_state->cpu_transcoder == transcoder) +return needs_modeset (new_crtc_state); + +return false; +}
I would highly recommend splitting this patch into two before pushing so that the check vs. copy split goes in first, then the MST thing on top. That way if we have to revert either MST or port sync then at least we keep this part and won't break the other feature in the process.
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14091
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0+/** * intel_atomic_check - validate state object * @dev: drm device @@ -14089,6 +14090,49 @@ static int intel_atomic_check(struct drm_device *dev, any_ms = true; }
Was going to say this any_ms thing has to move, but I guess not really since the below loop won't do anything unless we still have at least one crtc needing a modeset. Probably should move it, but can be done later.
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14104
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +12
-0+/** +* Check if fastset is allowed by external dependencies like other +* pipes and transcoders. +* +* Right now it only forces a fullmodeset when the MST master +* transcoder did not changed but the pipe of the master transcoder +* needs a fullmodeset so all slaves also needs to do a fullmodeset. +*/ +for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { +enum transcoder master = new_crtc_state->mst_master_transcoder; + + if (!new_crtc_state->uapi.enable ||
These uapi.enable checks seem fishy. Should at least be hw.enable since we're past .compute_config() stage already.
Quoted 19 lines
drivers/gpu/drm/i915/display/intel_display.c +19
-0+ !intel_dp_mst_is_slave_trans (new_crtc_state) || + needs_modeset(new_crtc_state)) + continue; + +if (intel_cpu_transcoder_needs_modeset (state, master)) { + new_crtc_state->uapi.mode_changed = true; + new_crtc_state->update_pipe = false; + } + } + +for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, + new_crtc_state, i) { +if (!new_crtc_state->uapi.enable || +needs_modeset (new_crtc_state) || + !new_crtc_state->update_pipe) +continue ; + +/* +* If we're not doing the full modeset we want to
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14133
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+* keep the current M/N values as they may be +* sufficiently different to the computed values +* to cause problems. +* +* FIXME: should really copy more fuzzy state here +*/ + new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; + new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; + new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; + new_crtc_state->has_drrs = old_crtc_state->has_drrs;
Still sad.
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0+ } +if (any_ms && !check_digital_port_conflicts (state)) {DRM_DEBUG_KMS ("rejecting conflicting digital port configuration\n" ); ret =EINVAL ;Signature · 1 line
2.24.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 6/7] drm/i915/display: Check if pipe fastset is allowed by external dependencies
Quoted 79 lines · Ville Syrjälä
Quoted 77 lines · José Roberto de Souza
Check if fastset is allowed by external dependencies like other pipes
and transcoders.Right now this patch only forces a fullmodeset in MST slaves of MST masters that needs a fullmodeset but it will be needed for port sync
as well.v3:
- moved handling tointel_atomic_check()this way is guarantee that all pipes will have its state computedv4:
- added a function to return if MST master neeeds modeset to simply code inintel_atomic_check()v5:
- fixed and moved code to check if MST master needs a modesetCc Ville Syrjälä <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Manasi Navare <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 70 ++++++++++++++++---- 1 file changed, 57 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -13909,19 +13909,6 @@ static void intel_crtc_check_fastset(conststruct
intel_crtc_state*old_crtc_stadrivers/gpu/drm/i915/display/intel_display.c +0
-13new_crtc_state->uapi.mode_changed = false; new_crtc_state->update_pipe = true; - -/* -* If we're not doing the full modeset we want to -* keep the current M/N values as they may be -* sufficiently different to the computed values -* to cause problems. -* -* FIXME: should really copy more fuzzy state here -*/ - new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; - new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; - new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; - new_crtc_state->has_drrs = old_crtc_state->has_drrs; } static int intel_crtc_add_planes_to_state(struct
intel_atomic_state*state,drivers/gpu/drm/i915/display/intel_display.c +8
-0@@ -14032,6 +14019,20 @@ static int intel_atomic_check_crtcs(struct intel_atomic_state *state)return 0 ; } +static bool intel_cpu_transcoder_needs_modeset (struct intel_atomic_state *state, +enum transcoder transcoder) +{ +struct intel_crtc_state *new_crtc_state; +struct intel_crtc *crtc; +int i; + + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state,i)
drivers/gpu/drm/i915/display/intel_display.c +3
-0+if (new_crtc_state->cpu_transcoder == transcoder) +return needs_modeset (new_crtc_state); +
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check_crtcs(struct intel_atomic_state *state) · line 14034
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0+return false; +}I would highly recommend splitting this patch into two before pushing so that the check vs. copy split goes in first, then the MST thing on top. That way if we have to revert either MST or port sync then at least we keep this part and won't break the other feature in the process.
okay, doing that
Quoted 15 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct · line 14092
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0+/** * intel_atomic_check - validate state object * @dev: drm device @@ -14089,6 +14090,49 @@ static int intel_atomic_check(structdrm_device *dev, any_ms = true; }Was going to say this
any_msthing has to move, but I guess not really
since the below loop won't do anything unless we still have at least one crtc needing a modeset. Probably should move it, but can be done later.
Okay
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0+/** +* Check if fastset is allowed by external dependencies like other
drivers/gpu/drm/i915/display/intel_display.c +4
-0+* pipes and transcoders. +* +* Right now it only forces a fullmodeset when the MST master +* transcoder did not changed but the pipe of the master transcoder
drivers/gpu/drm/i915/display/intel_display.c +1
-0+* needs a fullmodeset so all slaves also needs to do a fullmodeset.
drivers/gpu/drm/i915/display/intel_display.c +2
-0+*/ + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state,i) {
drivers/gpu/drm/i915/display/intel_display.c +1
-0+ enum transcoder master = new_crtc_state-
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c
Quoted 3 lines
Quoted 1 line
mst_master_transcoder;drivers/gpu/drm/i915/display/intel_display.c +2
-0+ + if (!new_crtc_state->uapi.enable ||These uapi.enable checks seem fishy. Should at least be hw.enable since
we're past .compute_config() stage already.
Okay
Quoted 26 lines
Quoted 26 lines
drivers/gpu/drm/i915/display/intel_display.c +5
-0+ !intel_dp_mst_is_slave_trans (new_crtc_state) || + needs_modeset(new_crtc_state)) + continue; + +if (intel_cpu_transcoder_needs_modeset (state, master)){
drivers/gpu/drm/i915/display/intel_display.c +6
-0+ new_crtc_state->uapi.mode_changed = true; + new_crtc_state->update_pipe = false; + } + } + + for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,drivers/gpu/drm/i915/display/intel_display.c +12
-0+ new_crtc_state, i) { +if (!new_crtc_state->uapi.enable || +needs_modeset (new_crtc_state) || + !new_crtc_state->update_pipe) +continue ; + +/* +* If we're not doing the full modeset we want to +* keep the current M/N values as they may be +* sufficiently different to the computed values +* to cause problems. +*
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14133
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +6
-0+* FIXME: should really copy more fuzzy state here +*/ + new_crtc_state->fdi_m_n = old_crtc_state->fdi_m_n; + new_crtc_state->dp_m_n = old_crtc_state->dp_m_n; + new_crtc_state->dp_m2_n2 = old_crtc_state->dp_m2_n2; + new_crtc_state->has_drrs = old_crtc_state->has_drrs;Still sad.
Any suggestion how to fix this? I can work on this after this MST fire.
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0+ } +if (any_ms && !check_digital_port_conflicts (state)) { DRM_DEBUG_KMS("rejecting conflicting digital portconfiguration\n");
ret = EINVAL;Signature · 1 line
2.24.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 7/7 drm/i915/display: Add comment to a function that probably can be removed
In reply to José Roberto de SouzaThis function is only called from port sync and it is identical to what will be executed again in intel_update_crtc() over port sync pipes.
If it is really necessary it at least deserves a better name and a comment, leaving it to people working on port sync.
--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +4 -0
@@ -14479,6 +14479,10 @@ static void intel_set_dp_tp_ctl_normal(struct intel_crtc *crtc,intel_dp_stop_link_train (intel_dp); } +/* +* TODO: This is only called from port sync and it is identical to what will be +* executed again in intel_update_crtc() over port sync pipes +*/ static void intel_post_crtc_enable_updates (struct intel_crtc *crtc,struct intel_atomic_state *state) {
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 7/7] drm/i915/display: Add comment to a function that probably can be removed
Quoted 5 lines · José Roberto de Souza
This function is only called from port sync and it is identical to what will be executed again in
intel_update_crtc()over port sync pipes.
If it is really necessary it at least deserves a better name and a comment, leaving it to people working on port sync.
IMO if we need special cases for port sync we should refactor the current code to accomodate that instead of copypasting the whole current implementation, as was done when port sync went it. But yeah, future work.
Quoted 26 lines
Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Manasi Navare <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/display/intel_display.c +4
-0@@ -14479,6 +14479,10 @@ static void intel_set_dp_tp_ctl_normal(struct intel_crtc *crtc,intel_dp_stop_link_train (intel_dp); } +/* +* TODO: This is only called from port sync and it is identical to what will be +* executed again in intel_update_crtc() over port sync pipes +*/ static void intel_post_crtc_enable_updates (struct intel_crtc *crtc,struct intel_atomic_state *state) {Signature · 1 line
2.24.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
URL : https://patchwork.freedesktop.org/series/71221/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 2ff4520c8df4 drm/i915: Introduce intel_crtc_state_alloc() 72fad8e9726a drm/i915/display: Share intel_connector_needs_modeset() -:32: WARNING:BAD_SIGN_OFF: Duplicate signature #32: Reviewed-by: Ville Syrjälä <[email protected]>
total: 0 errors, 1 warnings, 0 checks, 107 lines checkeda19fb41e80f5 drm/i915/tgl: Select master transcoder for MST stream 7a211bf8c84a drm/i915/display: Always enables MST master pipe first 41104775e393 drm/i915/dp: Fix MST disable sequence231c0ffc367f drm/i915/display: Check if pipe fastset is allowed by external dependencies 2565973fa2f2 drm/i915/display: Add comment to a function that probably can be removed
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
URL : https://patchwork.freedesktop.org/series/71221/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7614 -> Patchwork_15861
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/index.html
Known issues
------------
Here are the changes found in Patchwork_15861 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-cml-s: [PASS][1] -> [DMESG-WARN][2] ([fdo#111764])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-cml-s/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-cml-s/igt@[email protected]
* igt@gem_workarounds@basic-read:
- fi-icl-dsi: [PASS][3] -> [DMESG-WARN][4] ([i915#109])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-icl-dsi/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-icl-dsi/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-skl-lmem: [PASS][5] -> [DMESG-WARN][6] ([i915#592])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-skl-lmem/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-skl-lmem/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-ivb-3770: [PASS][7] -> [DMESG-FAIL][8] ([i915#725])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-ivb-3770/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-ivb-3770/igt@i915_selftest@live_blt.html
- fi-hsw-4770: [PASS][9] -> [DMESG-FAIL][10] ([i915#725])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-hsw-4770/igt@i915_selftest@live_blt.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-hsw-4770/igt@i915_selftest@live_blt.html
- fi-bsw-nick: [PASS][11] -> [DMESG-FAIL][12] ([i915#723])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-bsw-nick/igt@i915_selftest@live_blt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-bsw-nick/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-byt-j1900: [PASS][13] -> [INCOMPLETE][14] ([i915#45])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-byt-j1900/igt@i915_selftest@live_gem_contexts.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-byt-j1900/igt@i915_selftest@live_gem_contexts.html
- fi-hsw-peppy: [PASS][15] -> [INCOMPLETE][16] ([i915#694])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
#### Possible fixes ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [DMESG-FAIL][17] ([i915#770]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-hsw-4770r/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-byt-n2820: [INCOMPLETE][19] ([i915#45]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][21] ([i915#44]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-hsw-peppy/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-hsw-peppy/igt@[email protected]
#### Warnings ####
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][23] ([i915#62] / [i915#92]) -> [DMESG-WARN][24] ([i915#62] / [i915#92] / [i915#95]) +5 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-kbl-x1275/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-kbl-x1275/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-kbl-x1275: [DMESG-WARN][25] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][26] ([i915#62] / [i915#92]) +8 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/fi-kbl-x1275/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#111735]: https://bugs.freedesktop.org/show_bug.cgi?id=111735
[fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
[i915#592]: https://gitlab.freedesktop.org/drm/intel/issues/592
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (49 -> 43)
------------------------------
Additional (2): fi-bsw-kefka fi-kbl-7500u
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-tgl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7614 -> Patchwork_15861
CI-20190529: 20190529
CI_DRM_7614: edcf3d79c200934a49a962bebc4d19f8a4849540 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5351: e7fdcef72d1d6b3bb9f3003bbc37571959e6e8bb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15861: 2565973fa2f2e1ba8bb89fa77d77c6c611081045 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2565973fa2f2 drm/i915/display: Add comment to a function that probably can be removed 231c0ffc367f drm/i915/display: Check if pipe fastset is allowed by external dependencies 41104775e393 drm/i915/dp: Fix MST disable sequence7a211bf8c84a drm/i915/display: Always enables MST master pipe first a19fb41e80f5 drm/i915/tgl: Select master transcoder for MST stream 72fad8e9726a drm/i915/display: Share intel_connector_needs_modeset() 2ff4520c8df4 drm/i915: Introduce intel_crtc_state_alloc()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v5,1/7] drm/i915: Introduce intel_crtc_state_alloc()
URL : https://patchwork.freedesktop.org/series/71221/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7614_full -> Patchwork_15861_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15861_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15861_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_15861_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_draw_crc@draw-method-xrgb2101010-blt-ytiled:
- shard-skl: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl1/igt@[email protected]
#### Warnings ####
* igt@i915_selftest@mock_requests:
- shard-snb: [INCOMPLETE][2] ([i915#82]) -> [DMESG-WARN][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-snb1/igt@i915_selftest@mock_requests.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-snb4/igt@i915_selftest@mock_requests.html
* igt@runner@aborted:
- shard-apl: ([FAIL][4], [FAIL][5]) ([i915#716]) -> [FAIL][6]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-apl4/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-apl8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-apl8/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_7614_full and Patchwork_15861_full:
### New Piglit tests (140) ###
* shaders@glsl-kwin-blur-2:
- Statuses : 1 fail(s)
- Exec time: [6.32] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.15] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.44] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.30] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.23] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@!opengl 1.1@copytexsubimage:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl 1.1@depthfunc:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@!opengl 1.1@depthstencil-default_fb-blit:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=2:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=4:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=2:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=8:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=4:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=8:
- Statuses : 1 fail(s)
- Exec time: [0.21] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=6:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=4:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@!opengl 1.1@depthstencil-default_fb-readpixels-32f_24_8_rev:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort:
- Statuses : 1 fail(s)
- Exec time: [0.20] s
* spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=8:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@!opengl 1.2@draw-elements-vs-inputs:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@!opengl 1.2@getteximage-targets 3d:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl 1.2@lodclamp-between:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@!opengl [email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.07] s
* spec@!opengl 3.2@layered-rendering@gl-layer-cube-map:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@amd_shader_trinary_minmax@execution@built-in-functions@tcs-mid3-uint-uint-uint:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@arb_arrays_of_arrays@execution@atomic_counters@vs-indirect-index:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_arrays_of_arrays@execution@sampler@fs-initializer-const-index:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@arb_arrays_of_arrays@execution@sampler@fs-nested-struct-arrays-nonconst-nested-array:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_color_buffer_float@gl_rgba8_snorm-drawpixels:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_copy_image@arb_copy_image-simple --rb-to-tex:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_1d 32 1 1 gl_texture_cube_map 32 32 6 11 0 0 5 13 4 14 1 1:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_1d_array 32 1 12 gl_texture_2d 32 16 1 11 0 3 5 7 0 14 1 1:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_2d 32 32 1 gl_texture_1d_array 32 1 16 11 2 0 5 0 7 14 1 1:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_2d 32 32 1 gl_texture_2d_array 32 16 15 11 12 0 5 7 12 14 8 1:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_2d 32 32 1 gl_texture_cube_map 32 32 6 11 5 0 5 9 2 14 7 1:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@arb_copy_image@arb_copy_image-targets gl_texture_cube_map 32 32 6 gl_texture_rectangle 32 16 1 11 12 3 5 3 0 14 12 1:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* spec@arb_depth_texture@depthstencil-render-miplevels 292 d=z24:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@arb_depth_texture@depthstencil-render-miplevels 585 d=z24:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@arb_framebuffer_object@fbo-drawbuffers-none glblitframebuffer:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@arb_framebuffer_object@fbo-drawbuffers-none gldrawpixels:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_gpu_shader5@execution@ubo_array_indexing@gs-two-arrays:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-lessthan-dvec3-dvec3:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@arb_gpu_shader_fp64@execution@built-in-functions@gs-greaterthan-dvec2-dvec2:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@arb_gpu_shader_fp64@execution@built-in-functions@vs-greaterthanequal-dvec2-dvec2:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_pixel_buffer_object@pbo-drawpixels:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-float-index-wr-before-barrier:
- Statuses : 1 fail(s)
- Exec time: [0.19] s
* spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec4-index-rd-after-barrier:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-vec3-index-rd:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 32 42 1 64 7:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 32 42 8 128 2:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_texture_cube_map_array@texturesize@fs-texturesize-samplercubearrayshadow:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_texture_cube_map_array@texturesize@tes-texturesize-usamplercubearray:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@arb_texture_multisample@texelfetch@4-vs-sampler2dmsarray:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@arb_texture_multisample@texelfetch@6-fs-isampler2dms:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* spec@arb_texture_rg@fbo-generatemipmap-formats:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@arb_texture_rg@texwrap formats-float bordercolor:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat2x3_array3-double_dvec2-position:
- Statuses : 1 fail(s)
- Exec time: [5.76] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat2x4-double_dmat2-position:
- Statuses : 1 fail(s)
- Exec time: [6.28] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat3-float_mat4x3-position:
- Statuses : 1 fail(s)
- Exec time: [5.71] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat3x2-double_dmat3x4-position:
- Statuses : 1 fail(s)
- Exec time: [5.87] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dvec4_array3-position-double_dvec4_array2:
- Statuses : 1 fail(s)
- Exec time: [5.70] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-float_vec2_array3-double_dvec4_array2-position:
- Statuses : 1 fail(s)
- Exec time: [6.58] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-position-double_dvec4_array3-double_dvec2:
- Statuses : 1 fail(s)
- Exec time: [6.33] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-position-float_mat3x4_array3-double_dmat4x2:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-position-int_ivec2_array3-double_dmat3x4_array2:
- Statuses : 1 fail(s)
- Exec time: [6.53] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-position-uint_uvec4-double_dmat4x3:
- Statuses : 1 fail(s)
- Exec time: [6.15] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-ubyte_uvec2-short_ivec2-double_dvec2-position:
- Statuses : 1 fail(s)
- Exec time: [0.21] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-ubyte_uvec4-short_ivec4-double_dmat3-position:
- Statuses : 1 fail(s)
- Exec time: [6.51] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-uint_uvec3_array3-position-double_dvec2_array2:
- Statuses : 1 fail(s)
- Exec time: [5.84] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-uint_uvec4-double_dmat2x3_array2-position:
- Statuses : 1 fail(s)
- Exec time: [6.62] s
* spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-ushort_uvec3-position-double_dmat3:
- Statuses : 1 fail(s)
- Exec time: [6.55] s
* spec@arb_vertex_buffer_object@pos-array:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@ext_framebuffer_multisample@blit-multiple-render-targets 0:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* spec@ext_framebuffer_multisample@blit-multiple-render-targets 2:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@ext_framebuffer_multisample@int-draw-buffers-alpha-to-one 2:
- Statuses : 1 fail(s)
- Exec time: [0.30] s
* spec@ext_framebuffer_multisample@int-draw-buffers-alpha-to-one 4:
- Statuses : 1 fail(s)
- Exec time: [0.22] s
* spec@ext_framebuffer_multisample@interpolation 0 centroid-edges:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* spec@ext_framebuffer_multisample@interpolation 6 non-centroid-disabled:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@ext_framebuffer_object@fbo-generatemipmap-npot:
- Statuses : 1 fail(s)
- Exec time: [0.15] s
* spec@ext_packed_depth_stencil@depthstencil-render-miplevels 1024 ds=z24_s8:
- Statuses : 1 fail(s)
- Exec time: [0.50] s
* spec@ext_packed_depth_stencil@depthstencil-render-miplevels 273 d=s=z24_s8:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* spec@ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-drawpixels-32f_24_8_rev:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@ext_packed_depth_stencil@texwrap formats offset:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* spec@ext_texture_array@fbo-array:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@ext_texture_compression_s3tc@getteximage-targets cube s3tc:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* spec@ext_transform_feedback@intervening-read output:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* [email protected]@[email protected]:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* [email protected]@execution@interpolation@interpolation-none-gl_frontsecondarycolor-flat-fixed:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* [email protected]@execution@interpolation@interpolation-none-other-smooth-vertex:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* [email protected]@execution@interpolation@interpolation-flat-gl_backcolor-smooth-vertex:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* [email protected]@execution@interpolation@interpolation-flat-other-smooth-distance:
- Statuses : 1 fail(s)
- Exec time: [0.15] s
* [email protected]@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-fixed:
- Statuses : 1 fail(s)
- Exec time: [0.18] s
* [email protected]@execution@interpolation@interpolation-noperspective-gl_frontsecondarycolor-flat-distance:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* [email protected]@execution@interpolation@interpolation-smooth-gl_backcolor-flat-distance:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* [email protected]@execution@interpolation@interpolation-smooth-gl_frontcolor-flat-vertex:
- Statuses : 1 fail(s)
- Exec time: [0.18] s
* [email protected]@execution@switch@vs-uniform:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
* [email protected]@execution@tex-miplevel-selection texturegradoffset 2drectshadow:
- Statuses : 1 fail(s)
- Exec time: [0.07] s
* [email protected]@execution@texelfetch@vs-texelfetch-sampler1d:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* [email protected]@execution@texturesize@fs-texturesize-sampler1darray:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* [email protected]@execution@texturesize@fs-texturesize-usampler2darray:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* [email protected]@execution@vs-texturelod-miplevels:
- Statuses : 1 fail(s)
- Exec time: [0.12] s
* [email protected]@execution@texturesize@fs-texturesize-isampler1d:
- Statuses : 1 fail(s)
- Exec time: [0.07] s
* [email protected]@execution@texturesize@fs-texturesize-isampler2d:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* [email protected]@execution@texturesize@fs-texturesize-isamplercube:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* [email protected]@execution@texturesize@gs-texturesize-usampler1darray:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* [email protected]@execution@texturesize@tes-texturesize-sampler1darray:
- Statuses : 1 fail(s)
- Exec time: [0.07] s
* [email protected]@execution@texturesize@tes-texturesize-usampler1darray:
- Statuses : 1 fail(s)
- Exec time: [0.08] s
* [email protected]@execution@variable-indexing@gs-input-array-vec4-index-rd:
- Statuses : 1 fail(s)
- Exec time: [0.19] s
* [email protected]@execution@built-in-functions@fs-notequal-dvec2-dvec2:
- Statuses : 1 fail(s)
- Exec time: [0.09] s
* [email protected]@execution@built-in-functions@gs-lessthanequal-dvec2-dvec2:
- Statuses : 1 fail(s)
- Exec time: [0.11] s
* [email protected]@execution@vs_in@vs-input-double_dmat2x4-double_dmat2x4_array2-position:
- Statuses : 1 fail(s)
- Exec time: [6.02] s
* [email protected]@execution@vs_in@vs-input-double_dmat2x4-int_ivec3-position:
- Statuses : 1 fail(s)
- Exec time: [6.06] s
* [email protected]@execution@vs_in@vs-input-double_dmat4x2-position-double_dmat4x3:
- Statuses : 1 fail(s)
- Exec time: [5.75] s
* [email protected]@execution@vs_in@vs-input-double_dvec2-position-float_mat2:
- Statuses : 1 fail(s)
- Exec time: [5.74] s
* [email protected]@execution@vs_in@vs-input-double_dvec3-position-int_ivec3:
- Statuses : 1 fail(s)
- Exec time: [6.01] s
* [email protected]@execution@vs_in@vs-input-double_dvec3_array5-position-uint_uvec2:
- Statuses : 1 fail(s)
- Exec time: [5.72] s
* [email protected]@execution@vs_in@vs-input-double_dvec4_array3-double_double_array2-position:
- Statuses : 1 fail(s)
- Exec time: [5.87] s
* [email protected]@execution@vs_in@vs-input-float_mat2x3-position-double_dmat3:
- Statuses : 1 fail(s)
- Exec time: [5.78] s
* [email protected]@execution@vs_in@vs-input-float_vec2_array3-double_dmat2-position:
- Statuses : 1 fail(s)
- Exec time: [5.93] s
* [email protected]@execution@vs_in@vs-input-position-double_dvec3_array5-float_mat3x4:
- Statuses : 1 fail(s)
- Exec time: [5.78] s
* [email protected]@execution@vs_in@vs-input-position-double_dvec4_array3-double_dmat3x2_array2:
- Statuses : 1 fail(s)
- Exec time: [5.78] s
* [email protected]@execution@vs_in@vs-input-position-float_mat2-double_dmat2x3:
- Statuses : 1 fail(s)
- Exec time: [6.07] s
* [email protected]@execution@vs_in@vs-input-position-uint_uvec3_array3-double_dmat3x4_array2:
- Statuses : 1 fail(s)
- Exec time: [6.05] s
* [email protected]@execution@vs_in@vs-input-ubyte_uint-position-short_int-double_dvec3:
- Statuses : 1 fail(s)
- Exec time: [5.73] s
* [email protected]@execution@vs_in@vs-input-uint_uvec3_array3-double_dmat2x3-position:
- Statuses : 1 fail(s)
- Exec time: [5.91] s
* [email protected]@execution@built-in-functions@cs-all-bvec4-using-if:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* [email protected]@execution@built-in-functions@cs-greaterthan-ivec2-ivec2:
- Statuses : 1 fail(s)
- Exec time: [0.14] s
* [email protected]@execution@built-in-functions@cs-greaterthan-ivec3-ivec3:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* [email protected]@execution@built-in-functions@cs-op-eq-bvec3-bvec3:
- Statuses : 1 fail(s)
- Exec time: [0.17] s
* [email protected]@execution@built-in-functions@cs-op-lt-int-int-using-if:
- Statuses : 1 fail(s)
- Exec time: [0.13] s
* [email protected]@execution@built-in-functions@cs-op-ne-bvec2-bvec2-using-if:
- Statuses : 1 fail(s)
- Exec time: [0.10] s
Known issues
------------
Here are the changes found in Patchwork_15861_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([i915#456])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb1/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-persistence:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276] / [fdo#112080])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb8/igt@[email protected]
* igt@gem_ctx_shared@q-smoketest-bsd1:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([fdo#111735]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb3/igt@[email protected]
* igt@gem_eio@suspend:
- shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([i915#460])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb2/igt@[email protected]
* igt@gem_exec_create@madvise:
- shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([i915#435])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb4/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb4/igt@[email protected]
* igt@gem_exec_schedule@fifo-bsd1:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109276]) +11 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb6/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#112146]) +8 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb2/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive:
- shard-tglb: [PASS][21] -> [TIMEOUT][22] ([fdo#112126] / [i915#530])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb9/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb2/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-hsw: [PASS][23] -> [FAIL][24] ([i915#520])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-hsw2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-hsw5/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [PASS][25] -> [FAIL][26] ([i915#644])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-glk4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-glk1/igt@[email protected]
- shard-apl: [PASS][27] -> [FAIL][28] ([i915#644])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-apl3/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-apl7/igt@[email protected]
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][29] -> [DMESG-WARN][30] ([i915#180]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-apl2/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-apl8/igt@[email protected]
* igt@kms_color@pipe-b-ctm-blue-to-red:
- shard-skl: [PASS][31] -> [DMESG-WARN][32] ([i915#109])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-skl6/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl2/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x128-sliding:
- shard-skl: [PASS][33] -> [FAIL][34] ([i915#54])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-skl10/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl8/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-tglb: [PASS][35] -> [INCOMPLETE][36] ([i915#456] / [i915#460]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb5/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb5/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled:
- shard-skl: [PASS][37] -> [INCOMPLETE][38] ([i915#646] / [i915#667])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-skl9/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite:
- shard-tglb: [PASS][39] -> [FAIL][40] ([i915#49])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-tglb: [PASS][41] -> [DMESG-WARN][42] ([i915#766])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb2/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [PASS][43] -> [INCOMPLETE][44] ([fdo#103665])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-kbl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-kbl3/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-kbl: [PASS][45] -> [DMESG-WARN][46] ([i915#180]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-kbl3/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-kbl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][47] -> [FAIL][48] ([fdo#108145])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-skl1/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][49] -> [FAIL][50] ([fdo#108145] / [i915#265])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-skl8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-skl8/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][51] -> [SKIP][52] ([fdo#109642] / [fdo#111068])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb2/igt@kms_psr2_su@page_flip.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb6/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [PASS][53] -> [SKIP][54] ([fdo#109441]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb8/igt@kms_psr@psr2_sprite_mmap_gtt.html
* igt@perf_pmu@busy-no-semaphores-vcs1:
- shard-iclb: [PASS][55] -> [SKIP][56] ([fdo#112080]) +11 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-iclb2/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-iclb6/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-tglb: [INCOMPLETE][57] ([i915#456]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7614/shard-tglb7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/shard-tglb1/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [SKIP][59] ([fdo#109276] / [fdo#112080]) -> [PASS][60] +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/dr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15861/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx