From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A415E195B14 for ; Tue, 30 Jul 2024 09:30:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722331838; cv=none; b=KwxITdN4alOu3XkDldxBSi3bhY20uOKWdY0jTfPNQov1M9IeyOu4+XuSfzibxEEnZ3SMhXC3eBhEl1mAXKc+n/EdJx9drPDGNmmw+Wy8FTCeZXl2tmNX8KRRa9LxZlRxBVl4l5rNhptRWS0ZnQAs5SSJUyP1D5VPMQ2VI0JuC/8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722331838; c=relaxed/simple; bh=pOOPBSGnuuKiXlTDB07dEYBElt8DGDaId+ul6LajjZk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=JuyWinkq0SshDjXxaLaF6yiT08ForCUYYvJ+pMb3hLvTXbY6+zL9pQWB3MHxt/s5tig7F22KEaNurVXr27sMv3R5ja+UOAy1ONaRXee9s5cRGzmNpzjooO2w0cjI9iYxMVLNLYuHkYwAyFGre3fTxvbwPHY121v77Bm/qyDZ8O0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2U42jTwF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2U42jTwF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D09FCC32782; Tue, 30 Jul 2024 09:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722331838; bh=pOOPBSGnuuKiXlTDB07dEYBElt8DGDaId+ul6LajjZk=; h=Subject:To:Cc:From:Date:From; b=2U42jTwFH0GqkJC/fkAgUHaRhT1DCUzI1vc8h0xwMx8Ir86griK/8X9xRB+0f13A8 YPCKb4qVjWieffqAAZVW1Vn1ANb+htsjluVCuRfC9mCMsspoCZmANwx6mPw4x6XmiN XpVq+dYsMb6UEJsAbQSbr1LcYEkRDLvyxZq/zv0U= Subject: FAILED: patch "[PATCH] drm/dp_mst: Fix all mstb marked as not probed after" failed to apply to 5.10-stable tree To: Wayne.Lin@amd.com,daniel@ffwll.ch,hwentlan@amd.com,imre.deak@intel.com,jani.nikula@intel.com,lyude@redhat.com Cc: From: Date: Tue, 30 Jul 2024 11:30:32 +0200 Message-ID: <2024073032-gradient-gully-658f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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.10.y git checkout FETCH_HEAD git cherry-pick -x d63d81094d208abb20fc444514b2d9ec2f4b7c4e # git commit -s git send-email --to '' --in-reply-to '2024073032-gradient-gully-658f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: d63d81094d20 ("drm/dp_mst: Fix all mstb marked as not probed after suspend/resume") 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 d63d81094d208abb20fc444514b2d9ec2f4b7c4e Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 26 Jun 2024 16:48:23 +0800 Subject: [PATCH] drm/dp_mst: Fix all mstb marked as not probed after suspend/resume [Why] After supend/resume, with topology unchanged, observe that link_address_sent of all mstb are marked as false even the topology probing is done without any error. It is caused by wrongly also include "ret == 0" case as a probing failure case. [How] Remove inappropriate checking conditions. Cc: Lyude Paul Cc: Harry Wentland Cc: Jani Nikula Cc: Imre Deak Cc: Daniel Vetter Cc: stable@vger.kernel.org Fixes: 37dfdc55ffeb ("drm/dp_mst: Cleanup drm_dp_send_link_address() a bit") Signed-off-by: Wayne Lin Reviewed-by: Lyude Paul Signed-off-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20240626084825.878565-2-Wayne.Lin@amd.com diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 7f8e1cfbe19d..68831f4e502a 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -2929,7 +2929,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, /* FIXME: Actually do some real error handling here */ ret = drm_dp_mst_wait_tx_reply(mstb, txmsg); - if (ret <= 0) { + if (ret < 0) { drm_err(mgr->dev, "Sending link address failed with %d\n", ret); goto out; } @@ -2981,7 +2981,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, mutex_unlock(&mgr->lock); out: - if (ret <= 0) + if (ret < 0) mstb->link_address_sent = false; kfree(txmsg); return ret < 0 ? ret : changed;