| Message ID | 1478752928-17719-6-git-send-email-manasi.d.navare@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 09, 2016 at 08:42:08PM -0800, Manasi Navare wrote: > @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > return false; > } > > +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) > +{ > + struct intel_connector *intel_connector; > + struct drm_connector *connector; > + struct drm_display_mode *mode; > + bool verbose_prune = true; > + > + intel_connector = container_of(work, typeof(*intel_connector), > + modeset_retry_work); > + connector = &intel_connector->base; > + > + /* Grab the locks before changing connector property*/ > + mutex_lock(&connector->dev->mode_config.mutex); > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, > + connector->name); > + list_for_each_entry(mode, &connector->modes, head) { > + mode->status = intel_dp_mode_valid(connector, > + mode); > + } > + drm_mode_prune_invalid(connector->dev, &connector->modes, > + verbose_prune); > + > + /* Set connector link status to BAD and send a Uevent to notify > + * userspace to do a modeset. > + */ > + intel_dp_set_link_status_property(connector, > + DRM_MODE_LINK_STATUS_BAD); > + mutex_unlock(&connector->dev->mode_config.mutex); > + > + /* Send Hotplug uevent so userspace can reprobe */ > + drm_kms_helper_hotplug_event(connector->dev); One downside of keeping all the signalling logic here in i915 is that we don't have a good spot to put the kerneldoc for this new link status property within drm_connector.c for others to easily spot. My suggestion would be to extract function with the following rough pseudo-code: drm_connector_set_link_status(connector, status) { mutex_lock(mode_config.mutex); /* what intel_dp_set_link_status_property() does */ mutex_unlock(mode_config.mutex); drm_kms_helper_hotplug_event() } Within intel_dp_modeset_retry_work_fn we'd then first need to drop the lock, and then call this function. The lock drop&reacquire is a bit ugly, but: - it doesn't matter from a performance pov, this is a slow, asynchronous work. - it doesn't matter for correctnes, the only thing we need is to drop the lock before calling drm_kms_helper_hotplug_event, and that we update the link status and the mode list before that too. - long term I expect that properties will get separate locks to protect their values, and restrict mode_config.mutex to just mode probing. Which means drm_connnector_set_link_status will use a different lock anyway. - it nicely encapsulates stuff imo. Kerneldoc for drm_connector_set_link_status should mention that this needs to be run from some async work item, and ofc have the full explanation (maybe even quote some pseudo-code, see e.g. drm_modeset_lock.c comments) of how this should be used. Since this is late-stage polish definitely wait for more feedback and for the design to fully settle first. -Daniel
On Thu, 10 Nov 2016, Daniel Vetter <daniel@ffwll.ch> wrote: > On Wed, Nov 09, 2016 at 08:42:08PM -0800, Manasi Navare wrote: >> @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, >> return false; >> } >> >> +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) >> +{ >> + struct intel_connector *intel_connector; >> + struct drm_connector *connector; >> + struct drm_display_mode *mode; >> + bool verbose_prune = true; >> + >> + intel_connector = container_of(work, typeof(*intel_connector), >> + modeset_retry_work); >> + connector = &intel_connector->base; >> + >> + /* Grab the locks before changing connector property*/ >> + mutex_lock(&connector->dev->mode_config.mutex); >> + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, >> + connector->name); >> + list_for_each_entry(mode, &connector->modes, head) { >> + mode->status = intel_dp_mode_valid(connector, >> + mode); >> + } >> + drm_mode_prune_invalid(connector->dev, &connector->modes, >> + verbose_prune); >> + >> + /* Set connector link status to BAD and send a Uevent to notify >> + * userspace to do a modeset. >> + */ >> + intel_dp_set_link_status_property(connector, >> + DRM_MODE_LINK_STATUS_BAD); >> + mutex_unlock(&connector->dev->mode_config.mutex); >> + >> + /* Send Hotplug uevent so userspace can reprobe */ >> + drm_kms_helper_hotplug_event(connector->dev); > > One downside of keeping all the signalling logic here in i915 is that we > don't have a good spot to put the kerneldoc for this new link status > property within drm_connector.c for others to easily spot. My suggestion > would be to extract function with the following rough pseudo-code: Thanks for this. I wanted Manasi to keep the work struct and function within i915, but I fell short of coming up with this division. BR, Jani. > > drm_connector_set_link_status(connector, status) > { > mutex_lock(mode_config.mutex); > > /* what intel_dp_set_link_status_property() does */ > > mutex_unlock(mode_config.mutex); > drm_kms_helper_hotplug_event() > } > > Within intel_dp_modeset_retry_work_fn we'd then first need to drop the > lock, and then call this function. The lock drop&reacquire is a bit ugly, > but: > - it doesn't matter from a performance pov, this is a slow, asynchronous > work. > - it doesn't matter for correctnes, the only thing we need is to drop the > lock before calling drm_kms_helper_hotplug_event, and that we update the > link status and the mode list before that too. > - long term I expect that properties will get separate locks to protect > their values, and restrict mode_config.mutex to just mode probing. Which > means drm_connnector_set_link_status will use a different lock anyway. > - it nicely encapsulates stuff imo. > > Kerneldoc for drm_connector_set_link_status should mention that this needs > to be run from some async work item, and ofc have the full explanation > (maybe even quote some pseudo-code, see e.g. drm_modeset_lock.c comments) > of how this should be used. > > Since this is late-stage polish definitely wait for more feedback and for > the design to fully settle first. > -Daniel
On Thu, Nov 10, 2016 at 09:58:31PM +0100, Daniel Vetter wrote: > On Wed, Nov 09, 2016 at 08:42:08PM -0800, Manasi Navare wrote: > > @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > > return false; > > } > > > > +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) > > +{ > > + struct intel_connector *intel_connector; > > + struct drm_connector *connector; > > + struct drm_display_mode *mode; > > + bool verbose_prune = true; > > + > > + intel_connector = container_of(work, typeof(*intel_connector), > > + modeset_retry_work); > > + connector = &intel_connector->base; > > + > > + /* Grab the locks before changing connector property*/ > > + mutex_lock(&connector->dev->mode_config.mutex); > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, > > + connector->name); > > + list_for_each_entry(mode, &connector->modes, head) { > > + mode->status = intel_dp_mode_valid(connector, > > + mode); > > + } > > + drm_mode_prune_invalid(connector->dev, &connector->modes, > > + verbose_prune); > > + > > + /* Set connector link status to BAD and send a Uevent to notify > > + * userspace to do a modeset. > > + */ > > + intel_dp_set_link_status_property(connector, > > + DRM_MODE_LINK_STATUS_BAD); > > + mutex_unlock(&connector->dev->mode_config.mutex); > > + > > + /* Send Hotplug uevent so userspace can reprobe */ > > + drm_kms_helper_hotplug_event(connector->dev); > > One downside of keeping all the signalling logic here in i915 is that we > don't have a good spot to put the kerneldoc for this new link status > property within drm_connector.c for others to easily spot. My suggestion > would be to extract function with the following rough pseudo-code: > > drm_connector_set_link_status(connector, status) > { > mutex_lock(mode_config.mutex); > > /* what intel_dp_set_link_status_property() does */ > > mutex_unlock(mode_config.mutex); > drm_kms_helper_hotplug_event() > } > > Within intel_dp_modeset_retry_work_fn we'd then first need to drop the > lock, and then call this function. The lock drop&reacquire is a bit ugly, > but: The mode re-validation should be done in the core as well. Not sure if we could just stuff it all into one place, and then there would be no need for any lock dropping. > - it doesn't matter from a performance pov, this is a slow, asynchronous > work. > - it doesn't matter for correctnes, the only thing we need is to drop the > lock before calling drm_kms_helper_hotplug_event, and that we update the > link status and the mode list before that too. > - long term I expect that properties will get separate locks to protect > their values, and restrict mode_config.mutex to just mode probing. Which > means drm_connnector_set_link_status will use a different lock anyway. > - it nicely encapsulates stuff imo. > > Kerneldoc for drm_connector_set_link_status should mention that this needs > to be run from some async work item, and ofc have the full explanation > (maybe even quote some pseudo-code, see e.g. drm_modeset_lock.c comments) > of how this should be used. > > Since this is late-stage polish definitely wait for more feedback and for > the design to fully settle first. > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Nov 11, 2016 at 04:08:26PM +0200, Ville Syrjälä wrote: > On Thu, Nov 10, 2016 at 09:58:31PM +0100, Daniel Vetter wrote: > > On Wed, Nov 09, 2016 at 08:42:08PM -0800, Manasi Navare wrote: > > > @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > > > return false; > > > } > > > > > > +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) > > > +{ > > > + struct intel_connector *intel_connector; > > > + struct drm_connector *connector; > > > + struct drm_display_mode *mode; > > > + bool verbose_prune = true; > > > + > > > + intel_connector = container_of(work, typeof(*intel_connector), > > > + modeset_retry_work); > > > + connector = &intel_connector->base; > > > + > > > + /* Grab the locks before changing connector property*/ > > > + mutex_lock(&connector->dev->mode_config.mutex); > > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, > > > + connector->name); > > > + list_for_each_entry(mode, &connector->modes, head) { > > > + mode->status = intel_dp_mode_valid(connector, > > > + mode); > > > + } > > > + drm_mode_prune_invalid(connector->dev, &connector->modes, > > > + verbose_prune); > > > + > > > + /* Set connector link status to BAD and send a Uevent to notify > > > + * userspace to do a modeset. > > > + */ > > > + intel_dp_set_link_status_property(connector, > > > + DRM_MODE_LINK_STATUS_BAD); > > > + mutex_unlock(&connector->dev->mode_config.mutex); > > > + > > > + /* Send Hotplug uevent so userspace can reprobe */ > > > + drm_kms_helper_hotplug_event(connector->dev); > > > > One downside of keeping all the signalling logic here in i915 is that we > > don't have a good spot to put the kerneldoc for this new link status > > property within drm_connector.c for others to easily spot. My suggestion > > would be to extract function with the following rough pseudo-code: > > > > drm_connector_set_link_status(connector, status) > > { > > mutex_lock(mode_config.mutex); > > > > /* what intel_dp_set_link_status_property() does */ > > > > mutex_unlock(mode_config.mutex); > > drm_kms_helper_hotplug_event() > > } > > > > Within intel_dp_modeset_retry_work_fn we'd then first need to drop the > > lock, and then call this function. The lock drop&reacquire is a bit ugly, > > but: > > The mode re-validation should be done in the core as well. Not sure if > we could just stuff it all into one place, and then there would be no > need for any lock dropping. > I can move the moderevalidation to the core as well, but then the function name has to be something else than just drm_set_link_status_property(),cant think of a name that combines mode revalidation and setting link sttaus property, any suggestions? Manasi > > - it doesn't matter from a performance pov, this is a slow, asynchronous > > work. > > - it doesn't matter for correctnes, the only thing we need is to drop the > > lock before calling drm_kms_helper_hotplug_event, and that we update the > > link status and the mode list before that too. > > - long term I expect that properties will get separate locks to protect > > their values, and restrict mode_config.mutex to just mode probing. Which > > means drm_connnector_set_link_status will use a different lock anyway. > > - it nicely encapsulates stuff imo. > > > > Kerneldoc for drm_connector_set_link_status should mention that this needs > > to be run from some async work item, and ofc have the full explanation > > (maybe even quote some pseudo-code, see e.g. drm_modeset_lock.c comments) > > of how this should be used. > > > > Since this is late-stage polish definitely wait for more feedback and for > > the design to fully settle first. > > -Daniel > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel OTC
On Fri, Nov 11, 2016 at 11:41:22AM +0200, Jani Nikula wrote: > On Thu, 10 Nov 2016, Daniel Vetter <daniel@ffwll.ch> wrote: > > On Wed, Nov 09, 2016 at 08:42:08PM -0800, Manasi Navare wrote: > >> @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > >> return false; > >> } > >> > >> +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) > >> +{ > >> + struct intel_connector *intel_connector; > >> + struct drm_connector *connector; > >> + struct drm_display_mode *mode; > >> + bool verbose_prune = true; > >> + > >> + intel_connector = container_of(work, typeof(*intel_connector), > >> + modeset_retry_work); > >> + connector = &intel_connector->base; > >> + > >> + /* Grab the locks before changing connector property*/ > >> + mutex_lock(&connector->dev->mode_config.mutex); > >> + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, > >> + connector->name); > >> + list_for_each_entry(mode, &connector->modes, head) { > >> + mode->status = intel_dp_mode_valid(connector, > >> + mode); > >> + } > >> + drm_mode_prune_invalid(connector->dev, &connector->modes, > >> + verbose_prune); > >> + > >> + /* Set connector link status to BAD and send a Uevent to notify > >> + * userspace to do a modeset. > >> + */ > >> + intel_dp_set_link_status_property(connector, > >> + DRM_MODE_LINK_STATUS_BAD); > >> + mutex_unlock(&connector->dev->mode_config.mutex); > >> + > >> + /* Send Hotplug uevent so userspace can reprobe */ > >> + drm_kms_helper_hotplug_event(connector->dev); > > > > One downside of keeping all the signalling logic here in i915 is that we > > don't have a good spot to put the kerneldoc for this new link status > > property within drm_connector.c for others to easily spot. My suggestion > > would be to extract function with the following rough pseudo-code: > > Thanks for this. I wanted Manasi to keep the work struct and function > within i915, but I fell short of coming up with this division. > > BR, > Jani. > > Jani, so we ar elooking at two functions going in core, 1. that does mode validation and pruning 2. set link status property These should be in a separate patch right after declaring the drm connector property, what do you think? Regards Manasi > > > > > drm_connector_set_link_status(connector, status) > > { > > mutex_lock(mode_config.mutex); > > > > /* what intel_dp_set_link_status_property() does */ > > > > mutex_unlock(mode_config.mutex); > > drm_kms_helper_hotplug_event() > > } > > > > Within intel_dp_modeset_retry_work_fn we'd then first need to drop the > > lock, and then call this function. The lock drop&reacquire is a bit ugly, > > but: > > - it doesn't matter from a performance pov, this is a slow, asynchronous > > work. > > - it doesn't matter for correctnes, the only thing we need is to drop the > > lock before calling drm_kms_helper_hotplug_event, and that we update the > > link status and the mode list before that too. > > - long term I expect that properties will get separate locks to protect > > their values, and restrict mode_config.mutex to just mode probing. Which > > means drm_connnector_set_link_status will use a different lock anyway. > > - it nicely encapsulates stuff imo. > > > > Kerneldoc for drm_connector_set_link_status should mention that this needs > > to be run from some async work item, and ofc have the full explanation > > (maybe even quote some pseudo-code, see e.g. drm_modeset_lock.c comments) > > of how this should be used. > > > > Since this is late-stage polish definitely wait for more feedback and for > > the design to fully settle first. > > -Daniel > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 0ad4e16..fa5989a 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1684,6 +1684,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum port port = intel_ddi_get_encoder_port(encoder); + struct intel_connector *intel_connector = intel_dp->attached_connector; + struct drm_connector *connector = &intel_connector->base; intel_dp_set_link_params(intel_dp, link_rate, lane_count, link_mst); @@ -1694,7 +1696,24 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, intel_prepare_dp_ddi_buffers(encoder); intel_ddi_init_dp_buf_reg(encoder); intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON); - intel_dp_start_link_train(intel_dp); + if (!intel_dp_start_link_train(intel_dp)) { + DRM_DEBUG_KMS("Link Training failed at link rate = %d, lane count = %d", + link_rate, lane_count); + if (!intel_dp_get_link_train_fallback_values(intel_dp, + link_rate, + lane_count)) + /* Schedule a Hotplug Uevent to userspace to start modeset */ + schedule_work(&intel_connector->modeset_retry_work); + } else { + DRM_DEBUG_KMS("Link Training Passed at Link Rate = %d, Lane count = %d", + link_rate, lane_count); + intel_dp->fallback_link_rate_index = -1; + intel_dp->fallback_link_rate = 0; + intel_dp->fallback_lane_count = 0; + intel_dp_set_link_status_property(connector, + DRM_MODE_LINK_STATUS_GOOD); + } + if (port != PORT_A || INTEL_GEN(dev_priv) >= 9) intel_dp_stop_link_train(intel_dp); } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 9694857..b6b9405 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -353,8 +353,14 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, target_clock = fixed_mode->clock; } - max_link_clock = intel_dp_max_link_rate(intel_dp); - max_lanes = intel_dp_max_lane_count(intel_dp); + /* Prune the modes using the fallback link rate/lane count */ + if (connector->link_status == DRM_MODE_LINK_STATUS_BAD) { + max_link_clock = intel_dp->fallback_link_rate; + max_lanes = intel_dp->fallback_lane_count; + } else { + max_link_clock = intel_dp_max_link_rate(intel_dp); + max_lanes = intel_dp_max_lane_count(intel_dp); + } max_rate = intel_dp_max_data_rate(max_link_clock, max_lanes); mode_rate = intel_dp_link_required(target_clock, 18); @@ -1591,6 +1597,7 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, enum port port = dp_to_dig_port(intel_dp)->port; struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->base.crtc); struct intel_connector *intel_connector = intel_dp->attached_connector; + struct drm_connector *connector = &intel_connector->base; int lane_count, clock; int min_lane_count = 1; int max_lane_count = intel_dp_max_lane_count(intel_dp); @@ -1638,6 +1645,12 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) return false; + /* Fall back to lower link rate in case of failure in previous modeset */ + if (connector->link_status == DRM_MODE_LINK_STATUS_BAD) { + min_lane_count = max_lane_count = intel_dp->fallback_lane_count; + min_clock = max_clock = intel_dp->fallback_link_rate_index; + } + DRM_DEBUG_KMS("DP link computation with max lane count %i " "max bw %d pixel clock %iKHz\n", max_lane_count, common_rates[max_clock], @@ -2784,6 +2797,8 @@ static void intel_enable_dp(struct intel_encoder *encoder, struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); + struct intel_connector *intel_connector = intel_dp->attached_connector; + struct drm_connector *connector = &intel_connector->base; uint32_t dp_reg = I915_READ(intel_dp->output_reg); enum pipe pipe = crtc->pipe; @@ -2814,7 +2829,23 @@ static void intel_enable_dp(struct intel_encoder *encoder, } intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON); - intel_dp_start_link_train(intel_dp); + if (!intel_dp_start_link_train(intel_dp)) { + DRM_DEBUG_KMS("Link Training failed at link rate = %d, lane count = %d", + intel_dp->link_rate, intel_dp->lane_count); + if (!intel_dp_get_link_train_fallback_values(intel_dp, + intel_dp->link_rate, + intel_dp->lane_count)) + /* Schedule a Hotplug Uevent to userspace to start modeset */ + schedule_work(&intel_connector->modeset_retry_work); + } else { + DRM_DEBUG_KMS("Link Training Passed at Link Rate = %d, Lane count = %d", + intel_dp->link_rate, intel_dp->lane_count); + intel_dp->fallback_link_rate_index = -1; + intel_dp->fallback_link_rate = 0; + intel_dp->fallback_lane_count = 0; + intel_dp_set_link_status_property(connector, + DRM_MODE_LINK_STATUS_GOOD); + } intel_dp_stop_link_train(intel_dp); if (pipe_config->has_audio) { @@ -4021,6 +4052,8 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); + struct intel_connector *intel_connector = intel_dp->attached_connector; + struct drm_connector *connector = &intel_connector->base; /* Suppress underruns caused by re-training */ intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, false); @@ -4028,7 +4061,23 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) intel_set_pch_fifo_underrun_reporting(dev_priv, intel_crtc_pch_transcoder(crtc), false); - intel_dp_start_link_train(intel_dp); + if (!intel_dp_start_link_train(intel_dp)) { + DRM_DEBUG_KMS("Link Training failed at link rate = %d, lane count = %d", + intel_dp->link_rate, intel_dp->lane_count); + if (!intel_dp_get_link_train_fallback_values(intel_dp, + intel_dp->link_rate, + intel_dp->lane_count)) + /* Schedule a Hotplug Uevent to userspace to start modeset */ + schedule_work(&intel_connector->modeset_retry_work); + } else { + DRM_DEBUG_KMS("Link Training Passed at Link Rate = %d, Lane count = %d", + intel_dp->link_rate, intel_dp->lane_count); + intel_dp->fallback_link_rate_index = -1; + intel_dp->fallback_link_rate = 0; + intel_dp->fallback_lane_count = 0; + intel_dp_set_link_status_property(connector, + DRM_MODE_LINK_STATUS_GOOD); + } intel_dp_stop_link_train(intel_dp); /* Keep underrun reporting disabled until things are stable */ @@ -4422,6 +4471,11 @@ static bool intel_digital_port_connected(struct drm_i915_private *dev_priv, intel_dp->compliance_test_active = 0; intel_dp->compliance_test_type = 0; intel_dp->compliance_test_data = 0; + intel_dp->fallback_link_rate_index = -1; + intel_dp->fallback_link_rate = 0; + intel_dp->fallback_lane_count = 0; + intel_dp_set_link_status_property(connector, + DRM_MODE_LINK_STATUS_GOOD); if (intel_dp->is_mst) { DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n", @@ -4513,6 +4567,11 @@ static bool intel_digital_port_connected(struct drm_i915_private *dev_priv, DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, connector->name); + /* If this is a retry due to link trianing failure */ + if (status == connector_status_connected && + connector->link_status == DRM_MODE_LINK_STATUS_BAD) + return status; + /* If full detect is not performed yet, do a full detect */ if (!intel_dp->detect_done) status = intel_dp_long_pulse(intel_dp->attached_connector); @@ -5692,6 +5751,39 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, return false; } +static void intel_dp_modeset_retry_work_fn(struct work_struct *work) +{ + struct intel_connector *intel_connector; + struct drm_connector *connector; + struct drm_display_mode *mode; + bool verbose_prune = true; + + intel_connector = container_of(work, typeof(*intel_connector), + modeset_retry_work); + connector = &intel_connector->base; + + /* Grab the locks before changing connector property*/ + mutex_lock(&connector->dev->mode_config.mutex); + DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, + connector->name); + list_for_each_entry(mode, &connector->modes, head) { + mode->status = intel_dp_mode_valid(connector, + mode); + } + drm_mode_prune_invalid(connector->dev, &connector->modes, + verbose_prune); + + /* Set connector link status to BAD and send a Uevent to notify + * userspace to do a modeset. + */ + intel_dp_set_link_status_property(connector, + DRM_MODE_LINK_STATUS_BAD); + mutex_unlock(&connector->dev->mode_config.mutex); + + /* Send Hotplug uevent so userspace can reprobe */ + drm_kms_helper_hotplug_event(connector->dev); +} + bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, struct intel_connector *intel_connector) @@ -5704,6 +5796,10 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, enum port port = intel_dig_port->port; int type; + /* Initialize the work for modeset in case of link train failure */ + INIT_WORK(&intel_connector->modeset_retry_work, + intel_dp_modeset_retry_work_fn); + if (WARN(intel_dig_port->max_lanes < 1, "Not enough lanes (%d) for DP on port %c\n", intel_dig_port->max_lanes, port_name(port))) diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c index 0048b52..10f81ab 100644 --- a/drivers/gpu/drm/i915/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c @@ -310,9 +310,15 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp) DP_TRAINING_PATTERN_DISABLE); } -void +bool intel_dp_start_link_train(struct intel_dp *intel_dp) { - intel_dp_link_training_clock_recovery(intel_dp); - intel_dp_link_training_channel_equalization(intel_dp); + bool ret; + + if (intel_dp_link_training_clock_recovery(intel_dp)) { + ret = intel_dp_link_training_channel_equalization(intel_dp); + if (ret) + return true; + } + return false; } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 4a49a2d..2a286c5 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -312,6 +312,9 @@ struct intel_connector { void *port; /* store this opaque as its illegal to dereference it */ struct intel_dp *mst_port; + + /* Work struct to schedule a uevent on link train failure */ + struct work_struct modeset_retry_work; }; struct dpll { @@ -891,7 +894,6 @@ struct intel_dp { int fallback_link_rate; uint8_t fallback_lane_count; int fallback_link_rate_index; - bool link_train_failed; uint8_t sink_count; bool link_mst; bool has_audio; @@ -1392,7 +1394,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, bool link_mst); int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, int link_rate, uint8_t lane_count); -void intel_dp_start_link_train(struct intel_dp *intel_dp); +bool intel_dp_start_link_train(struct intel_dp *intel_dp); void intel_dp_stop_link_train(struct intel_dp *intel_dp); void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); void intel_dp_encoder_reset(struct drm_encoder *encoder);
If link training at a link rate optimal for a particular mode fails during modeset's atomic commit phase, then we let the modeset complete and then retry. We save the link rate value at which link training failed, update the link status property to "BAD" and use a lower link rate to prune the modes. It will redo the modeset on the current mode at lower link rate or if the current mode gets pruned due to lower link constraints then, it will send a hotplug uevent for userspace to handle it. This is also required to pass DP CTS tests 4.3.1.3, 4.3.1.4, 4.3.1.6. v4: * Add fallback support for non DDI platforms too * Set connector->link status inside set_link_status function (Jani Nikula) v3: * Set link status property to BAd unconditionally (Jani Nikula) * Dont use two separate variables link_train_failed and link_status to indicate same thing (Jani Nikula) v2: * Squashed a few patches (Jani Nikula) Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> --- drivers/gpu/drm/i915/intel_ddi.c | 21 +++++- drivers/gpu/drm/i915/intel_dp.c | 104 +++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_dp_link_training.c | 12 ++- drivers/gpu/drm/i915/intel_drv.h | 6 +- 4 files changed, 133 insertions(+), 10 deletions(-)