|
@@ -1188,7 +1188,6 @@ intel_dp_aux_fini(struct intel_dp *intel_dp)
|
|
|
static int
|
|
|
intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector)
|
|
|
{
|
|
|
- struct drm_device *dev = intel_dp_to_dev(intel_dp);
|
|
|
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
|
|
|
enum port port = intel_dig_port->port;
|
|
|
int ret;
|
|
@@ -1199,7 +1198,7 @@ intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector)
|
|
|
if (!intel_dp->aux.name)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- intel_dp->aux.dev = dev->dev;
|
|
|
+ intel_dp->aux.dev = connector->base.kdev;
|
|
|
intel_dp->aux.transfer = intel_dp_aux_transfer;
|
|
|
|
|
|
DRM_DEBUG_KMS("registering %s bus for %s\n",
|
|
@@ -1214,16 +1213,6 @@ intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- ret = sysfs_create_link(&connector->base.kdev->kobj,
|
|
|
- &intel_dp->aux.ddc.dev.kobj,
|
|
|
- intel_dp->aux.ddc.dev.kobj.name);
|
|
|
- if (ret < 0) {
|
|
|
- DRM_ERROR("sysfs_create_link() for %s failed (%d)\n",
|
|
|
- intel_dp->aux.name, ret);
|
|
|
- intel_dp_aux_fini(intel_dp);
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -1232,9 +1221,7 @@ intel_dp_connector_unregister(struct intel_connector *intel_connector)
|
|
|
{
|
|
|
struct intel_dp *intel_dp = intel_attached_dp(&intel_connector->base);
|
|
|
|
|
|
- if (!intel_connector->mst_port)
|
|
|
- sysfs_remove_link(&intel_connector->base.kdev->kobj,
|
|
|
- intel_dp->aux.ddc.dev.kobj.name);
|
|
|
+ intel_dp_aux_fini(intel_dp);
|
|
|
intel_connector_unregister(intel_connector);
|
|
|
}
|
|
|
|
|
@@ -4868,7 +4855,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
|
|
|
struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
|
|
|
struct intel_dp *intel_dp = &intel_dig_port->dp;
|
|
|
|
|
|
- intel_dp_aux_fini(intel_dp);
|
|
|
intel_dp_mst_encoder_cleanup(intel_dig_port);
|
|
|
if (is_edp(intel_dp)) {
|
|
|
cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
|