drm/rockchip: protect connector status with loader protect

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / bridge / analogix / analogix_dp_core.c

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index df3d47b176bb450809f710384e25acc85e69535c..6ac31a9f8260b551e9828792ec66a4da63527733 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -965,19 +965,11 @@ static int analogix_dp_loader_protect(struct drm_connector *connector, bool on)
 {
        struct analogix_dp_device *dp = to_dp(connector);
 
-       if (on == connector->loader_protect)
-               return 0;
-
-       if (on) {
+       if (on)
                pm_runtime_get_sync(dp->dev);
-
-               connector->loader_protect = true;
-       } else {
+       else
                pm_runtime_put(dp->dev);
 
-               connector->loader_protect = false;
-       }
-
        return 0;
 }
 
@@ -1113,10 +1105,6 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
                dp->plat_data->power_off(dp->plat_data);
 
        pm_runtime_put_sync(dp->dev);
-       if (dp->connector.loader_protect) {
-               pm_runtime_put_sync(dp->dev);
-               dp->connector.loader_protect = false;
-       }
 
        dp->dpms_mode = DRM_MODE_DPMS_OFF;
 }