Drop the now unused ST_DISCONNECTED state
Signed-off-by: Jessica Zhang <[email protected]>
---
drivers/gpu/drm/msm/dp/dp_display.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
b/drivers/gpu/drm/msm/dp/dp_display.c
index 5efc8d4ecf54..dac5078a849d 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -45,7 +45,6 @@ enum {
/* event thread connection state */
enum {
- ST_DISCONNECTED,
ST_CONNECTED,
ST_DISCONNECT_PENDING,
};
@@ -526,8 +525,6 @@ static int msm_dp_display_handle_port_status_changed(struct
msm_dp_display_priva
} else {
if (!dp->msm_dp_display.connected) {
rc = msm_dp_display_process_hpd_high(dp);
- if (rc)
- dp->hpd_state = ST_DISCONNECTED;
dp->msm_dp_display.connected = true;
}
}
@@ -608,7 +605,6 @@ static int msm_dp_hpd_plug_handle(struct
msm_dp_display_private *dp, u32 data)
ret = msm_dp_display_usbpd_configure_cb(&pdev->dev);
if (ret) { /* link train failed */
- dp->hpd_state = ST_DISCONNECTED;
dp->msm_dp_display.connected = false;
pm_runtime_put_sync(&pdev->dev);
}
@@ -669,12 +665,6 @@ static int msm_dp_hpd_unplug_handle(struct
msm_dp_display_private *dp, u32 data)
*/
msm_dp_display_notify_disconnect(&dp->msm_dp_display.pdev->dev);
- if (!dp->msm_dp_display.power_on) {
- dp->hpd_state = ST_DISCONNECTED;
- } else {
- dp->hpd_state = ST_DISCONNECT_PENDING;
- }
-
/* signal the disconnect event early to ensure proper teardown */
msm_dp_display_handle_plugged_change(&dp->msm_dp_display, false);
@@ -1628,7 +1618,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bridge
*drm_bridge,
{
struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(drm_bridge);
struct msm_dp *dp = msm_dp_bridge->msm_dp_display;
- u32 hpd_state;
struct msm_dp_display_private *msm_dp_display;
msm_dp_display = container_of(dp, struct msm_dp_display_private,
msm_dp_display);
@@ -1643,12 +1632,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bridge
*drm_bridge,
msm_dp_display_disable(msm_dp_display);
- hpd_state = msm_dp_display->hpd_state;
- if (hpd_state == ST_DISCONNECT_PENDING) {
- /* completed disconnection */
- msm_dp_display->hpd_state = ST_DISCONNECTED;
- }
-
drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type);
pm_runtime_put_sync(&dp->pdev->dev);
--
2.50.1
