Commit 62a35e81 authored by Eric Anholt's avatar Eric Anholt Committed by Rob Clark
Browse files

drm/msm: Quiet error during failure in optional resource mappings. 



We don't expect to find vbif_nrt or regdma on sdm845, but were clogging
up dmesg with errors about it.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent ecf9cd48

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -839,13 +839,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
Original line number Diff line number Diff line
@@ -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,6 +133,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, 
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	if (!res) {

		if (!quiet)

			DRM_DEV_ERROR(&pdev->dev, "failed to get memory resource: %s\n", name);

		return ERR_PTR(-EINVAL);

	}
@@ -141,6 +142,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, 


	ptr = devm_ioremap(&pdev->dev, res->start, size);

	if (!ptr) {

		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
Original line number Diff line number Diff line
@@ -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);