| Message ID | 20211001174400.981707-4-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/dp: Allow variation in register regions | expand |
Quoting Bjorn Andersson (2021-10-01 10:43:58) > 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. > > While at it, devm_ioremap_resource() already prints useful error > messages on failure, so omit the unnecessary prints from the caller. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> I realize this will cause some prints when we use old DTs. I suppose that's OK though because we'll have more incentive to update existing DT.
On Mon 04 Oct 18:04 PDT 2021, Stephen Boyd wrote: > Quoting Bjorn Andersson (2021-10-01 10:43:58) > > 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. > > > > While at it, devm_ioremap_resource() already prints useful error > > messages on failure, so omit the unnecessary prints from the caller. > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > > I realize this will cause some prints when we use old DTs. I suppose > that's OK though because we'll have more incentive to update existing > DT. The use of the current binding is fairly limited, so I think that makes sense. Abhinav also requested earlier that we do that and drop the fallback sooner rather than later, which I would like to see as well. Thanks, Bjorn
On 2021-10-01 10:43, 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. > > While at it, devm_ioremap_resource() already prints useful error > messages on failure, so omit the unnecessary prints from the caller. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > > Changes since v2: > - Switched to devm_platform_get_and_ioremap_resource() > > drivers/gpu/drm/msm/dp/dp_parser.c | 35 ++++++++++-------------------- > drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- > 2 files changed, 12 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c > b/drivers/gpu/drm/msm/dp/dp_parser.c > index c064ced78278..c05ba1990218 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -19,40 +19,27 @@ 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; > + void __iomem *base; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!res) { > - DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > - __builtin_return_address(0), __func__); > - return -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; > - } > + base = devm_platform_get_and_ioremap_resource(pdev, idx, &res); > + if (!IS_ERR(base)) > + *len = resource_size(res); > > - return 0; > + 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)) > + 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; > void __iomem *base; > };
diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c index c064ced78278..c05ba1990218 100644 --- a/drivers/gpu/drm/msm/dp/dp_parser.c +++ b/drivers/gpu/drm/msm/dp/dp_parser.c @@ -19,40 +19,27 @@ 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; + void __iomem *base; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", - __builtin_return_address(0), __func__); - return -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; - } + base = devm_platform_get_and_ioremap_resource(pdev, idx, &res); + if (!IS_ERR(base)) + *len = resource_size(res); - return 0; + 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)) + 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; void __iomem *base; };
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. While at it, devm_ioremap_resource() already prints useful error messages on failure, so omit the unnecessary prints from the caller. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- Changes since v2: - Switched to devm_platform_get_and_ioremap_resource() drivers/gpu/drm/msm/dp/dp_parser.c | 35 ++++++++++-------------------- drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- 2 files changed, 12 insertions(+), 25 deletions(-)