drm/dp_mst: Reset message rx state after OOM in drm_dp_mst_handle_up_req()

After an out-of-memory error the reception state should be reset, so
that the next attempt receiving a message doesn't fail (due to getting a
start-of-message packet, while the reception state has already the
start-of-message flag set).

Cc: Lyude Paul <lyude@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241203160223.2926014-7-imre.deak@intel.com

diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 1d1b5f37b0076b7dcd1b67ef3f76726600dcd7ca..e5713e3be80e3fcd453d2c5615697cce20226d3c 100644 (file)
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -4110,6 +4110,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
 {
        struct drm_dp_pending_up_req *up_req;
        struct drm_dp_mst_branch *mst_primary;
+       int ret = 0;
 
        if (!drm_dp_get_one_sb_msg(mgr, true, NULL))
                goto out_clear_reply;
@@ -4118,8 +4119,10 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
                return 0;
 
        up_req = kzalloc(sizeof(*up_req), GFP_KERNEL);
-       if (!up_req)
-               return -ENOMEM;
+       if (!up_req) {
+               ret = -ENOMEM;
+               goto out_clear_reply;
+       }
 
        INIT_LIST_HEAD(&up_req->next);
 
@@ -4186,7 +4189,7 @@ out_put_primary:
        drm_dp_mst_topology_put_mstb(mst_primary);
 out_clear_reply:
        memset(&mgr->up_req_recv, 0, sizeof(struct drm_dp_sideband_msg_rx));
-       return 0;
+       return ret;
 }
 
 static void update_msg_rx_state(struct drm_dp_mst_topology_mgr *mgr)