From: Stephen Boyd <swboyd@chromium.org>
To: Abhinav Kumar <abhinavk@codeaurora.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Rob Clark <robdclark@gmail.com>, Rob Herring <robh+dt@kernel.org>,
Sean Paul <sean@poorly.run>
Cc: Kuogee Hsieh <khsieh@codeaurora.org>,
Tanmay Shah <tanmay@codeaurora.org>,
Chandan Uddaraju <chandanu@codeaurora.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/5] drm/msm/dp: Refactor ioremap wrapper
Date: Thu, 26 Aug 2021 01:19:16 +0000 [thread overview]
Message-ID: <CAE-0n53ZVf7E0q_cMEmuQH7q+xytRd-pjerrNnoVHBwqGMr6ZA@mail.gmail.com> (raw)
In-Reply-To: <20210825222557.1499104-4-bjorn.andersson@linaro.org>
Quoting Bjorn Andersson (2021-08-25 15:25:55)
> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c
> index c064ced78278..215065336268 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.c
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.c
> @@ -19,40 +19,30 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = {
> },
> };
>
> -static int msm_dss_ioremap(struct platform_device *pdev,
> - struct dss_io_data *io_data)
> +static void __iomem *dp_ioremap(struct platform_device *pdev, int idx, size_t *len)
> {
> - struct resource *res = NULL;
> + struct resource *res;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + res = platform_get_resource(pdev, IORESOURCE_MEM, idx);
> if (!res) {
> DRM_ERROR("%pS->%s: msm_dss_get_res failed\n",
> __builtin_return_address(0), __func__);
This error can be removed too, right? At least I thought passing in NULL
as 'res' to devm_ioremap_resource() did that. It actually looks like we
can use devm_platform_get_and_ioremap_resource() and then pass in &res
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (!IS_ERR(base))
*len = resource_size(res);
return base;
> - return -ENODEV;
> + return ERR_PTR(-ENODEV);
> }
>
> - io_data->len = (u32)resource_size(res);
> - io_data->base = devm_ioremap(&pdev->dev, res->start, io_data->len);
> - if (!io_data->base) {
> - DRM_ERROR("%pS->%s: ioremap failed\n",
> - __builtin_return_address(0), __func__);
> - return -EIO;
> - }
> -
> - return 0;
> + *len = resource_size(res);
> + return devm_ioremap_resource(&pdev->dev, res);
> }
>
> static int dp_parser_ctrl_res(struct dp_parser *parser)
> {
> - int rc = 0;
> struct platform_device *pdev = parser->pdev;
> struct dp_io *io = &parser->io;
> + struct dss_io_data *dss = &io->dp_controller;
>
> - rc = msm_dss_ioremap(pdev, &io->dp_controller);
> - if (rc) {
> - DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc);
> - return rc;
> - }
> + dss->base = dp_ioremap(pdev, 0, &dss->len);
> + if (IS_ERR(dss->base))
> + return PTR_ERR(dss->base);
>
> io->phy = devm_phy_get(&pdev->dev, "dp");
> if (IS_ERR(io->phy))
> diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h
> index 34b49628bbaf..dc62e70b1640 100644
> --- a/drivers/gpu/drm/msm/dp/dp_parser.h
> +++ b/drivers/gpu/drm/msm/dp/dp_parser.h
> @@ -26,7 +26,7 @@ enum dp_pm_type {
> };
>
> struct dss_io_data {
> - u32 len;
> + size_t len;
len is a resource_size_t above, not sure if that really matters in
practice to indicate it here though.
> void __iomem *base;
> };
>
next prev parent reply other threads:[~2021-08-26 1:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-25 22:25 [PATCH v2 0/5] drm/msm/dp: Allow variation in register regions Bjorn Andersson
2021-08-25 22:25 ` [PATCH v2 1/5] dt-bindings: msm/dp: Change reg definition Bjorn Andersson
2021-08-25 22:25 ` [PATCH v2 2/5] drm/msm/dp: Use devres for ioremap() Bjorn Andersson
2021-08-25 22:25 ` [PATCH v2 3/5] drm/msm/dp: Refactor ioremap wrapper Bjorn Andersson
2021-08-26 1:19 ` Stephen Boyd [this message]
2021-08-25 22:25 ` [PATCH v2 4/5] drm/msm/dp: Store each subblock in the io region Bjorn Andersson
2021-08-26 1:21 ` Stephen Boyd
2021-08-25 22:25 ` [PATCH v2 5/5] drm/msm/dp: Allow sub-regions to be specified in DT Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAE-0n53ZVf7E0q_cMEmuQH7q+xytRd-pjerrNnoVHBwqGMr6ZA@mail.gmail.com \
--to=swboyd@chromium.org \
--cc=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=bjorn.andersson@linaro.org \
--cc=chandanu@codeaurora.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=khsieh@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=robh+dt@kernel.org \
--cc=sean@poorly.run \
--cc=tanmay@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).