drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
Subsystems (3)
PATCH 1/6 drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
In case of tiled displays when the two tiles are sent across two CRTCs over two separate DP SST connectors, we need a mechanism to synchronize the two CRTCs and their corresponding transcoders.
So use the master-slave mode where there is one master corresponding to last horizontal and vertical tile that needs to be genlocked with all other slave tiles.
This patch identifies saves the master transcoder in all the slave CRTC states. This is needed to select the master CRTC/transcoder while configuring transcoder port sync for the corresponding slaves.
v4:
* Rebase
v3:
* Use master_tramscoder instead of master_crtc for valid
HW state readouts (Ville)
v2:
* Move this to intel_mode_set_pipe_config(Jani N, Ville)
* Use slave_bitmask to save associated slaves in master crtc state (Ville)
--- drivers/gpu/drm/i915/display/intel_display.c | 105 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_display.h | 1 + .../drm/i915/display/intel_display_types.h | 6 + 3 files changed, 112 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +105 -0
@@ -11760,6 +11760,91 @@ static bool c8_planes_changed(const struct intel_crtc_state *new_crtc_state)return !old_crtc_state->c8_planes != !new_crtc_state->c8_planes; } +static int icl_add_sync_mode_crtcs (struct drm_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct drm_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_connector *master_connector, *connector; +struct drm_connector_state *connector_state; +struct drm_connector_list_iter conn_iter; +struct drm_crtc *master_crtc =NULL ; +struct drm_crtc_state *master_crtc_state; +struct intel_crtc_state *master_pipe_config; +int i, tile_group_id; + +if (INTEL_GEN (dev_priv) <11 ) +return 0 ; + +/* +* In case of tiled displays there could be one or more slaves but there is +* only one master. Lets make the CRTC used by the connector corresponding +* to the last horizonal and last vertical tile a master/genlock CRTC. +* All the other CRTCs corresponding to other tiles of the same Tile group +* are the slave CRTCs and hold a pointer to their genlock CRTC. +*/ +for_each_new_connector_in_state (state, connector, connector_state, i) { +if (connector_state->crtc != crtc) +continue ; +if (!connector->has_tile) +continue ; +if (crtc_state->base.mode.hdisplay != connector->tile_h_size || + crtc_state->base.mode.vdisplay != connector->tile_v_size) +return 0 ; +if (connector->tile_h_loc == connector->num_h_tile -1 && + connector->tile_v_loc == connector->num_v_tile -1 ) +continue ; + crtc_state->sync_mode_slaves_mask =0 ; + tile_group_id = connector->tile_group->id; +drm_connector_list_iter_begin (&dev_priv->drm, &conn_iter); +drm_for_each_connector_iter (master_connector, &conn_iter) { +struct drm_connector_state *master_conn_state =NULL ; + +if (!master_connector->has_tile) +continue ; +if (master_connector->tile_h_loc != master_connector->num_h_tile -1 || + master_connector->tile_v_loc != master_connector->num_v_tile -1 ) +continue ; +if (master_connector->tile_group->id != tile_group_id) +continue ; + + master_conn_state =drm_atomic_get_connector_state (state, + master_connector); +if (IS_ERR (master_conn_state)) { +drm_connector_list_iter_end (&conn_iter); +return PTR_ERR (master_conn_state); + } +if (master_conn_state->crtc) { + master_crtc = master_conn_state->crtc; +break ; + } + } +drm_connector_list_iter_end (&conn_iter); + +if (!master_crtc) { +DRM_DEBUG_KMS ("Could not find Master CRTC for Slave CRTC %d\n" , + connector_state->crtc->base.id); +return -EINVAL ; + } + + master_crtc_state =drm_atomic_get_crtc_state (state, + master_crtc); +if (IS_ERR (master_crtc_state)) +return PTR_ERR (master_crtc_state); + + master_pipe_config =to_intel_crtc_state (master_crtc_state); + crtc_state->master_transcoder = master_pipe_config->cpu_transcoder; + master_pipe_config->sync_mode_slaves_mask |= +BIT (crtc_state->cpu_transcoder); +DRM_DEBUG_KMS ("Master Transcoder = %s added for Slave CRTC = %d, slave transcoder bitmask = %d\n" , +transcoder_name (crtc_state->master_transcoder), + crtc_state->base.crtc->base.id, + master_pipe_config->sync_mode_slaves_mask); + } + +return 0 ; +} +static int intel_crtc_atomic_check (struct drm_crtc *_crtc,struct drm_crtc_state *_crtc_state) {
@@ -12263,6 +12348,12 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)if (IS_G4X (dev_priv) ||IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) saved_state->wm = crtc_state->wm; +/* Save the slave bitmask which gets filled for master crtc state during +* slave atomic check call. +*/ +if (is_trans_port_sync_master (dev_priv, crtc_state)) + saved_state->sync_mode_slaves_mask = + crtc_state->sync_mode_slaves_mask;/* Keep base drm_crtc_state intact, only clear our extended struct */ BUILD_BUG_ON (offsetof(struct intel_crtc_state , base));
@@ -12356,6 +12447,15 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)drm_mode_set_crtcinfo (&pipe_config->base.adjusted_mode,CRTC_STEREO_DOUBLE ); +/* Set the crtc_state defaults for trans_port_sync */ + pipe_config->master_transcoder =INVALID_TRANSCODER ; + ret =icl_add_sync_mode_crtcs (crtc, pipe_config, state); +if (ret) { +DRM_DEBUG_KMS ("Cannot assign Sync Mode CRTCs: %d\n" , + ret); +return ret; + } +/* Pass our mode to the connectors and the CRTC to give them a chance to * adjust it according to limitations or connector properties, and also * a chance to reject the mode entirely.
@@ -12869,6 +12969,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_INFOFRAME (hdmi);PIPE_CONF_CHECK_INFOFRAME (drm); +if (INTEL_GEN (dev_priv) >=11 ) { +PIPE_CONF_CHECK_I (sync_mode_slaves_mask); +PIPE_CONF_CHECK_I (master_transcoder); + } +#undef PIPE_CONF_CHECK_X#undef PIPE_CONF_CHECK_I#undef PIPE_CONF_CHECK_BOOL
drivers/gpu/drm/i915/display/intel_display.h +1 -0
@@ -92,6 +92,7 @@ enum pipe {#define pipe_name (p) ((p) + 'A')enum transcoder { +INVALID_TRANSCODER =-1 ,/* * The following transcoders have a 1:1 transcoder -> pipe mapping, * keep their values fixed: the code assumes that TRANSCODER_A=0, the
drivers/gpu/drm/i915/display/intel_display_types.h +6 -0
@@ -991,6 +991,12 @@ struct intel_crtc_state {/* Forward Error correction State */ bool fec_enable; + +/* Pointer to master transcoder in case of tiled displays */ +enum transcoder master_transcoder; + +/* Bitmask to indicate slaves attached */ +u8 sync_mode_slaves_mask; };struct intel_crtc {
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/6 drm/i915/display/icl: Enable TRANSCODER PORT SYNC for tiled displays across separate ports
In case of tiled displays where different tiles are displayed across different ports, we need to synchronize the transcoders involved. This patch implements the transcoder port sync feature for synchronizing one master transcoder with one or more slave transcoders. This is only enbaled in slave transcoder
and the master transcoder is unaware that it is operating in this mode.
This has been tested with tiled display connected to ICL.
v5:
* Add TRANSCODER_D case and MISSING_CASE (Maarten) v4:
Rebase
v3:
* Check of DP_MST moved to atomic_check (Maarten)
v2:
* Do not use RMW, just write to the register in commit (Jani N)
Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/display/intel_display.c | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +46 -0
@@ -4395,6 +4395,49 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)I915_WRITE (PIPE_CHICKEN (pipe), tmp); } +static void icl_enable_trans_port_sync (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +u32 trans_ddi_func_ctl2_val; +u8 master_select; + +/* +* Configure the master select and enable Transcoder Port Sync for +* Slave CRTCs transcoder. +*/ +if (crtc_state->master_transcoder ==INVALID_TRANSCODER ) +return ; + +switch (crtc_state->master_transcoder) { +case TRANSCODER_A : + master_select =1 ; +break ; +case TRANSCODER_B : + master_select =2 ; +break ; +case TRANSCODER_C : + master_select =3 ; +break ; +case TRANSCODER_D : + master_select =4 ; +break ; +case TRANSCODER_EDP : +default : +MISSING_CASE (crtc_state->master_transcoder); + master_select =0 ; + } +/* Set the master select bits for Tranascoder Port Sync */ + trans_ddi_func_ctl2_val = (PORT_SYNC_MODE_MASTER_SELECT (master_select) & +PORT_SYNC_MODE_MASTER_SELECT_MASK ) << +PORT_SYNC_MODE_MASTER_SELECT_SHIFT ; +/* Enable Transcoder Port Sync */ + trans_ddi_func_ctl2_val |=PORT_SYNC_MODE_ENABLE ; + +I915_WRITE (TRANS_DDI_FUNC_CTL2 (crtc_state->cpu_transcoder), + trans_ddi_func_ctl2_val); +} +static void intel_update_pipe_config (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) {
@@ -6463,6 +6506,9 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,if (!transcoder_is_dsi (cpu_transcoder))intel_set_pipe_timings (pipe_config); +if (INTEL_GEN (dev_priv) >=11 ) +icl_enable_trans_port_sync (pipe_config); +intel_set_pipe_src_size (pipe_config); if (cpu_transcoder != TRANSCODER_EDP &&
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/6 drm/i915/display/icl: HW state readout for transcoder port sync config
In reply to Manasi NavareAfter the state is committed, we readout the HW registers and compare the HW state with the SW state that we just committed.
For Transcdoer port sync, we add master_transcoder and the salves bitmask to the crtc_state, hence we need to read those during the HW state readout to avoid pipe state mismatch.
v2:
* Add Transcoder_D and MISSING_CASE (Maarten)
--- drivers/gpu/drm/i915/display/intel_display.c | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +49 -0
@@ -10439,6 +10439,52 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc, } } +static void icelake_get_trans_port_sync_config (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +u32 trans_port_sync, transcoders, master_select; +enum transcoder cpu_transcoder; + + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (pipe_config->cpu_transcoder)); +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) { + master_select = trans_port_sync & +PORT_SYNC_MODE_MASTER_SELECT_MASK ; +switch (master_select) { +case 1 : + pipe_config->master_transcoder =TRANSCODER_A ; +break ; +case 2 : + pipe_config->master_transcoder =TRANSCODER_B ; +break ; +case 3 : + pipe_config->master_transcoder =TRANSCODER_C ; +break ; +case 4 : + pipe_config->master_transcoder =TRANSCODER_D ; +break ; +default : +MISSING_CASE (master_select); + } + + pipe_config->sync_mode_slaves_mask =0 ; + }else { + pipe_config->master_transcoder =INVALID_TRANSCODER ; + + transcoders =BIT (TRANSCODER_EDP ) | +BIT (TRANSCODER_A ) | +BIT (TRANSCODER_B ) | +BIT (TRANSCODER_C ); +for_each_cpu_transcoder_masked (dev_priv, cpu_transcoder, transcoders) { + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (cpu_transcoder)); + +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) + pipe_config->sync_mode_slaves_mask |=BIT (cpu_transcoder); + } + } +} +static bool haswell_get_pipe_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {
@@ -10535,6 +10581,9 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, pipe_config->pixel_multiplier =1 ; } +if (INTEL_GEN (dev_priv) >=11 ) +icelake_get_trans_port_sync_config (crtc, pipe_config); + out:for_each_power_domain (power_domain, power_domain_mask) intel_display_power_put(dev_priv,
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [CI 3/6] drm/i915/display/icl: HW state readout for transcoder port sync config
Op 18-09-2019 om 02:33 schreef Manasi Navare:
Quoted 54 lines
After the state is committed, we readout the HW registers and compare the HW state with the SW state that we just committed.
For Transcdoer port sync, we addmaster_transcoderand the salves bitmask to thecrtc_state, hence we need to read those during the HW state readout to avoid pipe state mismatch.v2:
* AddTranscoder_DandMISSING_CASE(Maarten)Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+)drivers/gpu/drm/i915/display/intel_display.c +27
-0@@ -10439,6 +10439,52 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc, } } +static void icelake_get_trans_port_sync_config (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +u32 trans_port_sync, transcoders, master_select; +enum transcoder cpu_transcoder; + + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (pipe_config->cpu_transcoder)); +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) { + master_select = trans_port_sync & +PORT_SYNC_MODE_MASTER_SELECT_MASK ; +switch (master_select) { +case 1 : + pipe_config->master_transcoder =TRANSCODER_A ; +break ; +case 2 : + pipe_config->master_transcoder =TRANSCODER_B ; +break ; +case 3 : + pipe_config->master_transcoder =TRANSCODER_C ; +break ; +case 4 : + pipe_config->master_transcoder =TRANSCODER_D ; +break ; +default : +MISSING_CASE (master_select);
drivers/gpu/drm/i915/display/intel_display.c static void haswell_get_ddi_port_state(struct intel_crtc *crtc, · line 10478
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+ } + + pipe_config->sync_mode_slaves_mask =0 ; + }else { + pipe_config->master_transcoder =INVALID_TRANSCODER ; + + transcoders =BIT (TRANSCODER_EDP ) | +BIT (TRANSCODER_A ) | +BIT (TRANSCODER_B ) | +BIT (TRANSCODER_C );
^Missed one spot for transcoder D.. also EDP is still here?
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +9
-0+for_each_cpu_transcoder_masked (dev_priv, cpu_transcoder, transcoders) { + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (cpu_transcoder)); + +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) + pipe_config->sync_mode_slaves_mask |=BIT (cpu_transcoder); + } + } +} +static bool haswell_get_pipe_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {
drivers/gpu/drm/i915/display/intel_display.c static bool haswell_get_pipe_config(struct intel_crtc *crtc, · line 10589
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0@@ -10535,6 +10581,9 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, pipe_config->pixel_multiplier =1 ; } +if (INTEL_GEN (dev_priv) >=11 ) +icelake_get_trans_port_sync_config (crtc, pipe_config); + out:for_each_power_domain (power_domain, power_domain_mask) intel_display_power_put(dev_priv,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [CI 3/6] drm/i915/display/icl: HW state readout for transcoder port sync config
Quoted 58 lines · Maarten Lankhorst
Op 18-09-2019 om 02:33 schreef Manasi Navare:
Quoted 57 lines
After the state is committed, we readout the HW registers and compare the HW state with the SW state that we just committed.
For Transcdoer port sync, we addmaster_transcoderand the salves bitmask to thecrtc_state, hence we need to read those during the HW state readout to avoid pipe state mismatch.v2:
* AddTranscoder_DandMISSING_CASE(Maarten)Cc Ville Syrjälä <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Matt Roper <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+)drivers/gpu/drm/i915/display/intel_display.c +30
-0@@ -10439,6 +10439,52 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc, } } +static void icelake_get_trans_port_sync_config (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +u32 trans_port_sync, transcoders, master_select; +enum transcoder cpu_transcoder; + + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (pipe_config->cpu_transcoder)); +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) { + master_select = trans_port_sync & +PORT_SYNC_MODE_MASTER_SELECT_MASK ; +switch (master_select) { +case 1 : + pipe_config->master_transcoder =TRANSCODER_A ; +break ; +case 2 : + pipe_config->master_transcoder =TRANSCODER_B ; +break ; +case 3 : + pipe_config->master_transcoder =TRANSCODER_C ; +break ; +case 4 : + pipe_config->master_transcoder =TRANSCODER_D ; +break ; +default : +MISSING_CASE (master_select); + } + + pipe_config->sync_mode_slaves_mask =0 ;
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static void haswell_get_ddi_port_state(struct intel_crtc *crtc, · line 10478
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +7
-0+ }else { + pipe_config->master_transcoder =INVALID_TRANSCODER ; + + transcoders =BIT (TRANSCODER_EDP ) | +BIT (TRANSCODER_A ) | +BIT (TRANSCODER_B ) | +BIT (TRANSCODER_C );^Missed one spot for transcoder D.. also EDP is still here?
No EDP should be out and TRANS D added, will make that change, sorry about that
Regards
Manasi
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/display/intel_display.c +9
-0+for_each_cpu_transcoder_masked (dev_priv, cpu_transcoder, transcoders) { + trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (cpu_transcoder)); + +if (trans_port_sync &PORT_SYNC_MODE_ENABLE ) + pipe_config->sync_mode_slaves_mask |=BIT (cpu_transcoder); + } + } +} +static bool haswell_get_pipe_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {@@ -10535,6 +10581,9 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, pipe_config->pixel_multiplier =1 ; }
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static bool haswell_get_pipe_config(struct intel_crtc *crtc, · line 10589
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0+if (INTEL_GEN (dev_priv) >=11 ) +icelake_get_trans_port_sync_config (crtc, pipe_config); + out:for_each_power_domain (power_domain, power_domain_mask) intel_display_power_put(dev_priv,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/6 drm/i915/display/icl: Enable master-slaves in trans port sync
In reply to Manasi NavareAs per the display enable sequence, we need to follow the enable sequence for slaves first with DP_TP_CTL set to Idle and configure the transcoder port sync register to select the corersponding master, then follow the enable sequence for master leaving DP_TP_CTL to idle.
At this point the transcoder port sync mode is configured and enabled and the Vblanks of both ports are synchronized so then set DP_TP_CTL for the slave and master to Normal and do post crtc enable updates.
v6:
* Modeset implies active_changed, remove one condition (Maarten) v5:
* Fix checkpatch warning (Manasi)
v4:
* Reuse skl_commit_modeset_enables() hook (Maarten)
* Obtain slave crtc and states from master (Maarten) v3:
* Rebase on drm-tip (Manasi)
v2:
* Create a icl_update_crtcs hook (Maarten, Danvet)
* This sequence only for CRTCs in trans port sync mode (Maarten)
--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 +- drivers/gpu/drm/i915/display/intel_display.c | 159 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_display.h | 4 + 3 files changed, 162 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +2 -1
@@ -3347,7 +3347,8 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder *encoder, true);intel_dp_sink_set_fec_ready (intel_dp, crtc_state);intel_dp_start_link_train (intel_dp); -if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 ) +if ((port !=PORT_A ||INTEL_GEN (dev_priv) >=9 ) && + !is_trans_port_sync_mode (dev_priv, crtc_state))intel_dp_stop_link_train (intel_dp);intel_ddi_enable_fec (encoder, crtc_state);
drivers/gpu/drm/i915/display/intel_display.c +156 -3
192 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +4 -0
@@ -27,6 +27,7 @@#include <drm/drm_util.h> #include <drm/i915_drm.h> +#include "intel_dp_link_training.h" enum link_m_n_set ;struct dpll ;
@@ -53,6 +54,7 @@ struct intel_plane;struct intel_plane_state ;struct intel_remapped_info ;struct intel_rotation_info ; +struct intel_crtc_state ;enum i915_gpio {GPIOA ,
@@ -450,6 +452,8 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, u32 pixel_format, u64 modifier);bool intel_plane_can_remap (const struct intel_plane_state *plane_state);enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port); +bool is_trans_port_sync_mode (struct drm_i915_private *i915, +const struct intel_crtc_state *state);void intel_plane_destroy (struct drm_plane *plane);void i830_enable_pipe (struct drm_i915_private *dev_priv,enum pipe pipe);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/6 drm/i915/display/icl: Disable transcoder port sync as part of crtc_disable() sequence
In reply to Manasi NavareThis clears the transcoder port sync bits of the TRANS_DDI_FUNC_CTL2 register during crtc_disable().
--- drivers/gpu/drm/i915/display/intel_display.c | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +23 -0
@@ -4456,6 +4456,26 @@ static void icl_enable_trans_port_sync(const struct intel_crtc_state *crtc_state trans_ddi_func_ctl2_val); } +static void icl_disable_transcoder_port_sync (const struct intel_crtc_state *old_crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +i915_reg_t reg; +u32 trans_ddi_func_ctl2_val; + +if (old_crtc_state->master_transcoder ==INVALID_TRANSCODER ) +return ; + +DRM_DEBUG_KMS ("Disabling Transcoder Port Sync on Slave Transcoder %s\n" , +transcoder_name (old_crtc_state->cpu_transcoder)); + + reg =TRANS_DDI_FUNC_CTL2 (old_crtc_state->cpu_transcoder); + trans_ddi_func_ctl2_val =I915_READ (reg); + trans_ddi_func_ctl2_val &= ~(PORT_SYNC_MODE_ENABLE | +PORT_SYNC_MODE_MASTER_SELECT_MASK ); +I915_WRITE (reg, trans_ddi_func_ctl2_val); +} +static void intel_update_pipe_config (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) {
@@ -6705,6 +6725,9 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (intel_crtc_has_type (old_crtc_state,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (old_crtc_state, false); +if (INTEL_GEN (dev_priv) >=11 ) +icl_disable_transcoder_port_sync (old_crtc_state); +if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_transcoder_func (old_crtc_state);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/6 drm/i915/display/icl: In port sync mode disable slaves first then master
In reply to Manasi NavareIn the transcoder port sync mode, the slave transcoders mask their vblanks until master transcoder's vblank so while disabling them, make sure slaves are disabled first and then the masters.
v4:
* Obtain slave state from master (Maarten)
v3:
* Rebase
v2:
* Use the intel_old_crtc_state_disables() helper
--- drivers/gpu/drm/i915/display/intel_display.c | 62 ++++++++++++++++++-- 1 file changed, 56 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +56 -6
@@ -13977,8 +13977,42 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state, new_crtc_state); } +static void intel_trans_port_sync_modeset_disables (struct intel_atomic_state *state, +struct intel_crtc *crtc, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_crtc *slave_crtc =intel_get_slave_crtc (dev_priv, + new_crtc_state); +struct intel_crtc_state *new_slave_crtc_state = +intel_atomic_get_new_crtc_state (state, slave_crtc); +struct intel_crtc_state *old_slave_crtc_state = +intel_atomic_get_old_crtc_state (state, slave_crtc); + +WARN_ON (!slave_crtc || !new_slave_crtc_state || + !old_slave_crtc_state); + +/* Disable Slave first */ +intel_pre_plane_update (old_slave_crtc_state, new_slave_crtc_state); +if (old_slave_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_slave_crtc_state, + new_slave_crtc_state, + slave_crtc); + +/* Disable Master */ +intel_pre_plane_update (old_crtc_state, new_crtc_state); +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); +} +static void intel_commit_modeset_disables (struct intel_atomic_state *state) { +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc_state *new_crtc_state, *old_crtc_state;struct intel_crtc *crtc;int i;
@@ -13995,13 +14029,29 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)if (!needs_modeset (new_crtc_state))continue ; -intel_pre_plane_update (old_crtc_state, new_crtc_state); +/* In case of Transcoder port Sync master slave CRTCs can be +* assigned in any order and we need to make sure that +* slave CRTCs are disabled first and then master CRTC since +* Slave vblanks are masked till Master Vblanks. +*/ +if (is_trans_port_sync_mode (dev_priv, new_crtc_state)) { +if (is_trans_port_sync_master (dev_priv, + new_crtc_state)) +intel_trans_port_sync_modeset_disables (state, + crtc, + old_crtc_state, + new_crtc_state); +else +continue ; + }else { +intel_pre_plane_update (old_crtc_state, new_crtc_state); -if (old_crtc_state->base.active) -intel_old_crtc_state_disables (state, - old_crtc_state, - new_crtc_state, - crtc); +if (old_crtc_state->base.active) +intel_old_crtc_state_disables (state, + old_crtc_state, + new_crtc_state, + crtc); + } } }
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [CI,1/6] drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [CI,1/6] drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
URL : https://patchwork.freedesktop.org/series/66835/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [CI,1/6] drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [CI,1/6] drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
URL : https://patchwork.freedesktop.org/series/66835/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6911 -> Patchwork_14436
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14436 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14436, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14436:
### IGT changes ###
#### Possible regressions ####
* igt@kms_busy@basic-flip-a:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-icl-u3/igt@[email protected]
- fi-icl-u2: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-icl-u2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14436 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_getparams_basic@basic-eu-total:
- fi-icl-u3: [PASS][5] -> [DMESG-WARN][6] ([fdo#107724]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_mmap_gtt@basic-write-no-prefault:
- fi-icl-u3: [DMESG-WARN][7] ([fdo#107724]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-icl-u3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-icl-u3/igt@[email protected]
* igt@i915_module_load@reload:
- fi-blb-e6850: [INCOMPLETE][9] ([fdo#107718]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-blb-e6850/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-blb-e6850/igt@[email protected]
#### Warnings ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][11] ([fdo#111407]) -> [FAIL][12] ([fdo#111096])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6911/fi-kbl-7500u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/fi-kbl-7500u/igt@[email protected]
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
Participating hosts (54 -> 47)
------------------------------
Additional (1): fi-icl-guc
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6911 -> Patchwork_14436
CI-20190529: 20190529
CI_DRM_6911: 2e04def5afc3b2bd724dc6f3f6525c5ebf1f87d2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5189: c78b9959fa4050725b16d55a5e56315884a2753d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14436: f3076b0b8007a2a5d424e3e7f19588cf519a180d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f3076b0b8007 drm/i915/display/icl: In port sync mode disable slaves first then master 7413f273f931 drm/i915/display/icl: Disable transcoder port sync as part of crtc_disable() sequence afc2925b8f30 drm/i915/display/icl: Enable master-slaves in trans port sync1e2980d136ba drm/i915/display/icl: HW state readout for transcoder port sync config c05137212238 drm/i915/display/icl: Enable TRANSCODER PORT SYNC for tiled displays across separate ports a6f2109d13c4 drm/i915/display/icl: Save Master transcoder in slave's crtc_state for Transcoder Port Sync
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14436/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx