Commit 83c132ed authored by Guenter Roeck's avatar Guenter Roeck Committed by Mark Yao

drm/rockchip: cdn-dp: Load firmware if no monitor connected

If no monitor is connected, suspend/resume cycles result in firmware
load errors because the driver attempts to load the firmware while
the system is in suspend state. This results in a kernel warning and
traceback.

Loading the firmware during boot fixes the problem. Note that we can not
just call schedule_work conditionally in cdn_dp_pd_event() if the insertion
status changed. The problem would still be seen if a monitor is connected
for the first time during suspend.
Signed-off-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarChris Zhong <zyw@rock-chips.com>
parent 1a0f7ed3
...@@ -1021,7 +1021,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) ...@@ -1021,7 +1021,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
struct cdn_dp_port *port; struct cdn_dp_port *port;
struct drm_device *drm_dev = data; struct drm_device *drm_dev = data;
int ret, i; int ret, i;
bool schedule_event = false;
ret = cdn_dp_parse_dt(dp); ret = cdn_dp_parse_dt(dp);
if (ret < 0) if (ret < 0)
...@@ -1083,15 +1082,11 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) ...@@ -1083,15 +1082,11 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
"register EXTCON_DISP_DP notifier err\n"); "register EXTCON_DISP_DP notifier err\n");
goto err_free_connector; goto err_free_connector;
} }
if (extcon_get_state(port->extcon, EXTCON_DISP_DP))
schedule_event = true;
} }
pm_runtime_enable(dev); pm_runtime_enable(dev);
if (schedule_event) schedule_work(&dp->event_work);
schedule_work(&dp->event_work);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment