mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
Revert "drm/i915: Implement Link Rate fallback on Link training failure"
This reverts commit 233ce881dd
.
I assumed it's ok, but really should have double-checked - CI caught
tons of fail :(
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Acked-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301171749.13053-1-daniel.vetter@ffwll.ch
This commit is contained in:
parent
0f3bbe074d
commit
afc1ebf456
3 changed files with 2 additions and 50 deletions
|
@ -5790,29 +5790,6 @@ 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;
|
||||
|
||||
intel_connector = container_of(work, typeof(*intel_connector),
|
||||
modeset_retry_work);
|
||||
connector = &intel_connector->base;
|
||||
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id,
|
||||
connector->name);
|
||||
|
||||
/* Grab the locks before changing connector property*/
|
||||
mutex_lock(&connector->dev->mode_config.mutex);
|
||||
/* Set connector link status to BAD and send a Uevent to notify
|
||||
* userspace to do a modeset.
|
||||
*/
|
||||
drm_mode_connector_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)
|
||||
|
@ -5825,10 +5802,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
|
|||
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)))
|
||||
|
|
|
@ -313,24 +313,6 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp)
|
|||
void
|
||||
intel_dp_start_link_train(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct intel_connector *intel_connector = intel_dp->attached_connector;
|
||||
|
||||
if (!intel_dp_link_training_clock_recovery(intel_dp))
|
||||
goto failure_handling;
|
||||
if (!intel_dp_link_training_channel_equalization(intel_dp))
|
||||
goto failure_handling;
|
||||
|
||||
DRM_DEBUG_KMS("Link Training Passed at Link Rate = %d, Lane count = %d",
|
||||
intel_dp->link_rate, intel_dp->lane_count);
|
||||
return;
|
||||
|
||||
failure_handling:
|
||||
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);
|
||||
return;
|
||||
intel_dp_link_training_clock_recovery(intel_dp);
|
||||
intel_dp_link_training_channel_equalization(intel_dp);
|
||||
}
|
||||
|
|
|
@ -316,9 +316,6 @@ 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 {
|
||||
|
|
Loading…
Reference in a new issue