From 65216e369384397872c47fc165a6738f92f6d977 Mon Sep 17 00:00:00 2001 From: "V S Ganga VaraPrasad (VARA) Adabala" Date: Sat, 24 Sep 2022 23:03:41 +0530 Subject: [PATCH] Revert "disp: msm: dp: free DP sim ports during DP sim disable" This reverts commit 2e9d68e174116394d0b11d17fcf8de5923698613. Change-Id: I02602dd6e1add1ac1a2ec474625a44880c0f45d7 Signed-off-by: Sandeep Gangadharaiah Signed-off-by: V S Ganga VaraPrasad (VARA) Adabala --- msm/dp/dp_debug.c | 2 -- msm/dp/dp_mst_sim.c | 4 ---- msm/dp/dp_mst_sim_helper.c | 13 +++++-------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/msm/dp/dp_debug.c b/msm/dp/dp_debug.c index 2897d96e..0696dd5a 100644 --- a/msm/dp/dp_debug.c +++ b/msm/dp/dp_debug.c @@ -121,8 +121,6 @@ static void dp_debug_disable_sim_mode(struct dp_debug_private *debug, debug->sim_mode &= ~mode_mask; dp_sim_set_sim_mode(debug->sim_bridge, debug->sim_mode); - dp_sim_update_port_num(debug->sim_bridge, 0); - /* switch to normal mode */ if (!debug->sim_mode) debug->aux->set_sim_mode(debug->aux, NULL); diff --git a/msm/dp/dp_mst_sim.c b/msm/dp/dp_mst_sim.c index 2e3eb403..2ed82571 100644 --- a/msm/dp/dp_mst_sim.c +++ b/msm/dp/dp_mst_sim.c @@ -342,10 +342,6 @@ int dp_sim_update_port_num(struct dp_aux_bridge *bridge, u32 port_num) return -EINVAL; sim_dev = to_dp_sim_dev(bridge); - DP_INFO("Update port count from %d to %d\n", port_num, sim_dev->port_num); - - if (sim_dev->port_num > port_num && sim_dev->ports) - sim_dev->port_num = port_num; if (port_num > sim_dev->port_num) { ports = devm_kzalloc(sim_dev->dev, diff --git a/msm/dp/dp_mst_sim_helper.c b/msm/dp/dp_mst_sim_helper.c index 1657c975..1fe4e916 100644 --- a/msm/dp/dp_mst_sim_helper.c +++ b/msm/dp/dp_mst_sim_helper.c @@ -1086,15 +1086,13 @@ int dp_mst_sim_update(void *mst_sim_context, u32 port_num, kfree(ctx->ports); ctx->port_num = 0; - if (port_num) { - ctx->ports = kcalloc(port_num, sizeof(*ports), GFP_KERNEL); - if (!ctx->ports) { - rc = -ENOMEM; - goto fail; - } - ctx->port_num = port_num; + ctx->ports = kcalloc(port_num, sizeof(*ports), GFP_KERNEL); + if (!ctx->ports) { + rc = -ENOMEM; + goto fail; } + ctx->port_num = port_num; for (i = 0; i < port_num; i++) { ctx->ports[i] = ports[i]; if (ports[i].edid_size) { @@ -1120,7 +1118,6 @@ fail: for (i = 0; i < ctx->port_num; i++) kfree(ctx->ports[i].edid); kfree(ctx->ports); - ctx->port_num = 0; } mutex_unlock(&ctx->session_lock);