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 3FA5717C9A9; Thu, 15 Aug 2024 13:56:02 +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=1723730162; cv=none; b=HO2yeP/21CF/otBwR4ylD1i0CcVFVcPVSMHy87JUQNcLrkF9upcEvvHlMskPz3j/lODpCe0PcNL+6QsVfuskDG6Z0q8KeQ79iOkxIrxlaf0dcWbuXfSkDezKutUvtDgNOpka7jv14zva3CA4xSML970ejbRQm3b/UEnsCyIN+tU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730162; c=relaxed/simple; bh=LUgA+1lR9RH3Y2vlRbhomDpLeIv2heOszqRdtfcjtl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IO5jVQoQnB1lwRqLQBbYd/ut5ZO1ybpZJn92X86WW0emIL34+UXVM4r7IW1JnHIDMp77/HdAoPItnSmtASay8+5JtU9FrIBiEzZvnNsXlZg55pvT3CHUauxij0sI6ttU1ceF5E5urS3tU2PIdfa0FQjQZ1iDtuohDV1JpRLhLfQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=e9QcKr5E; 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="e9QcKr5E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1607C32786; Thu, 15 Aug 2024 13:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723730162; bh=LUgA+1lR9RH3Y2vlRbhomDpLeIv2heOszqRdtfcjtl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e9QcKr5ER7mxNAqjnu979ANSQNsA/XZTAWPfPgnv53wnmIj68O9J5+thvsikUHyXx okSYWTZpd2q46yS9cBB5qwpCuP/iSXaBRgAh29wxO/psx2rAqdwsgv0KdAuZ2pfG7K +1RZs9vjhJ3NT7EJld5jphwdxSc4DYZTN+8izwDs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lyude Paul , Harry Wentland , Jani Nikula , Imre Deak , Daniel Vetter , Wayne Lin , Sasha Levin Subject: [PATCH 5.15 322/484] drm/dp_mst: Fix all mstb marked as not probed after suspend/resume Date: Thu, 15 Aug 2024 15:23:00 +0200 Message-ID: <20240815131953.847056686@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131941.255804951@linuxfoundation.org> References: <20240815131941.255804951@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wayne Lin [ Upstream commit d63d81094d208abb20fc444514b2d9ec2f4b7c4e ] [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 Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 865c7f39143ec..f24667a003a2b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2974,7 +2974,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; } @@ -3026,7 +3026,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; -- 2.43.0