| Message ID | 20211015163336.95188-5-contact@emersion.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: add per-connector hotplug events | expand |
On 2021-10-15 12:33, Simon Ser wrote: > When updating a single connector, use > drm_kms_helper_connector_hotplug_event instead of > drm_kms_helper_hotplug_event. > > Signed-off-by: Simon Ser <contact@emersion.fr> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Patches 1-3 are also Acked-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > 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 9b1fc54555ee..c261e57d9a22 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -2652,7 +2652,7 @@ static void handle_hpd_irq(void *param) > 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 && > @@ -2666,7 +2666,7 @@ static void handle_hpd_irq(void *param) > 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); > > @@ -2833,7 +2833,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) > @@ -2846,7 +2846,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 > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c > index 87daa78a32b8..23e789855d17 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c > @@ -1241,7 +1241,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; > @@ -1263,7 +1263,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: >
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 9b1fc54555ee..c261e57d9a22 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2652,7 +2652,7 @@ static void handle_hpd_irq(void *param) 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 && @@ -2666,7 +2666,7 @@ static void handle_hpd_irq(void *param) 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); @@ -2833,7 +2833,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) @@ -2846,7 +2846,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 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 87daa78a32b8..23e789855d17 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -1241,7 +1241,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; @@ -1263,7 +1263,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:
When updating a single connector, use drm_kms_helper_connector_hotplug_event instead of drm_kms_helper_hotplug_event. Signed-off-by: Simon Ser <contact@emersion.fr> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)