diff options
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_connector.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_connector.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 |
5 files changed, 4 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c index 4f54c9249a84..b1240be2ec6d 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -70,12 +70,6 @@ void intel_connector_queue_modeset_retry_work(struct intel_connector *connector) drm_connector_put(&connector->base); } -void intel_connector_init_modeset_retry_work(struct intel_connector *connector) -{ - INIT_WORK(&connector->modeset_retry_work, - intel_connector_modeset_retry_work_fn); -} - int intel_connector_init(struct intel_connector *connector) { struct intel_digital_connector_state *conn_state; @@ -95,6 +89,9 @@ int intel_connector_init(struct intel_connector *connector) intel_panel_init_alloc(connector); + INIT_WORK(&connector->modeset_retry_work, + intel_connector_modeset_retry_work_fn); + return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h index 929646a639b2..6d4a6b26d8f0 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.h +++ b/drivers/gpu/drm/i915/display/intel_connector.h @@ -33,7 +33,6 @@ void intel_attach_aspect_ratio_property(struct drm_connector *connector); void intel_attach_hdmi_colorspace_property(struct drm_connector *connector); void intel_attach_dp_colorspace_property(struct drm_connector *connector); void intel_attach_scaling_mode_property(struct drm_connector *connector); -void intel_connector_init_modeset_retry_work(struct intel_connector *connector); void intel_connector_queue_modeset_retry_work(struct intel_connector *connector); #endif /* __INTEL_CONNECTOR_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 45594a054256..31feefb1bc29 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8544,8 +8544,7 @@ void intel_hpd_poll_fini(struct drm_i915_private *i915) /* Kill all the work that may have been queued by hpd. */ drm_connector_list_iter_begin(&i915->drm, &conn_iter); for_each_intel_connector_iter(connector, &conn_iter) { - if (connector->modeset_retry_work.func && - cancel_work_sync(&connector->modeset_retry_work)) + if (cancel_work_sync(&connector->modeset_retry_work)) drm_connector_put(&connector->base); if (connector->hdcp.shim) { cancel_delayed_work_sync(&connector->hdcp.check_work); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 55a2c8cbaa83..0e501ec7e73a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -6487,9 +6487,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, enum port port = encoder->port; int type; - /* Initialize the work for modeset in case of link train failure */ - intel_connector_init_modeset_retry_work(connector); - if (drm_WARN(dev, dig_port->max_lanes < 1, "Not enough lanes (%d) for DP on [ENCODER:%d:%s]\n", dig_port->max_lanes, encoder->base.base.id, diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index c0c9a2a3aec0..faa261c8930c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1747,8 +1747,6 @@ mst_topology_add_connector(struct drm_dp_mst_topology_mgr *mgr, connector->port = port; drm_dp_mst_get_port_malloc(port); - intel_connector_init_modeset_retry_work(connector); - ret = drm_connector_dynamic_init(display->drm, &connector->base, &mst_connector_funcs, DRM_MODE_CONNECTOR_DisplayPort, NULL); if (ret) |