Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index c911b30de6588e707611095c61975d7241652589..4130082c58731f338e612bd8c7ee119853f91408 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3012,7 +3012,7 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector)
                drm_modeset_unlock_all(dev);
 
                if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
-                       drm_kms_helper_hotplug_event(dev);
+                       drm_kms_helper_connector_hotplug_event(connector);
 
        } else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
                if (new_connection_type == dc_connection_none &&
@@ -3027,7 +3027,7 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector)
                drm_modeset_unlock_all(dev);
 
                if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
-                       drm_kms_helper_hotplug_event(dev);
+                       drm_kms_helper_connector_hotplug_event(connector);
        }
        mutex_unlock(&aconnector->hpd_lock);
 
@@ -3221,7 +3221,7 @@ out:
                        dm_restore_drm_connector_state(dev, connector);
                        drm_modeset_unlock_all(dev);
 
-                       drm_kms_helper_hotplug_event(dev);
+                       drm_kms_helper_connector_hotplug_event(connector);
                } else if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {
 
                        if (aconnector->fake_enable)
@@ -3234,7 +3234,7 @@ out:
                        dm_restore_drm_connector_state(dev, connector);
                        drm_modeset_unlock_all(dev);
 
-                       drm_kms_helper_hotplug_event(dev);
+                       drm_kms_helper_connector_hotplug_event(connector);
                }
        }
 #ifdef CONFIG_DRM_AMD_DC_HDCP