From mboxrd@z Thu Jan 1 00:00:00 1970 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 0E14E22EFA for ; Fri, 26 Jan 2024 22:25:41 +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=1706307943; cv=none; b=MVyLqNe4ccNlB+fYIqfvvCbYDQBty95yPvnAfcufW1UEZnvzK+5oeoRGh5jQQHxZjnXWC7UwDq9Cuv2v2Pv1bv9mJCO8wnCK9qAzI9Fz/H8cTEjMomH+z1k8cIRp0uUaf3lnEPSuTvK6K0bCdY6KtD7J5CnEajLNKCIIAOAKTbw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706307943; c=relaxed/simple; bh=M5E9JSGmJjFGM5nOr1AAQ9/eW4Nt0q7apeDlrvD+LBQ=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=sHafQKUj44byP2/yM9DkYzEIcqzYmc08RUmU6sjW197ThonXZXSCrCuGiEutxzmrMQb8IwQ62iEleONJVSswwiRfARko77mN/gT8T+T8GujbE1EAK7Nb8o0h06EhvQYi/Nz/FLFmBtSc59parGYkRoZnQPzvlECETQdc+aarf8E= 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=YbSCzkBu; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="YbSCzkBu" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40QLcuBr021576; Fri, 26 Jan 2024 22:25:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s= qcppdkim1; bh=YTDjQEYrvgrL+ZdgNA1bHcLduRD+VgtfXl0m2xsiwYA=; b=Yb SCzkBuDQe2B/OcUSklbxnGHCbksmAr+zJERkSVLJGDyGiACfVzYtIcsS2HkCG8eO zNeP+Y+j0SJ48VGRBaf5MNpqgjxKOpTX7wphkyTAs38TAUzI/8fSEnaJIg7vb2mE q/G0zelXjSueXy6Enxy/RcmnCrL/OpptNg74wWSaCPzaoPsiS66y44bMRVWkihQu yaXWyUZRXQx96+9IouNXCnanMxbea16xqHscEAK5RdATsqPQnnuF6TEFRTUGxYhW tQYM2bNXQ5u43UGKRNyrkCGvYFUcgK5wmr8fApT6Vu6YY9SoRkRexC6s0LJl/UqX p+O+MjV5y3MnljZjIIdQ== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vv6c8j1fm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 22:25:33 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40QMPWw8016013 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 Jan 2024 22:25:32 GMT Received: from [10.110.48.234] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 26 Jan 2024 14:25:31 -0800 Message-ID: <0baffdcb-80bd-63ff-e78c-c067d8df1bc9@quicinc.com> Date: Fri, 26 Jan 2024 14:25:31 -0800 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH RESEND v3 14/15] drm/msm/dp: move next_bridge handling to dp_display Content-Language: en-US To: Dmitry Baryshkov , Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , "David Airlie" , Daniel Vetter , Stephen Boyd CC: , , , Bjorn Andersson , Konrad Dybcio References: <20240126-dp-power-parser-cleanup-v3-0-098d5f581dd3@linaro.org> <20240126-dp-power-parser-cleanup-v3-14-098d5f581dd3@linaro.org> From: Kuogee Hsieh In-Reply-To: <20240126-dp-power-parser-cleanup-v3-14-098d5f581dd3@linaro.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: HXUUD6KFKL6h-YKshZBXyKKK7ZwGEw-6 X-Proofpoint-ORIG-GUID: HXUUD6KFKL6h-YKshZBXyKKK7ZwGEw-6 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-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401260164 On 1/26/2024 10:26 AM, Dmitry Baryshkov wrote: > Remove two levels of indirection and fetch next bridge directly in > dp_display_probe_tail(). > > Signed-off-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh Reviewed-by: Kuogee Hsieh > --- > drivers/gpu/drm/msm/dp/dp_display.c | 43 ++++++++++++------------------------- > drivers/gpu/drm/msm/dp/dp_parser.c | 14 ------------ > drivers/gpu/drm/msm/dp/dp_parser.h | 14 ------------ > 3 files changed, 14 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index f19cb8c7e8cb..de1306a88748 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -1195,16 +1195,25 @@ static const struct msm_dp_desc *dp_display_get_desc(struct platform_device *pde > return NULL; > } > > -static int dp_display_get_next_bridge(struct msm_dp *dp); > - > static int dp_display_probe_tail(struct device *dev) > { > struct msm_dp *dp = dev_get_drvdata(dev); > int ret; > > - ret = dp_display_get_next_bridge(dp); > - if (ret) > - return ret; > + /* > + * External bridges are mandatory for eDP interfaces: one has to > + * provide at least an eDP panel (which gets wrapped into panel-bridge). > + * > + * For DisplayPort interfaces external bridges are optional, so > + * silently ignore an error if one is not present (-ENODEV). > + */ > + dp->next_bridge = devm_drm_of_get_bridge(&dp->pdev->dev, dp->pdev->dev.of_node, 1, 0); > + if (IS_ERR(dp->next_bridge)) { > + ret = PTR_ERR(dp->next_bridge); > + dp->next_bridge = NULL; > + if (dp->is_edp || ret != -ENODEV) > + return ret; > + } > > ret = component_add(dev, &dp_display_comp_ops); > if (ret) > @@ -1397,30 +1406,6 @@ void dp_display_debugfs_init(struct msm_dp *dp_display, struct dentry *root, boo > } > } > > -static int dp_display_get_next_bridge(struct msm_dp *dp) > -{ > - int rc; > - struct dp_display_private *dp_priv; > - > - dp_priv = container_of(dp, struct dp_display_private, dp_display); > - > - /* > - * External bridges are mandatory for eDP interfaces: one has to > - * provide at least an eDP panel (which gets wrapped into panel-bridge). > - * > - * For DisplayPort interfaces external bridges are optional, so > - * silently ignore an error if one is not present (-ENODEV). > - */ > - rc = devm_dp_parser_find_next_bridge(&dp->pdev->dev, dp_priv->parser); > - if (!dp->is_edp && rc == -ENODEV) > - return 0; > - > - if (!rc) > - dp->next_bridge = dp_priv->parser->next_bridge; > - > - return rc; > -} > - > int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, > struct drm_encoder *encoder) > { > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index aa135d5cedbd..f95ab3c5c72c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -24,20 +24,6 @@ static int dp_parser_ctrl_res(struct dp_parser *parser) > return 0; > } > > -int devm_dp_parser_find_next_bridge(struct device *dev, struct dp_parser *parser) > -{ > - struct platform_device *pdev = parser->pdev; > - struct drm_bridge *bridge; > - > - bridge = devm_drm_of_get_bridge(dev, pdev->dev.of_node, 1, 0); > - if (IS_ERR(bridge)) > - return PTR_ERR(bridge); > - > - parser->next_bridge = bridge; > - > - return 0; > -} > - > static int dp_parser_parse(struct dp_parser *parser) > { > int rc = 0; > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h > index 21a66932e35e..38fd335d5950 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.h > +++ b/drivers/gpu/drm/msm/dp/dp_parser.h > @@ -21,7 +21,6 @@ > struct dp_parser { > struct platform_device *pdev; > struct phy *phy; > - struct drm_bridge *next_bridge; > }; > > /** > @@ -37,17 +36,4 @@ struct dp_parser { > */ > struct dp_parser *dp_parser_get(struct platform_device *pdev); > > -/** > - * devm_dp_parser_find_next_bridge() - find an additional bridge to DP > - * > - * @dev: device to tie bridge lifetime to > - * @parser: dp_parser data from client > - * > - * This function is used to find any additional bridge attached to > - * the DP controller. The eDP interface requires a panel bridge. > - * > - * Return: 0 if able to get the bridge, otherwise negative errno for failure. > - */ > -int devm_dp_parser_find_next_bridge(struct device *dev, struct dp_parser *parser); > - > #endif >