Commit 1cd0f494 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-v5.10' of... 

Merge tag 'exynos-drm-next-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Two cleanups
- Simply use dev_err_probe() instead of returning -EPROBE_DEFER.
- Drop drm_parms allocation and deallocation code which aren't needed.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1600763939-20032-1-git-send-email-inki.dae@samsung.com
parents 3e6f73b8 ddfd4ab6

drivers/gpu/drm/exynos/exynos_drm_dma.c

+1 −26
Original line number Diff line number Diff line
@@ -31,23 +31,6 @@ 
#define EXYNOS_DEV_ADDR_START	0x20000000

#define EXYNOS_DEV_ADDR_SIZE	0x40000000



static inline int configure_dma_max_seg_size(struct device *dev)

{

	if (!dev->dma_parms)

		dev->dma_parms = kzalloc(sizeof(*dev->dma_parms), GFP_KERNEL);

	if (!dev->dma_parms)

		return -ENOMEM;



	dma_set_max_seg_size(dev, DMA_BIT_MASK(32));

	return 0;

}



static inline void clear_dma_max_seg_size(struct device *dev)

{

	kfree(dev->dma_parms);

	dev->dma_parms = NULL;

}



/*

 * drm_iommu_attach_device- attach device to iommu mapping

 *
@@ -69,10 +52,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
		return -EINVAL;

	}



	ret = configure_dma_max_seg_size(subdrv_dev);

	if (ret)

		return ret;



	dma_set_max_seg_size(subdrv_dev, DMA_BIT_MASK(32));

	if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) {

		/*

		 * Keep the original DMA mapping of the sub-device and
@@ -89,9 +69,6 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
		ret = iommu_attach_device(priv->mapping, subdrv_dev);

	}



	if (ret)

		clear_dma_max_seg_size(subdrv_dev);



	return ret;

}
@@ -114,8 +91,6 @@ static void drm_iommu_detach_device(struct drm_device *drm_dev, 
		arm_iommu_attach_device(subdrv_dev, *dma_priv);

	} else if (IS_ENABLED(CONFIG_IOMMU_DMA))

		iommu_detach_device(priv->mapping, subdrv_dev);



	clear_dma_max_seg_size(subdrv_dev);

}



int exynos_drm_register_dma(struct drm_device *drm, struct device *dev,

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+2 −5
Original line number Diff line number Diff line
@@ -1760,11 +1760,8 @@ static int exynos_dsi_probe(struct platform_device *pdev) 
	dsi->supplies[1].supply = "vddio";

	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies),

				      dsi->supplies);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_info(dev, "failed to get regulators: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to get regulators\n");



	dsi->clks = devm_kcalloc(dev,

			dsi->driver_data->num_clks, sizeof(*dsi->clks),

drivers/gpu/drm/exynos/exynos_hdmi.c

+2 −5
Original line number Diff line number Diff line
@@ -1797,11 +1797,8 @@ static int hdmi_resources_init(struct hdmi_context *hdata) 
		hdata->regul_bulk[i].supply = supply[i];



	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(supply), hdata->regul_bulk);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "failed to get regulators\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to get regulators\n");



	hdata->reg_hdmi_en = devm_regulator_get_optional(dev, "hdmi-en");

CRA Git | Maintained and supported by SUSTech CRA and CCSE