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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7134AC433F5 for ; Mon, 18 Oct 2021 23:08:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5353260C4B for ; Mon, 18 Oct 2021 23:08:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232956AbhJRXKS (ORCPT ); Mon, 18 Oct 2021 19:10:18 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:58998 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbhJRXKR (ORCPT ); Mon, 18 Oct 2021 19:10:17 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1634598486; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=CHs2EnROtj+eI2bECiXGaoryEmZF7c86X9Ki3HRSSFs=; b=ue1kUlk3gN1u8gw0khQUKQaTQ8799G7n2zWM3bya/FkS59NwkfZRkMJA8ITVGz9Jf6X/f+SZ yme6Hr72v/Wu/hYTEXb/96/7ijORyLi8bQXHOJRjEaVV807vC2nHpiHxCL1LXUBa12Znij2s 3i+zyVyxUWlxebbzb1BKdE6Y1FU= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n05.prod.us-west-2.postgun.com with SMTP id 616dfe4e5ca800b6c1c11054 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 18 Oct 2021 23:07:58 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 2819CC43618; Mon, 18 Oct 2021 23:07:58 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id ECA93C4338F; Mon, 18 Oct 2021 23:07:56 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 18 Oct 2021 16:07:56 -0700 From: abhinavk@codeaurora.org To: Bjorn Andersson Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh , Rob Herring , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [Freedreno] [PATCH v5 3/7] drm/msm/dp: Allow specifying connector_type per controller In-Reply-To: <20211016221843.2167329-4-bjorn.andersson@linaro.org> References: <20211016221843.2167329-1-bjorn.andersson@linaro.org> <20211016221843.2167329-4-bjorn.andersson@linaro.org> Message-ID: <94c1d92263498f83c39d3383cc122a05@codeaurora.org> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-10-16 15:18, Bjorn Andersson wrote: > As the following patches introduced support for multiple DP blocks in a > platform and some of those block might be eDP it becomes useful to be > able to specify the connector type per block. > > Although there's only a single block at this point, the array of descs > and the search in dp_display_get_desc() are introduced here to simplify > the next patch, that does introduce support for multiple DP blocks. > > Signed-off-by: Bjorn Andersson Reviewed-by: Abhinav Kumar > --- > > Changes since v4: > - const the various struct msm_dp_desc instances > - unsigned the connector_type > > > The references to DRM_MODE_CONNECTOR_DisplayPort in dp_debug.c, that > was > highligted in the review of v4 has been removed in a separate patch. > > drivers/gpu/drm/msm/dp/dp_display.c | 43 ++++++++++++++++++++++++++++- > drivers/gpu/drm/msm/dp/dp_display.h | 1 + > drivers/gpu/drm/msm/dp/dp_drm.c | 2 +- > 3 files changed, 44 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c > b/drivers/gpu/drm/msm/dp/dp_display.c > index 5d3ee5ef07c2..6913970c8cf9 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -115,8 +115,25 @@ struct dp_display_private { > struct dp_audio *audio; > }; > > +struct msm_dp_desc { > + phys_addr_t io_start; > + unsigned int connector_type; > +}; > + > +struct msm_dp_config { > + const struct msm_dp_desc *descs; > + size_t num_descs; > +}; > + > +static const struct msm_dp_config sc7180_dp_cfg = { > + .descs = (const struct msm_dp_desc[]) { > + { .io_start = 0x0ae90000, .connector_type = > DRM_MODE_CONNECTOR_DisplayPort }, > + }, > + .num_descs = 1, > +}; > + > static const struct of_device_id dp_dt_match[] = { > - {.compatible = "qcom,sc7180-dp"}, > + { .compatible = "qcom,sc7180-dp", .data = &sc7180_dp_cfg }, > {} > }; > > @@ -1180,10 +1197,29 @@ int dp_display_request_irq(struct msm_dp > *dp_display) > return 0; > } > > +static const struct msm_dp_desc *dp_display_get_desc(struct > platform_device *pdev) > +{ > + const struct msm_dp_config *cfg = > of_device_get_match_data(&pdev->dev); > + struct resource *res; > + int i; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) > + return NULL; > + > + for (i = 0; i < cfg->num_descs; i++) > + if (cfg->descs[i].io_start == res->start) > + return &cfg->descs[i]; > + > + dev_err(&pdev->dev, "unknown displayport instance\n"); > + return NULL; > +} > + > static int dp_display_probe(struct platform_device *pdev) > { > int rc = 0; > struct dp_display_private *dp; > + const struct msm_dp_desc *desc; > > if (!pdev || !pdev->dev.of_node) { > DRM_ERROR("pdev not found\n"); > @@ -1194,8 +1230,13 @@ static int dp_display_probe(struct > platform_device *pdev) > if (!dp) > return -ENOMEM; > > + desc = dp_display_get_desc(pdev); > + if (!desc) > + return -EINVAL; > + > dp->pdev = pdev; > dp->name = "drm_dp"; > + dp->dp_display.connector_type = desc->connector_type; > > rc = dp_init_sub_modules(dp); > if (rc) { > diff --git a/drivers/gpu/drm/msm/dp/dp_display.h > b/drivers/gpu/drm/msm/dp/dp_display.h > index 8b47cdabb67e..75fcabcfbbdd 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.h > +++ b/drivers/gpu/drm/msm/dp/dp_display.h > @@ -18,6 +18,7 @@ struct msm_dp { > bool is_connected; > bool audio_enabled; > bool power_on; > + unsigned int connector_type; > > hdmi_codec_plugged_cb plugged_cb; > > diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c > b/drivers/gpu/drm/msm/dp/dp_drm.c > index 764f4b81017e..f33e31523f56 100644 > --- a/drivers/gpu/drm/msm/dp/dp_drm.c > +++ b/drivers/gpu/drm/msm/dp/dp_drm.c > @@ -147,7 +147,7 @@ struct drm_connector *dp_drm_connector_init(struct > msm_dp *dp_display) > > ret = drm_connector_init(dp_display->drm_dev, connector, > &dp_connector_funcs, > - DRM_MODE_CONNECTOR_DisplayPort); > + dp_display->connector_type); > if (ret) > return ERR_PTR(ret);