From patchwork Wed Feb 21 23:19:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 204483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1353655dyc; Wed, 21 Feb 2024 15:22:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWd7NEqpx4it9z9rLkGpkZ/jTAWpyquMVu1KTzebPLbZtaidLBLOtanEDw3Kh/pTq4BhNEdwEvlOryzUdmmM7BLBonbaA== X-Google-Smtp-Source: AGHT+IE64jBe3ffLYwbDAm5QbiUqrk2Ig2Z5bcJOuS+6LDsW4gZ0jFpBAvfLwimTIHdSO0mEo6CR X-Received: by 2002:a17:906:29db:b0:a3f:10e8:ae2b with SMTP id y27-20020a17090629db00b00a3f10e8ae2bmr3721209eje.54.1708557744772; Wed, 21 Feb 2024 15:22:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708557744; cv=pass; d=google.com; s=arc-20160816; b=zV4LgJQ/x9xsTdCm35izJzVmVjVVP94GB6nIfJ7nZS4vuEzH8sVzmnfoKhRoz4NKy5 qEdv9ikPaVNJU4TaLqDwJlTcoypvr++WOOLLI7YdnMAK3rEGcw+20MSI4kZn2mlruPEf C6GVkQ6LDnFq/KKmsSrBoHXdpDSqwinF1RUAMeb3dC7PNgIYr4WqTQRhZk3JeB9DxWU8 4WB3r7G4R6YUzf6Gsz5ii1qMHYuPCEj0a5Yw2Is4kw/IdCc+sHdHsUvcwulmLd4tB7R3 GL6y8UegOHs/1Z8dPuCpWB3shpzrRyj4rh1djpSYRB/JdrKK6bpYiHr/EmS5C9Wc4v3P WJlw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=yfAT0/T92lmK4FtwYwglO51/H3PSfEs7Olu7AyGqwWY=; fh=Ph3D4iPhMs0qfrBSt7uGZnxnp3Fv4RZ3r2ELq4z6NQk=; b=Z3knNlgsJycJdy+mlLEM5oWFVsL0Zo/r30ISLFpsVTu605J98XyzZv5MlvOMKYnPD2 NqS/NMrTvjuSXk81+LiZffXop3cPbbq/iUvagErserqe1V/rQGodLE/QXhwz+3rgdls2 8ocO9E4WLGyzPqiOgfKBDaAIkuzSkCvT0D0ex67gAy96opa1xu2a+9lUSiWUo6dwUejK l7dyqLMI2bK9c3S7tf99orfL+4Qfxq7UhFx48OPN/4onVCOq4iko/z92vcldN7L+obWA qyhAoZ1FpczptyWsyRdPLMRaJjMJovnPgqBbHAzWaQAfAZT8svowq4VxTVAiuGHFLJqd IsQg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DDfmZCck; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-75644-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75644-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id gn41-20020a1709070d2900b00a3ed0ab5fa4si2851908ejc.886.2024.02.21.15.22.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 15:22:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75644-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DDfmZCck; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-75644-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75644-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3A0491F219CC for ; Wed, 21 Feb 2024 23:22:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D78C81292F2; Wed, 21 Feb 2024 23:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="DDfmZCck" Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 6D118128808; Wed, 21 Feb 2024 23:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708557569; cv=none; b=Bj41r0rXiJudXPqa8CgV8NyYTbEJXQNb05YfK2PMA1ic0ab5vJ8928W4JvWNoSU9MA0fp/HLFnQcUQjZIiinYgg4TCqqYvp/xceOFTBw3Xw3hAm6ZS+ZMbimfoMwrdV4xLcbArptdkkZnd8QXSFM5zNX7pZbVPooMm21/AgLsDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708557569; c=relaxed/simple; bh=xeV1ToLPdTsfBTdAmMyqgxgVXBjOacL5GwLnom0Crtg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=ub/gwluW4KA/PHq/3N+AtinWLjWwrTPK0ScvDdjJGUHoC4VifoquwAh+3w9OWeelP7XUv/EGSr7BbW/JrczTPxIe56ACpMbbpOwc/oOScm5+ZJD9u582uTSrhILOIngRW+4bSqq69FPrQBcZjarQ6+bxPZbS0dbG0pwufMInF+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=DDfmZCck; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41LNJG0L017953; Wed, 21 Feb 2024 23:19:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:date:subject:mime-version:content-type :content-transfer-encoding:message-id:references:in-reply-to:to :cc; s=qcppdkim1; bh=yfAT0/T92lmK4FtwYwglO51/H3PSfEs7Olu7AyGqwWY =; b=DDfmZCcksbYFT3YxdRFJpX6B8H3FBmNObzeVYtnlHGB5k62/TH7saE7Ym3F Jj0ZjxW+MaJupdnLO4vywxonNRyVEWJM3JI0jLa3dOGf8TKAhdn75EQWQh1OtUKn 3f4/xtXNPEGKKdTEFb5AT2pB0Wl4hmXMP+Md0RsOnLFhX8u2ZC91BP0BYQzfqdJr hYRQy2PKJZzyCKYve8XDRgUMUDd8Qb+Bf5nbkmAbm6rfel41Lng5iNy1l/vkgeHO vsnTli7qzGaK9U5JfwF56rpJtjzs3EERa5snpOAPttBhc0UkXmSxa/IyH8//LGSD xWMEj2ML8BoFHHJAhccfQbQtK0g== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3wdfm39nqh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 23:19:15 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41LNJEKP028446 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 23:19:14 GMT Received: from [169.254.0.1] (10.49.16.6) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 21 Feb 2024 15:19:13 -0800 From: Bjorn Andersson Date: Wed, 21 Feb 2024 15:19:09 -0800 Subject: [PATCH 1/9] drm/msm/dp: Add DP support to combo instance in SC7280 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20240221-rb3gen2-dp-connector-v1-1-dc0964ef7d96@quicinc.com> References: <20240221-rb3gen2-dp-connector-v1-0-dc0964ef7d96@quicinc.com> In-Reply-To: <20240221-rb3gen2-dp-connector-v1-0-dc0964ef7d96@quicinc.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: , , , , , Bjorn Andersson X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708557553; l=2017; i=quic_bjorande@quicinc.com; s=20230915; h=from:subject:message-id; bh=xeV1ToLPdTsfBTdAmMyqgxgVXBjOacL5GwLnom0Crtg=; b=B/NtNOd3/1fyvoIJ4xw1MisB8yYP1zGrdP9Q4mD3KfGjF1XMFwkluz5P1fyOFHUy/9BbZ8uam qijbX4ib8NODtsVIZ/NYwyXXo7vToa/tL+8+5YiCn+AGPCLJ7E9FUBz X-Developer-Key: i=quic_bjorande@quicinc.com; a=ed25519; pk=VkhObtljigy9k0ZUIE1Mvr0Y+E1dgBEH9WoLQnUtbIM= X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: DMTaaOvqnB3G9dRlf70wpjuxKZSGCYSB X-Proofpoint-ORIG-GUID: DMTaaOvqnB3G9dRlf70wpjuxKZSGCYSB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-21_09,2024-02-21_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxlogscore=999 bulkscore=0 impostorscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2402210184 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791552645754980521 X-GMAIL-MSGID: 1791552645754980521 When upstreamed the SC7280 DP controllers where described as one being DP and one eDP, but they can infact both be DP or eDP. Extend the list of DP controllers to cover both instances, and rely on the newly introduced mechanism for selecting which mode they should operate in. Move qcom,sc7280-edp to a dedicated list, to ensure existing DeviceTree will continue to select eDP. Signed-off-by: Bjorn Andersson Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 7b8c695d521a..1792ba9f7259 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -129,7 +129,12 @@ static const struct msm_dp_desc sc7180_dp_descs[] = { }; static const struct msm_dp_desc sc7280_dp_descs[] = { - { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .wide_bus_en = true }, + { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1, .wide_bus_en = true }, + {} +}; + +static const struct msm_dp_desc sc7280_edp_descs[] = { { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, {} }; @@ -182,7 +187,7 @@ static const struct msm_dp_desc x1e80100_dp_descs[] = { static const struct of_device_id dp_dt_match[] = { { .compatible = "qcom,sc7180-dp", .data = &sc7180_dp_descs }, { .compatible = "qcom,sc7280-dp", .data = &sc7280_dp_descs }, - { .compatible = "qcom,sc7280-edp", .data = &sc7280_dp_descs }, + { .compatible = "qcom,sc7280-edp", .data = &sc7280_edp_descs }, { .compatible = "qcom,sc8180x-dp", .data = &sc8180x_dp_descs }, { .compatible = "qcom,sc8180x-edp", .data = &sc8180x_dp_descs }, { .compatible = "qcom,sc8280xp-dp", .data = &sc8280xp_dp_descs },