Commit fc320a6f authored by Simon Ser's avatar Simon Ser
Browse files

amdgpu: use drm_kms_helper_connector_hotplug_event 



When updating a single connector, use
drm_kms_helper_connector_hotplug_event instead of
drm_kms_helper_hotplug_event.

Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarPekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211018084707.32253-5-contact@emersion.fr
parent ad935754

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −4
Original line number Diff line number Diff line
@@ -2940,7 +2940,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 &&
@@ -2955,7 +2955,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);
@@ -3149,7 +3149,7 @@ static void handle_hpd_rx_irq(void *param) 
			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)
@@ -3162,7 +3162,7 @@ static void handle_hpd_rx_irq(void *param) 
			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

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, 
		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 (param[0] == 0) {

		if (!aconnector->dc_link)

			goto unlock;
@@ -1264,7 +1264,7 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, 
		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);

	}



unlock: