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 460FDC4167B for ; Wed, 14 Dec 2022 18:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237958AbiLNSnH (ORCPT ); Wed, 14 Dec 2022 13:43:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238671AbiLNSnG (ORCPT ); Wed, 14 Dec 2022 13:43:06 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04D70D45 for ; Wed, 14 Dec 2022 10:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671043386; x=1702579386; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TkO/OjLlcLjPgVfZQcfk+7JhxG4B2uNmLJzM3oSl5iY=; b=VcZATEA7R4UHic/kHLlN3vplx7Awy5x79j2AA+nMO66Nd35sRHI2qqek whzrVOYO1r+3sOVVUYC0wIwhX7EaUz+nqNUroBsIPwnaTOryQn7vh+nnN ixbNdTxqkKlGwSwmPEzw18/yrYxOwlS3hkO/oVyQAeSnyr9lKaB7jDfrq 6zO5ZdrcSYWfqYzlD51m7KcXXVOPDekDUHGpUpONor/5vOZi2+7YfCpir UhPAkV4kZXNHSMfKSzPCsElFRnE/oO+oe5rmvUVI0YVbILtxf8+V3oQVz e/Jqb5eUzhSz5SI/f3mzeDY/xnyeUjTT1krvc0qDUyunAqGdm/h5oYp7S w==; X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="320343555" X-IronPort-AV: E=Sophos;i="5.96,245,1665471600"; d="scan'208";a="320343555" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2022 10:43:05 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="894424798" X-IronPort-AV: E=Sophos;i="5.96,245,1665471600"; d="scan'208";a="894424798" Received: from ideak-desk.fi.intel.com ([10.237.72.58]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2022 10:43:04 -0800 From: Imre Deak To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Lyude Paul , stable@vger.kernel.org Subject: [PATCH 3/3] drm/display/dp_mst: Fix payload addition on a disconnected sink Date: Wed, 14 Dec 2022 20:42:58 +0200 Message-Id: <20221214184258.2869417-3-imre.deak@intel.com> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221214184258.2869417-1-imre.deak@intel.com> References: <20221214184258.2869417-1-imre.deak@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org If an MST stream is enabled on a disconnected sink, the payload for the stream is not created and the MST manager's payload count/next start VC slot is not updated. Since the payload's start VC slot may still contain a valid value (!= -1) the subsequent disabling of such a stream could cause an incorrect decrease of the payload count/next start VC slot in drm_dp_remove_payload() and hence later payload additions will fail. Fix the above by marking the payload as invalid in the above case, so that it's skipped during payload removal. While at it add a debug print for this case. Cc: Lyude Paul Cc: # v6.1+ Signed-off-by: Imre Deak --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 01350510244f2..5861b0a6247bc 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3309,8 +3309,13 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr, int ret; port = drm_dp_mst_topology_get_port_validated(mgr, payload->port); - if (!port) + if (!port) { + drm_dbg_kms(mgr->dev, + "VCPI %d for port %p not in topology, not creating a payload\n", + payload->vcpi, payload->port); + payload->vc_start_slot = -1; return 0; + } if (mgr->payload_count == 0) mgr->next_start_slot = mst_state->start_slot; -- 2.37.1