From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795076703; b=NmSC+RP89nUzSmG+1SMp/SgD54R9lt9g0aEUzXRsyw1lLIZDTLu/4GPywUl+9H4Geyy8 Q5aLAJuV4/ulAy9wz8f1KBePBJDMl4RsdPJZ4VogYlJ0GpVLZ2B40SpdkBO6Vhqs0Vz4j ntGAIDhplyBPFu5uu00/cxSVvWc2z7CLAGSfGeFKGTgLtlXIVdXqqtG/VXbK9b03E8ZUZ tPtiQmQRCmT77+8NxcWPhGjGGN1Vw8mB5M7vqjXzngL+yUEZtDjQ3NqRGdiLdt4L9dq9i K5PMI8rKEJI3yrmCj9rWvP4zInxgfxMDZtyg8mBozpD8HL5Nhghh1zhPkv/vhGoTmIA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795076703; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Proofpoint-ORIG-GUID: X-Authority-Analysis:X-Proofpoint-Spam-Info:X-Proofpoint-GUID: X-Proofpoint-Spam-Details-Enc:X-Proofpoint-Virus-Version: X-Proofpoint-Spam-Details; bh=8ikT8qxfQoYaGtQF+eau1LCoczuy8DK9/lHIbbn2is8=; b=vCDt8R4YGu/NwrczJ5NcDFdHuOKIXhHLPFNMyGjVCnp2Anv0vudu5RdbzURQM7fdxRfi fDsOvn6CnO3EZngunP8pG0SNiezn8TeWoFv1tG/jnrl3gEjUK+TrbOoYcY2AzW6k26pLW yAw2skerPYUDJYiY2deXYxJb7olTW3kHWWvwfVpYjb699Z8EALxPOErmagPE3kKuiAxi6 aCNww7/BWE3GYmRUxutn98iiuuJ9iIQXpHRgezeJxvJtb0g4SxYn9jrKI6D4A6tcQZdRN xCDtLQ1fpsMhPHnAIGILO69vx6Y8lqAa913C/0bch6cANDFD1h+mzjqUZCZ9l9+sb4g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=Jb2YjZZU; dkim=pass header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=KEjahjwV; arc=none smtp.remote-ip=205.220.168.131 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 947E9606A320 for ; Thu, 19 Nov 2026 08:25:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 947E9606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=Jb2YjZZU; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=KEjahjwV Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AJ6vNNQ2194654 for ; Thu, 19 Nov 2026 08:25:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8ikT8qxfQoYaGtQF+eau1LCoczuy8DK9/lHIbbn2is8=; b=Jb2YjZZUlRRsQlzR ExIceSeNav5fLQO26QFBOohJgE0tpCso2WyhLmdxH88o2TfCCnY3tNzh7rpB7nN7 uc6Ivka0wiiQiVcO4eDdbx5jpBQEX47MrB+ptHuGsgN6tAx0NCa4vx2PumupA/N4 OZizqPRMu2uqcXVAQGN2PVZprbYwEXcUR2CC10B+DTbqXPOI6RBW7ZU8qnN+hiE5 L7PnKIutJGLvwWy1UCXLTBXfSn9stCF3LxRRPg40X5jdl7uAHWv63PKnOMAzkpqZ F+YR3+IiZO2t/WvU8u2qiE58GcQR7QwHKm1q0mlFmAqcUnggTAxcTD5VO1Vx29j6 mExLAw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4j1e5quysh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 19 Nov 2026 08:25:01 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-946038e22f5so37405785a.0 for ; Thu, 19 Nov 2026 00:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1795076701; x=1795681501; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8ikT8qxfQoYaGtQF+eau1LCoczuy8DK9/lHIbbn2is8=; b=KEjahjwVdwchPd+KSeA6xShuExYaKR3zWq3fHC9LLC7qzgpRagCaxMAExw2a9I5Jz9 q9KUFZvvuYMT+n9pDVx2Wwu+TQz//6S5bdtrt/v0Ih4olhNbCwSnGOQxUg4ZAEi+p3kW Et2qYBUkeycngLIyhq3G2bLZ+dAGm56T+m38a1/4U3abmVYxwVxJcl3BQtAHdDaR7LNk fX7+ilsdUOYe8Xjm199t36LY6wWaPvy+Cb/6l/hd/hOYmdZb8h2moloCO1dm/GqvGWG9 WL9Eyb83tRtOoBXf/bAqcIMJQzFOp+70SlcMzhaIyWkWihufPHeMjoA7zUo40k8Gbz2f byzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795076701; x=1795681501; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8ikT8qxfQoYaGtQF+eau1LCoczuy8DK9/lHIbbn2is8=; b=r8E38vp5p4OjmOhQn0hJ1wLkMSGexXs108dBRrcTXF4TKbF5TenYb5giVu5zR8sBoW zMAkCVnuv07GIedn6ScB5FF86NTwyuDY49aCGV61+f4I438xu0uLUerjamQM8SzEo9JF R3Z6w/MDQ+9Z5SCLI/GiwyEK52+LIHnHkTEQ3KJWSDmmx6GJBi2Lx/j8JjCN/Ylnj4Lj ZTwEk9yn7YvnLFfLw+iyT7cFqej7v6ZjxcfaIMMOz2P8TjQBzLyRe7ZA0DlDK682+4pr Kn78/qIxNg8+IjuM+uix/QyYAGfUXQrd5r0oqnd2VqhNLkK6DckYozGmFHFc/BwV8f8d +bYw== X-Forwarded-Encrypted: i=1; AL+hErEqDhfhOOQ/gL89lW/jYvj4DaV0VTV7Sn5TR3t2XbI3OkeWpPRbSDkVqlvPFG7FHPCICryRMeRGwRxt9AQ=@vger.kernel.org X-Gm-Message-State: APuU4Z/c0DaxCFqmZeE5rofUZLuyfAuqGm/QJyp2bzLuTvh1PwJ9lQaG 4/E872jN7AxLVNrjHL5ynS1XKoc99RWDeIp7MupzJWdLnh6bgcLDAHT/ntFlrEPKXa69LttIh72 d8VBVzjvSEWuieU1FLL+MtvfbM+KKm6j86XEch1Jz05IN39j2hfUmL/b3OqcqhUpjRWo= X-Gm-Gg: AYBFou2rshb0h1tMIO2rx5+kLVlsc6QZQBZQegEFIqtCIKKuqiHXqBG8I0BjEfVr7eL oalvg48Pwdif+nAGvGz94MHZAc228N8D/f3Cm9Eu62NOCTReICqMdqi3E2LuXR6H1jCXNAgR9EA E9M72rKbLrtrDXhBV4xJPEglwbHwbtmvhOTbxaeCTmW+gEmh6StGOgLgbAXrbkCrmXjPcZtOSP9 k6X/GSw3lDj7Zhub+ElU0oPnn+JZwPtJuimyNfK+tdBc4iL7+iB8v9kiImq5WQUmcMjJObXcyJo TUVMa3y/hSi+OHskVS1WFgf30hLDGBiNLFu6tcWSOR/mRFZI8dYZh6ghxsXX20IMDDEet7e5z2n 55L9OGaYdP84VtDoHp6i7v4l+o1N09+zhhxcWCJzOE3fvHR7pLaQ9+yYg2X/IthpHW44Hc0HYJV GbXQpT1N2hfevfk/JrIcZEBojzYwrALcpOd+Yj X-Received: by 2002:a05:620a:170d:b0:93f:2f48:c9e5 with SMTP id af79cd13be357-9499975fc72mr1008778485a.34.1795076700932; Thu, 19 Nov 2026 00:25:00 -0800 (PST) X-Received: by 2002:a05:620a:170d:b0:93f:2f48:c9e5 with SMTP id af79cd13be357-9499975fc72mr1008775785a.34.1795076700440; Thu, 19 Nov 2026 00:25:00 -0800 (PST) Received: from yongmou2.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9499b721861sm388465185a.11.2026.11.19.00.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2026 00:25:00 -0800 (PST) From: Yongxing Mou Date: Thu, 19 Nov 2026 16:24:08 +0800 Subject: [PATCH v9 06/29] drm/msm/dp: add support for sending VCPF packets in DP controller X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261119-msm-dp-mst-v9-6-ca61be4edfc3@oss.qualcomm.com> References: <20261119-msm-dp-mst-v9-0-ca61be4edfc3@oss.qualcomm.com> In-Reply-To: <20261119-msm-dp-mst-v9-0-ca61be4edfc3@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yongxing Mou , Abhinav Kumar , Dmitry Baryshkov X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795076662; l=8277; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=djwKXgEETnAdOysD0NcsMPGENTHyc3JT1+jwNAxqdFQ=; b=LPmlr6mjF8xe4Y6Z2Q/8INDqMMUoWKMquCVfZmVKOnq5T5PuUc8M6QpAgfi09NJUferiZTV5D 4lJq5G70G1YB3dW/SvfV9RjQHI29OsSV6X+em0qua9D4Gik+idBfj+S X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-ORIG-GUID: rfjqmTAqwGVK9sPfjSKcxPhE7hMduehB X-Authority-Analysis: v=2.4 cv=c5Q+0h9l c=1 sm=1 tr=0 ts=6afeb25e cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=3K0hjHndsinMD8gLsdoA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE5MDAzMyBTYWx0ZWRfXxlMnsKF6SjrW Uh7pML5J+22mC6IRxE0G0AvMRnlfR23QktOR3pgWXF+02INQEd5K87Gq9OgXVEYvxnTdUFiykG5 vPW4i6zBZziOvcJ/lUZF6RXCrPLvieI= X-Proofpoint-GUID: rfjqmTAqwGVK9sPfjSKcxPhE7hMduehB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE5MDAzMyBTYWx0ZWRfXyhuO+LGtes57 Yc9mGjnzUnEJHEuL0DgYGogzKovkMcG46Xta1FHk1CKUGyfWkfrN0M2hXNkISlCmxOjIFjbcb/H AbfhJR20zY3tTVy3wBNpFekc9nFgRW2N793pwKk2ly/uGq46U9yXa7iZ3tqXzmNbc9HGLTMa9cL dSI+LiDjPCQ2BMzJnp9IwqtWd4f+TxZ6V3GAXHwyYSXmFxJ1PBFRAZIDQu2W63ikjJ5BtWfBcw6 fITfIALedjkz4nVmd45QpPwP7C8bGJ0Ynr4PcDfqU/HCWUfw/Yc/Bz9demrHx3AaVUTPNX9Iwcv AjCbR9O0Yvr84LH8p2MRDx/80mHyg1ZJFrCGLM/eFN4OpHZmkLeLXGNPMOq1WLU/N0/Icyj5T7M zlnusQJYchr5InEF5nBdbkaWySOBwxjJ/MJPlxrlfEfsBfJ/G95mALeHXfOUJArzQaCNdOO/96V 3+eLgtIyjIPeB2YxIww== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-19_02,2026-11-16_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611190033 From: Abhinav Kumar The VC Payload Fill (VCPF) sequence is inserted by the DP controller when stream symbols are absent, typically before a stream is disabled. Add support for triggering the VCPF sequence in the MSM DP controller. VCPF completion events for streams 2 and 3 are reported in STATUS7, while streams 0 and 1 use STATUS5. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 86 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 + drivers/gpu/drm/msm/dp/dp_display.c | 2 +- drivers/gpu/drm/msm/dp/dp_reg.h | 12 ++++++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index a3aa946c24257..2ff36d3fcb67f 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -65,6 +65,16 @@ (PSR_UPDATE_MASK | PSR_CAPTURE_MASK | PSR_EXIT_MASK | \ PSR_UPDATE_ERROR_MASK | PSR_WAKE_ERROR_MASK) +#define DP_INTERRUPT_STATUS5 \ + (DP_INTR_MST_DP0_VCPF_SENT | DP_INTR_MST_DP1_VCPF_SENT) +#define DP_INTERRUPT_STATUS5_MASK \ + (DP_INTERRUPT_STATUS5 << DP_INTERRUPT_STATUS_MASK_SHIFT) + +#define DP_INTERRUPT_STATUS7 \ + (DP_INTR_MST_DP2_VCPF_SENT | DP_INTR_MST_DP3_VCPF_SENT) +#define DP_INTERRUPT_STATUS7_MASK \ + (DP_INTERRUPT_STATUS7 << DP_INTERRUPT_STATUS_MASK_SHIFT) + #define DP_CTRL_INTR_READY_FOR_VIDEO BIT(0) #define DP_CTRL_INTR_IDLE_PATTERN_SENT BIT(3) @@ -351,6 +361,12 @@ void msm_dp_ctrl_enable_irq(struct msm_dp_ctrl *msm_dp_ctrl) DP_INTERRUPT_STATUS1_MASK); msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS2, DP_INTERRUPT_STATUS2_MASK); + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS5, + DP_INTERRUPT_STATUS5_MASK); + if (ctrl->num_pixel_clks > DP_STREAM_2) { + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS7, + DP_INTERRUPT_STATUS7_MASK); + } } void msm_dp_ctrl_disable_irq(struct msm_dp_ctrl *msm_dp_ctrl) @@ -360,6 +376,9 @@ void msm_dp_ctrl_disable_irq(struct msm_dp_ctrl *msm_dp_ctrl) msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS, 0x00); msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS2, 0x00); + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS5, 0x00); + if (ctrl->num_pixel_clks > DP_STREAM_2) + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS7, 0x00); } static u32 msm_dp_ctrl_get_psr_interrupt(struct msm_dp_ctrl_private *ctrl) @@ -379,6 +398,34 @@ static void msm_dp_ctrl_config_psr_interrupt(struct msm_dp_ctrl_private *ctrl) msm_dp_write_ahb(ctrl, REG_DP_INTR_MASK4, DP_INTERRUPT_MASK4); } +static u32 msm_dp_ctrl_get_mst_vcpf_interrupt_0_1(struct msm_dp_ctrl_private *ctrl) +{ + u32 intr, intr_ack; + + intr = msm_dp_read_ahb(ctrl, REG_DP_INTR_STATUS5); + intr &= ~DP_INTERRUPT_STATUS5_MASK; + intr_ack = (intr & DP_INTERRUPT_STATUS5) + << DP_INTERRUPT_STATUS_ACK_SHIFT; + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS5, + intr_ack | DP_INTERRUPT_STATUS5_MASK); + + return intr & DP_INTERRUPT_STATUS5; +} + +static u32 msm_dp_ctrl_get_mst_vcpf_interrupt_2_3(struct msm_dp_ctrl_private *ctrl) +{ + u32 intr, intr_ack; + + intr = msm_dp_read_ahb(ctrl, REG_DP_INTR_STATUS7); + intr &= ~DP_INTERRUPT_STATUS7_MASK; + intr_ack = (intr & DP_INTERRUPT_STATUS7) + << DP_INTERRUPT_STATUS_ACK_SHIFT; + msm_dp_write_ahb(ctrl, REG_DP_INTR_STATUS7, + intr_ack | DP_INTERRUPT_STATUS7_MASK); + + return intr & DP_INTERRUPT_STATUS7; +} + static void msm_dp_ctrl_psr_mainlink_enable(struct msm_dp_ctrl_private *ctrl) { u32 val; @@ -478,6 +525,35 @@ void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl) drm_dbg_dp(ctrl->drm_dev, "mainlink off\n"); } +/* Must be called with msm_dp_mst::mst_lock held */ +void msm_dp_ctrl_push_vcpf(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *msm_dp_panel) +{ + struct msm_dp_ctrl_private *ctrl; + u32 state = 0x0; + + ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl); + + if (!ctrl->mst_mode) { + msm_dp_ctrl_push_idle(msm_dp_ctrl); + return; + } + + if (msm_dp_panel->stream_id == DP_STREAM_0) + state |= DP_STATE_CTRL_DP0_PUSH_VCPF; + else if (msm_dp_panel->stream_id == DP_STREAM_1) + state |= DP_STATE_CTRL_DP1_PUSH_VCPF; + else + state |= DP_MSTLINK_PUSH_VCPF; + + reinit_completion(&ctrl->idle_comp); + + msm_dp_write_stream_link(ctrl, msm_dp_panel->stream_id, REG_DP_STATE_CTRL, state); + + if (!wait_for_completion_timeout(&ctrl->idle_comp, + IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES)) + pr_warn("PUSH_VCPF pattern timedout\n"); +} + static void msm_dp_ctrl_config_ctrl_streams(struct msm_dp_ctrl_private *ctrl, struct msm_dp_panel *msm_dp_panel) { @@ -2814,6 +2890,16 @@ irqreturn_t msm_dp_ctrl_isr(struct msm_dp_ctrl *msm_dp_ctrl, ret = IRQ_HANDLED; } + isr = msm_dp_ctrl_get_mst_vcpf_interrupt_0_1(ctrl); + if (ctrl->num_pixel_clks > DP_STREAM_2) + isr |= msm_dp_ctrl_get_mst_vcpf_interrupt_2_3(ctrl); + + if (isr & (DP_INTR_MST_DP0_VCPF_SENT | DP_INTR_MST_DP1_VCPF_SENT | + DP_INTR_MST_DP2_VCPF_SENT | DP_INTR_MST_DP3_VCPF_SENT)) { + complete(&ctrl->idle_comp); + ret = IRQ_HANDLED; + } + /* DP aux isr */ isr = msm_dp_ctrl_get_aux_interrupt(ctrl); if (isr) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h index 41a69447001cd..84ea37d8db2e3 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -27,6 +27,7 @@ void msm_dp_ctrl_off_link(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *panel); void msm_dp_ctrl_off_pixel_clk(struct msm_dp_ctrl *msm_dp_ctrl, enum msm_dp_stream_id stream_id); void msm_dp_ctrl_push_idle(struct msm_dp_ctrl *msm_dp_ctrl); +void msm_dp_ctrl_push_vcpf(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *panel); irqreturn_t msm_dp_ctrl_isr(struct msm_dp_ctrl *msm_dp_ctrl, struct msm_dp_panel *panel); void msm_dp_ctrl_handle_sink_request(struct msm_dp_ctrl *msm_dp_ctrl, diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 4862d0b42f290..f6d16c57afcc1 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1524,7 +1524,7 @@ void msm_dp_display_atomic_disable(struct msm_dp *dp) if (!dp->power_on) return; - msm_dp_ctrl_push_idle(msm_dp_display->ctrl); + msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_display->panel); msm_dp_ctrl_mst_send_act(msm_dp_display->ctrl, msm_dp_display->panel); } diff --git a/drivers/gpu/drm/msm/dp/dp_reg.h b/drivers/gpu/drm/msm/dp/dp_reg.h index cc74b1ed628ec..36cfd94ac1622 100644 --- a/drivers/gpu/drm/msm/dp/dp_reg.h +++ b/drivers/gpu/drm/msm/dp/dp_reg.h @@ -42,6 +42,9 @@ #define DP_INTR_FRAME_END BIT(6) #define DP_INTR_CRC_UPDATED BIT(9) +#define DP_INTR_MST_DP0_VCPF_SENT BIT(0) +#define DP_INTR_MST_DP1_VCPF_SENT BIT(3) + #define REG_DP_INTR_STATUS3 (0x00000028) #define REG_DP_INTR_STATUS4 (0x0000002C) @@ -58,6 +61,12 @@ #define PSR_UPDATE_ERROR_MASK (0x00000008) #define PSR_WAKE_ERROR_MASK (0x00000010) +#define REG_DP_INTR_STATUS5 (0x00000034) + +#define REG_DP_INTR_STATUS7 (0x000000FC) +#define DP_INTR_MST_DP2_VCPF_SENT BIT(18) +#define DP_INTR_MST_DP3_VCPF_SENT BIT(21) + #define REG_DP_DP_HPD_CTRL (0x00000000) #define DP_DP_HPD_CTRL_HPD_EN (0x00000001) @@ -143,6 +152,8 @@ #define DP_STATE_CTRL_LINK_TEST_CUSTOM_PATTERN (0x00000040) #define DP_STATE_CTRL_SEND_VIDEO (0x00000080) #define DP_STATE_CTRL_PUSH_IDLE (0x00000100) +#define DP_STATE_CTRL_DP0_PUSH_VCPF BIT(12) +#define DP_STATE_CTRL_DP1_PUSH_VCPF BIT(14) #define REG_DP_CONFIGURATION_CTRL (0x00000008) #define DP_CONFIGURATION_CTRL_SYNC_ASYNC_CLK (0x00000001) @@ -370,6 +381,7 @@ /* Streams 2/3 registers, relative to mst2link_base / mst3link_base. */ #define REG_DP_MSTLINK_STATE_CTRL (0x00000000) +#define DP_MSTLINK_PUSH_VCPF BIT(12) #define REG_DP_MSTLINK_CONFIGURATION_CTRL (0x00000034) #define REG_DP_MSTLINK_TIMESLOT_1_32 (0x00000038) #define REG_DP_MSTLINK_TIMESLOT_33_63 (0x0000003c) -- 2.43.0