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 092E01A76B2; Tue, 30 Jul 2024 17:27:24 +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=1722360444; cv=none; b=fr9M9G2yAF/s5D7WEQirssC210EmHMgqMll135HBloYnkCreR9RuefOqXgOqISngvgO6Zl6u3P8ZzkbzBZp0U59TdFq2tTINlgPiwSiXWb1NYt7qViolia7nCPIfNiC9wzQcVtpO/rdQ10jCMh7T/K0kwJihvI7X5MFdHM8kwLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722360444; c=relaxed/simple; bh=c0zlRqV1n/fnmCDX5ZZTsNMc3RkcyOaIC6B5SWSockM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dNs6W5yijp1eg18e2NzczCiTQFtxb6iT7ObUMJI6eP2+T+CFsta56y5opCCc+BJvgnF3m7FjQYBXmIBYR8GjLUmhS9nR0iWeGvVVTMUDRYHJz1vYM2ahbUGy5aMmoJaW5KHf52i9S0GoR2c95SpWlZM6gxFyeAIbcqKiUUg+wgE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dPdHu5zN; 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="dPdHu5zN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A3C1C32782; Tue, 30 Jul 2024 17:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722360443; bh=c0zlRqV1n/fnmCDX5ZZTsNMc3RkcyOaIC6B5SWSockM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dPdHu5zNdIkL7BUNALmL5zvphp1ZHo3F8DFMn8db98SLnZZxoOUND2SEj4ILl9AL/ z6Y+Uh1Y11qsslLxylK6ODn3MwG6Nfw/glHFZnzo8RreldOm3l+70uX5USeq8T2Z6B O+DGGRhj2NiufFs6va8HIPTTuoMmFQ03jdTA2CKE= 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 Subject: [PATCH 6.10 701/809] drm/dp_mst: Fix all mstb marked as not probed after suspend/resume Date: Tue, 30 Jul 2024 17:49:37 +0200 Message-ID: <20240730151752.612660702@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151724.637682316@linuxfoundation.org> References: <20240730151724.637682316@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wayne Lin commit d63d81094d208abb20fc444514b2d9ec2f4b7c4e upstream. [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: Greg Kroah-Hartman --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 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(stru /* 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(stru mutex_unlock(&mgr->lock); out: - if (ret <= 0) + if (ret < 0) mstb->link_address_sent = false; kfree(txmsg); return ret < 0 ? ret : changed;