From: abhinavk@codeaurora.org To: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Stephen Boyd <swboyd@chromium.org>, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Kuogee Hsieh <khsieh@codeaurora.org>, Tanmay Shah <tanmay@codeaurora.org>, freedreno@lists.freedesktop.org, Chandan Uddaraju <chandanu@codeaurora.org> Subject: Re: [Freedreno] [PATCH 3/5] drm/msm/dp: Refactor ioremap wrapper Date: Fri, 23 Jul 2021 13:16:49 -0700 [thread overview] Message-ID: <a9136a5ecdda1a60e9b6ea03fece6150@codeaurora.org> (raw) In-Reply-To: <20210722024227.3313096-4-bjorn.andersson@linaro.org> On 2021-07-21 19:42, Bjorn Andersson wrote: > In order to deal with multiple memory ranges in the following commit > change the ioremap wrapper to not poke directly into the dss_io_data > struct. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> I think we can squash this one and the next patch into one. Because the APIs and structs you are modifying here are again getting touched in the next one too. > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 28 ++++++++++++++-------------- > drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c > b/drivers/gpu/drm/msm/dp/dp_parser.c > index c064ced78278..e68dacef547c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -19,39 +19,39 @@ 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; > + void __iomem *base; > > - 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__); > - 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) { > + base = devm_ioremap_resource(&pdev->dev, res); > + if (!base) { > DRM_ERROR("%pS->%s: ioremap failed\n", > __builtin_return_address(0), __func__); > - return -EIO; > + return ERR_PTR(-EIO); > } > > - return 0; > + *len = resource_size(res); > + return base; > } > > 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)) { > + DRM_ERROR("unable to remap dp io region: %pe\n", dss->base); > + return PTR_ERR(dss->base); > } > > io->phy = devm_phy_get(&pdev->dev, "dp"); > 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; > void __iomem *base; > };
WARNING: multiple messages have this Message-ID (diff)
From: abhinavk@codeaurora.org To: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: devicetree@vger.kernel.org, David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd <swboyd@chromium.org>, Kuogee Hsieh <khsieh@codeaurora.org>, Rob Herring <robh+dt@kernel.org>, Tanmay Shah <tanmay@codeaurora.org>, freedreno@lists.freedesktop.org, Sean Paul <sean@poorly.run>, Chandan Uddaraju <chandanu@codeaurora.org> Subject: Re: [Freedreno] [PATCH 3/5] drm/msm/dp: Refactor ioremap wrapper Date: Fri, 23 Jul 2021 13:16:49 -0700 [thread overview] Message-ID: <a9136a5ecdda1a60e9b6ea03fece6150@codeaurora.org> (raw) In-Reply-To: <20210722024227.3313096-4-bjorn.andersson@linaro.org> On 2021-07-21 19:42, Bjorn Andersson wrote: > In order to deal with multiple memory ranges in the following commit > change the ioremap wrapper to not poke directly into the dss_io_data > struct. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> I think we can squash this one and the next patch into one. Because the APIs and structs you are modifying here are again getting touched in the next one too. > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 28 ++++++++++++++-------------- > drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c > b/drivers/gpu/drm/msm/dp/dp_parser.c > index c064ced78278..e68dacef547c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -19,39 +19,39 @@ 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; > + void __iomem *base; > > - 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__); > - 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) { > + base = devm_ioremap_resource(&pdev->dev, res); > + if (!base) { > DRM_ERROR("%pS->%s: ioremap failed\n", > __builtin_return_address(0), __func__); > - return -EIO; > + return ERR_PTR(-EIO); > } > > - return 0; > + *len = resource_size(res); > + return base; > } > > 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)) { > + DRM_ERROR("unable to remap dp io region: %pe\n", dss->base); > + return PTR_ERR(dss->base); > } > > io->phy = devm_phy_get(&pdev->dev, "dp"); > 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; > void __iomem *base; > };
next prev parent reply other threads:[~2021-07-23 20:17 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-22 2:42 [PATCH 0/5] drm/msm/dp: Allow variation in register regions Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 2:42 ` [PATCH 1/5] dt-bindings: msm/dp: Change reg definition Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 19:33 ` Stephen Boyd 2021-07-22 19:33 ` Stephen Boyd 2021-07-23 20:05 ` abhinavk 2021-07-23 20:05 ` abhinavk 2021-07-29 20:02 ` Rob Herring 2021-07-29 20:02 ` Rob Herring 2021-07-22 2:42 ` [PATCH 2/5] drm/msm/dp: Use devres for ioremap() Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 20:06 ` Stephen Boyd 2021-07-22 20:06 ` Stephen Boyd 2021-07-23 20:11 ` [Freedreno] " abhinavk 2021-07-23 20:11 ` abhinavk 2021-07-22 2:42 ` [PATCH 3/5] drm/msm/dp: Refactor ioremap wrapper Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 20:09 ` Stephen Boyd 2021-07-22 20:09 ` Stephen Boyd 2021-07-23 20:16 ` abhinavk [this message] 2021-07-23 20:16 ` [Freedreno] " abhinavk 2021-07-22 2:42 ` [PATCH 4/5] drm/msm/dp: Store each subblock in the io region Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 20:13 ` Stephen Boyd 2021-07-22 20:13 ` Stephen Boyd 2021-07-23 20:29 ` [Freedreno] " abhinavk 2021-07-23 20:29 ` abhinavk 2021-07-22 2:42 ` [PATCH 5/5] drm/msm/dp: Allow sub-regions to be specified in DT Bjorn Andersson 2021-07-22 2:42 ` Bjorn Andersson 2021-07-22 20:16 ` Stephen Boyd 2021-07-22 20:16 ` Stephen Boyd 2021-07-23 20:33 ` [Freedreno] " abhinavk 2021-07-23 20:33 ` abhinavk
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=a9136a5ecdda1a60e9b6ea03fece6150@codeaurora.org \ --to=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=swboyd@chromium.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.