FROMLIST: 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.

(am from https://patchwork.kernel.org/patch/9442145)
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Change-Id: I86eb7c41624be1a8f5952ba7709e623a70941b8c

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index b84ea307647dcdc88e5cf416cd28517e5376b03b..be86fd982b9308eee65e879ef2d87d3b9855d38a 100644 (file)
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1014,7 +1014,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
        struct cdn_dp_port *port;
        struct drm_device *drm_dev = data;
        int ret, i;
-       bool schedule_event = false;
 
        ret = cdn_dp_parse_dt(dp);
        if (ret < 0)
@@ -1076,15 +1075,11 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
                                      "register EXTCON_DISP_DP notifier err\n");
                        goto err_free_connector;
                }
-
-               if (extcon_get_state(port->extcon, EXTCON_DISP_DP))
-                       schedule_event = true;
        }
 
        pm_runtime_enable(dev);
 
-       if (schedule_event)
-               schedule_work(&dp->event_work);
+       schedule_work(&dp->event_work);
 
        return 0;