shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: cdn-dp: use delay work replace work

Browse Source 
In tcpm displayport driver, drm_connector_oob_hotplug_event()
execute before dp_altmode_notify().

The dp_altmode_notify() call the mux set function, which
transfer phy info(lane count, pin assignments) to typec
phy.

The drm_connector_oob_hotplug_event() call oob_hotplug_event
function, which notify the cdn-dp driver hotplug event, and
the cdn-dp will start work to deal with the hotpug event,
which will user the phy info.

if here no delay time, The phy info use may be early than phy
info update, whick may cause the phy info mismatch.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ic3394769f66bd3b7a621095e09978e4b15393b7e
This commit is contained in:
Zhang Yubing
2021-10-18 17:26:38 +08:00
committed by Tao Huang
parent 3a38a93376
commit e291ddfbcb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/rockchip/cdn-dp-core.c
View File

@@ -223,7 +223,7 @@ static void cdn_dp_oob_hotplug_event(struct drm_connector *connector)
{
struct cdn_dp_device *dp = connector_to_dp(connector);
schedule_work(&dp->event_work);
schedule_delayed_work(&dp->event_work, msecs_to_jiffies(100));
}
static const struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
@@ -643,7 +643,7 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
* run the event_work to re-connect it.
*/
if (!dp->connected && cdn_dp_connected_port(dp))
schedule_work(&dp->event_work);
schedule_delayed_work(&dp->event_work, 0);
}
static int cdn_dp_encoder_atomic_check(struct drm_encoder *encoder,
@@ -887,7 +887,7 @@ out:
static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
struct cdn_dp_device *dp = container_of(to_delayed_work(work), struct cdn_dp_device,
event_work);
struct drm_connector *connector = &dp->connector;
enum drm_connector_status old_status;
@@ -978,7 +978,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
dp->active_port = -1;
dp->fw_loaded = false;
INIT_WORK(&dp->event_work, cdn_dp_pd_event_work);
INIT_DELAYED_WORK(&dp->event_work, cdn_dp_pd_event_work);
encoder = &dp->encoder;
@@ -1022,7 +1022,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
pm_runtime_enable(dev);
schedule_work(&dp->event_work);
schedule_delayed_work(&dp->event_work, 0);
return 0;
@@ -1039,7 +1039,7 @@ static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)
struct drm_encoder *encoder = &dp->encoder;
struct drm_connector *connector = &dp->connector;
cancel_work_sync(&dp->event_work);
cancel_delayed_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
encoder->funcs->destroy(encoder);
connector->funcs->destroy(connector);
@@ -1077,7 +1077,7 @@ static int cdn_dp_resume(struct device *dev)
mutex_lock(&dp->lock);
dp->suspended = false;
if (dp->fw_loaded)
schedule_work(&dp->event_work);
schedule_delayed_work(&dp->event_work, 0);
mutex_unlock(&dp->lock);
return 0;

2
drivers/gpu/drm/rockchip/cdn-dp-core.h
View File

@@ -66,7 +66,7 @@ struct cdn_dp_device {
struct drm_encoder encoder;
struct drm_display_mode mode;
struct platform_device *audio_pdev;
struct work_struct event_work;
struct delayed_work event_work;
struct edid *edid;
struct rockchip_drm_sub_dev sub_dev;