Commit a0d9dc02 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v5.8-rc4' of... 

Merge tag 'exynos-drm-fixes-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

Two fixups
- It fixes wrong return value by returing proper error value instead of
  fixed one.
- It fixes ref count leak in mic_pre_enable.
One cleanup
- It removes dev_err() call on platform_get_irq() failure because
  platform_get_irq() call dev_err() itself on failure.

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

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1593395988-4612-1-git-send-email-inki.dae@samsung.com
parents b325b5ed d4f5a095

drivers/gpu/drm/exynos/exynos_drm_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
				struct device *subdrv_dev, void **dma_priv)

{

	struct exynos_drm_private *priv = drm_dev->dev_private;

	int ret;

	int ret = 0;



	if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {

		DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n",
@@ -92,7 +92,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, 
	if (ret)

		clear_dma_max_seg_size(subdrv_dev);



	return 0;

	return ret;

}



/*

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+0 −1
Original line number Diff line number Diff line
@@ -1498,7 +1498,6 @@ static int g2d_probe(struct platform_device *pdev) 


	g2d->irq = platform_get_irq(pdev, 0);

	if (g2d->irq < 0) {

		dev_err(dev, "failed to get irq\n");

		ret = g2d->irq;

		goto err_put_clk;

	}

drivers/gpu/drm/exynos/exynos_drm_mic.c

+3 −1
Original line number Diff line number Diff line
@@ -269,8 +269,10 @@ static void mic_pre_enable(struct drm_bridge *bridge) 
		goto unlock;



	ret = pm_runtime_get_sync(mic->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_noidle(mic->dev);

		goto unlock;

	}



	mic_set_path(mic, 1);