From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46907C6FA99 for ; Fri, 10 Mar 2023 11:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230465AbjCJLeW (ORCPT ); Fri, 10 Mar 2023 06:34:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230386AbjCJLeP (ORCPT ); Fri, 10 Mar 2023 06:34:15 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7B4710E27B for ; Fri, 10 Mar 2023 03:34:13 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8CB69B82272 for ; Fri, 10 Mar 2023 11:34:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE5CCC433EF; Fri, 10 Mar 2023 11:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678448051; bh=exdxb4gRWZReMroXt6dUxPnHbPqoqOi0bWVHilKjDPw=; h=Subject:To:Cc:From:Date:From; b=W1ktVfqxajxT24hbTunnCVro+ZFy6JubwOq6FYh/BivSXVoge15go1U0ihKImukg1 gkI6JbnDZmc3DsmHxbe+OOHzrnihdjiIHYz4SaiQAMf7N0IaxEa6L3jkuOUhzo4DJ4 rBYUT4sIyFEbCLHl5J/cpA4uAVgB9tjjGzrnr/3Q= Subject: FAILED: patch "[PATCH] drm/display/dp_mst: Fix down message handling after a packet" failed to apply to 5.4-stable tree To: imre.deak@intel.com, lyude@redhat.com, stable@vger.kernel.org Cc: From: Date: Fri, 10 Mar 2023 12:34:08 +0100 Message-ID: <16784480483547@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 1241aedb6b5c7a5a8ad73e5eb3a41cfe18a3e00e # git commit -s git send-email --to '' --in-reply-to '16784480483547@kroah.com' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 1241aedb6b5c ("drm/display/dp_mst: Fix down message handling after a packet reception error") da68386d9edb ("drm: Rename dp/ to display/") 6c64ae228f08 ("Backmerge tag 'v5.17-rc6' into drm-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1241aedb6b5c7a5a8ad73e5eb3a41cfe18a3e00e Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Wed, 14 Dec 2022 20:42:57 +0200 Subject: [PATCH] drm/display/dp_mst: Fix down message handling after a packet reception error After an error during receiving a packet for a multi-packet DP MST sideband message, the state tracking which packets have been received already is not reset. This prevents the reception of subsequent down messages (due to the pending message not yet completed with an end-of-message-transfer packet). Fix the above by resetting the reception state after a packet error. Cc: Lyude Paul Cc: # v3.17+ Signed-off-by: Imre Deak Reviewed-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20221214184258.2869417-2-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 90819fff2c9b..01350510244f 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3856,7 +3856,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) struct drm_dp_sideband_msg_rx *msg = &mgr->down_rep_recv; if (!drm_dp_get_one_sb_msg(mgr, false, &mstb)) - goto out; + goto out_clear_reply; /* Multi-packet message transmission, don't clear the reply */ if (!msg->have_eomt)