drm/msm: Garbage collect unused resource _len fields.
PATCH 1/2 drm/msm: Garbage collect unused resource _len fields.
Nothing was using the lengths of these ioremaps.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 21 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 9 --------- 3 files changed, 31 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -21
@@ -45,20 +45,6 @@static int dpu_kms_hw_init (struct msm_kms *kms);static void _dpu_kms_mmu_destroy (struct dpu_kms *dpu_kms); -static unsigned long dpu_iomap_size (struct platform_device *pdev, -const char *name) -{ -struct resource *res; - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); -if (!res) { -DRM_ERROR ("failed to get memory resource: %s\n" , name); -return 0 ; - } - -return resource_size (res); -} -#ifdef CONFIG_DEBUG_FS static int _dpu_danger_signal_status (struct seq_file *s,bool danger_status)
@@ -844,7 +830,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms) goto error; }DRM_DEBUG ("mapped dpu address space @%pK\n" , dpu_kms->mmio); - dpu_kms->mmio_len =dpu_iomap_size (dpu_kms->pdev,"mdp" ); dpu_kms->vbif[VBIF_RT ] =msm_ioremap (dpu_kms->pdev,"vbif" ,"vbif" );if (IS_ERR (dpu_kms->vbif[VBIF_RT ])) {
@@ -853,22 +838,16 @@ static int dpu_kms_hw_init(struct msm_kms *kms) dpu_kms->vbif[VBIF_RT ] =NULL ; goto error; } - dpu_kms->vbif_len[VBIF_RT ] =dpu_iomap_size (dpu_kms->pdev,"vbif" ); dpu_kms->vbif[VBIF_NRT ] =msm_ioremap (dpu_kms->pdev,"vbif_nrt" ,"vbif_nrt" );if (IS_ERR (dpu_kms->vbif[VBIF_NRT ])) { dpu_kms->vbif[VBIF_NRT ] =NULL ;DPU_DEBUG ("VBIF NRT is not defined" ); - }else { - dpu_kms->vbif_len[VBIF_NRT ] =dpu_iomap_size (dpu_kms->pdev, -"vbif_nrt" ); } dpu_kms->reg_dma =msm_ioremap (dpu_kms->pdev,"regdma" ,"regdma" );if (IS_ERR (dpu_kms->reg_dma)) { dpu_kms->reg_dma =NULL ;DPU_DEBUG ("REG_DMA is not defined" ); - }else { - dpu_kms->reg_dma_len =dpu_iomap_size (dpu_kms->pdev,"regdma" ); }pm_runtime_get_sync (&dpu_kms->pdev->dev);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -1
@@ -100,7 +100,6 @@ struct dpu_kms {/* io/register spaces: */ void __iomem *mmio, *vbif[VBIF_MAX ], *reg_dma; -unsigned long mmio_len, vbif_len[VBIF_MAX ], reg_dma_len;struct regulator *vdd;struct regulator *mmagic;
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +0 -9
@@ -37,7 +37,6 @@ struct dpu_mdss_hw_init_handler {struct dpu_mdss {struct msm_mdss base;void __iomem *mmio; -unsigned long mmio_len;struct dss_module_power mp;struct dpu_irq_controller irq_controller;struct icc_path *path[2 ];
@@ -292,7 +291,6 @@ int dpu_mdss_init(struct drm_device *dev) {struct platform_device *pdev =to_platform_device (dev->dev);struct msm_drm_private *priv = dev->dev_private; -struct resource *res;struct dpu_mdss *dpu_mdss;struct dss_module_power *mp;int ret =0 ;
@@ -308,13 +306,6 @@ int dpu_mdss_init(struct drm_device *dev)DRM_DEBUG ("mapped mdss address space @%pK\n" , dpu_mdss->mmio); - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"mdss" ); -if (!res) { -DRM_ERROR ("failed to get memory resource for mdss\n" ); -return -ENOMEM ; - } - dpu_mdss->mmio_len =resource_size (res); - ret =dpu_mdss_parse_data_bus_icc_path (dev, dpu_mdss);if (ret)return ret;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/msm: Quiet error during failure in optional resource mappings.
We don't expect to find vbif_nrt or regdma on cheza, but were clogging up dmesg with errors about it.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.c | 22 ++++++++++++++++++---- drivers/gpu/drm/msm/msm_drv.h | 2 ++ 3 files changed, 22 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -2
@@ -838,13 +838,13 @@ static int dpu_kms_hw_init(struct msm_kms *kms) dpu_kms->vbif[VBIF_RT ] =NULL ; goto error; } - dpu_kms->vbif[VBIF_NRT ] =msm_ioremap (dpu_kms->pdev,"vbif_nrt" ,"vbif_nrt" ); + dpu_kms->vbif[VBIF_NRT ] =msm_ioremap_quiet (dpu_kms->pdev,"vbif_nrt" ,"vbif_nrt" );if (IS_ERR (dpu_kms->vbif[VBIF_NRT ])) { dpu_kms->vbif[VBIF_NRT ] =NULL ;DPU_DEBUG ("VBIF NRT is not defined" ); } - dpu_kms->reg_dma =msm_ioremap (dpu_kms->pdev,"regdma" ,"regdma" ); + dpu_kms->reg_dma =msm_ioremap_quiet (dpu_kms->pdev,"regdma" ,"regdma" );if (IS_ERR (dpu_kms->reg_dma)) { dpu_kms->reg_dma =NULL ;DPU_DEBUG ("REG_DMA is not defined" );
drivers/gpu/drm/msm/msm_drv.c +18 -4
@@ -120,8 +120,8 @@ struct clk *msm_clk_get(struct platform_device *pdev, const char *name)return clk; } -void __iomem *msm_ioremap (struct platform_device *pdev,const char *name, -const char *dbgname) +void __iomem *_msm_ioremap (struct platform_device *pdev,const char *name, +const char *dbgname,bool quiet) {struct resource *res;unsigned long size;
@@ -133,7 +133,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) { -DRM_DEV_ERROR (&pdev->dev,"failed to get memory resource: %s\n" , name); +if (!quiet) +DRM_DEV_ERROR (&pdev->dev,"failed to get memory resource: %s\n" , name);return ERR_PTR (-EINVAL ); }
@@ -141,7 +142,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, ptr =devm_ioremap (&pdev->dev, res->start, size);if (!ptr) { -DRM_DEV_ERROR (&pdev->dev,"failed to ioremap: %s\n" , name); +if (!quiet) +DRM_DEV_ERROR (&pdev->dev,"failed to ioremap: %s\n" , name);return ERR_PTR (-ENOMEM ); }
@@ -151,6 +153,18 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,return ptr; } +void __iomem *msm_ioremap (struct platform_device *pdev,const char *name, +const char *dbgname) +{ +return _msm_ioremap (pdev, name, dbgname, false); +} + +void __iomem *msm_ioremap_quiet (struct platform_device *pdev,const char *name, +const char *dbgname) +{ +return _msm_ioremap (pdev, name, dbgname, true); +} +void msm_writel (u32 data,void __iomem *addr) {if (reglog)
drivers/gpu/drm/msm/msm_drv.h +2 -0
@@ -411,6 +411,8 @@ struct clk *msm_clk_bulk_get_clock(struct clk_bulk_data *bulk, int count, const char *name);void __iomem *msm_ioremap (struct platform_device *pdev,const char *name,const char *dbgname); +void __iomem *msm_ioremap_quiet (struct platform_device *pdev,const char *name, +const char *dbgname);void msm_writel (u32 data,void __iomem *addr);u32 msm_readl (const void __iomem *addr);
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/msm: Quiet error during failure in optional resource mappings.
Quoted 3 lines · Eric Anholt
We don't expect to find
vbif_nrtor regdma on cheza, but were clogging up dmesg with errors about it.
nit: s/cheza/sdm845/ (since this really applies to the SoC rather than the board..
also, maybe msm_ioremap_optional() ?
BR,
-R
Quoted 96 lines
Signed-off-by Eric Anholt <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.c | 22 ++++++++++++++++++---- drivers/gpu/drm/msm/msm_drv.h | 2 ++ 3 files changed, 22 insertions(+), 6 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2
-2@@ -838,13 +838,13 @@ static int dpu_kms_hw_init(struct msm_kms *kms) dpu_kms->vbif[VBIF_RT ] =NULL ; goto error; } - dpu_kms->vbif[VBIF_NRT ] =msm_ioremap (dpu_kms->pdev,"vbif_nrt" ,"vbif_nrt" ); + dpu_kms->vbif[VBIF_NRT ] =msm_ioremap_quiet (dpu_kms->pdev,"vbif_nrt" ,"vbif_nrt" );if (IS_ERR (dpu_kms->vbif[VBIF_NRT ])) { dpu_kms->vbif[VBIF_NRT ] =NULL ;DPU_DEBUG ("VBIF NRT is not defined" ); } - dpu_kms->reg_dma =msm_ioremap (dpu_kms->pdev,"regdma" ,"regdma" ); + dpu_kms->reg_dma =msm_ioremap_quiet (dpu_kms->pdev,"regdma" ,"regdma" );if (IS_ERR (dpu_kms->reg_dma)) { dpu_kms->reg_dma =NULL ;DPU_DEBUG ("REG_DMA is not defined" );drivers/gpu/drm/msm/msm_drv.c +18
-4@@ -120,8 +120,8 @@ struct clk *msm_clk_get(struct platform_device *pdev, const char *name)return clk; } -void __iomem *msm_ioremap (struct platform_device *pdev,const char *name, -const char *dbgname) +void __iomem *_msm_ioremap (struct platform_device *pdev,const char *name, +const char *dbgname,bool quiet) {struct resource *res;unsigned long size;@@ -133,7 +133,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) { -DRM_DEV_ERROR (&pdev->dev,"failed to get memory resource: %s\n" , name); +if (!quiet) +DRM_DEV_ERROR (&pdev->dev,"failed to get memory resource: %s\n" , name);return ERR_PTR (-EINVAL ); }@@ -141,7 +142,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, ptr =devm_ioremap (&pdev->dev, res->start, size);if (!ptr) { -DRM_DEV_ERROR (&pdev->dev,"failed to ioremap: %s\n" , name); +if (!quiet) +DRM_DEV_ERROR (&pdev->dev,"failed to ioremap: %s\n" , name);return ERR_PTR (-ENOMEM ); }@@ -151,6 +153,18 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,return ptr; } +void __iomem *msm_ioremap (struct platform_device *pdev,const char *name, +const char *dbgname) +{ +return _msm_ioremap (pdev, name, dbgname, false); +} + +void __iomem *msm_ioremap_quiet (struct platform_device *pdev,const char *name, +const char *dbgname) +{ +return _msm_ioremap (pdev, name, dbgname, true); +} +void msm_writel (u32 data,void __iomem *addr) {if (reglog)drivers/gpu/drm/msm/msm_drv.h +2
-1@@ -411,6 +411,8 @@ struct clk *msm_clk_bulk_get_clock(struct clk_bulk_data *bulk, int count, const char *name);void __iomem *msm_ioremap (struct platform_device *pdev,const char *name,const char *dbgname); +void __iomem *msm_ioremap_quiet (struct platform_device *pdev,const char *name, +const char *dbgname);void msm_writel (u32 data,void __iomem *addr);u32 msm_readl (const void __iomem *addr); --
Quoted 2 lines
2.26.2
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
kernel test robot
build botRe: [PATCH 2/2] drm/msm: Quiet error during failure in optional resource mappings.
In reply to Eric AnholtI love your patch! Perhaps something to improve:
Hi Eric,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm-tip/drm-tip linus/master v5.8-rc3 next-20200703] [cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Eric-Anholt/drm-msm-Garbage-collect-unused-resource-_len-fields/20200630-022449 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: arm64-randconfig-r031-20200703 (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project ca464639a1c9dd3944eb055ffd2796e8c2e7639f)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/msm/msm_drv.c:123:15: warning: no previous prototype for function '_msm_ioremap' [-Wmissing-prototypes]
void __iomem *_msm_ioremap(struct platform_device *pdev, const char *name,
^ drivers/gpu/drm/msm/msm_drv.c:123:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void __iomem *_msm_ioremap(struct platform_device *pdev, const char *name,
^
static
1 warning generated.
vim +/_msm_ioremap +123 drivers/gpu/drm/msm/msm_drv.c
122
> 123 void __iomem *_msm_ioremap(struct platform_device *pdev, const char *name,
124 const char *dbgname, bool quiet)
125 {
126 struct resource *res;
127 unsigned long size;
128 void __iomem *ptr;
129
130 if (name)
131 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
132 else
133 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
134
135 if (!res) {
136 if (!quiet)
137 DRM_DEV_ERROR(&pdev->dev, "failed to get memory resource: %s\n", name);
138 return ERR_PTR(-EINVAL);
139 }
140
141 size = resource_size(res);
142
143 ptr = devm_ioremap(&pdev->dev, res->start, size);
144 if (!ptr) {
145 if (!quiet)
146 DRM_DEV_ERROR(&pdev->dev, "failed to ioremap: %s\n", name);
147 return ERR_PTR(-ENOMEM);
148 }
149
150 if (reglog)
151 printk(KERN_DEBUG "IO:region %s %p %08lx\n", dbgname, ptr, size);
152
153 return ptr;
154 }
155
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org