In case of tiled connectors if one of the tiled connectors in state needs a full modeset we add other tiled connectors to the state. Make sure that the connector has a CRTC before forcing a modeset on that else it fails committing the state.
Cc: Ville Syrjälä <[email protected]> Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset") Closes: https://gitlab.freedesktop.org/drm/intel/issues/516 Signed-off-by: Manasi Navare <[email protected]> Acked-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 32c6940c9077..81addaea616b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -13155,11 +13155,12 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) } /* Get total number of tiled connectors in state that belong to - * this tile group. + * this tile group and that have a CRTC */ for_each_new_connector_in_state(state, connector, connector_state, i) { if (connector->has_tile && - connector->tile_group->id == tile_group_id) + connector->tile_group->id == tile_group_id && + connector_state->crtc) num_tiled_conns++; } @@ -14506,13 +14507,14 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id) continue; conn_state = drm_atomic_get_connector_state(&state->base, connector); + if (IS_ERR(conn_state)) { ret = PTR_ERR(conn_state); break; } if (!conn_state->crtc) - continue; + break; crtc_state = drm_atomic_get_crtc_state(&state->base, conn_state->crtc); @@ -14549,6 +14551,8 @@ intel_atomic_check_tiled_conns(struct intel_atomic_state *state) continue; if (!intel_connector_needs_modeset(state, connector)) continue; + if (!new_conn_state->crtc) + continue; ret = intel_modeset_all_tiles(state, connector->tile_group->id); if (ret) -- 2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
