Commit a0d9dc02 authored by Dave Airlie's avatar Dave Airlie

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
...@@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, ...@@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev,
struct device *subdrv_dev, void **dma_priv) struct device *subdrv_dev, void **dma_priv)
{ {
struct exynos_drm_private *priv = drm_dev->dev_private; 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)) { if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {
DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n", 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, ...@@ -92,7 +92,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev,
if (ret) if (ret)
clear_dma_max_seg_size(subdrv_dev); clear_dma_max_seg_size(subdrv_dev);
return 0; return ret;
} }
/* /*
......
...@@ -1498,7 +1498,6 @@ static int g2d_probe(struct platform_device *pdev) ...@@ -1498,7 +1498,6 @@ static int g2d_probe(struct platform_device *pdev)
g2d->irq = platform_get_irq(pdev, 0); g2d->irq = platform_get_irq(pdev, 0);
if (g2d->irq < 0) { if (g2d->irq < 0) {
dev_err(dev, "failed to get irq\n");
ret = g2d->irq; ret = g2d->irq;
goto err_put_clk; goto err_put_clk;
} }
......
...@@ -269,8 +269,10 @@ static void mic_pre_enable(struct drm_bridge *bridge) ...@@ -269,8 +269,10 @@ static void mic_pre_enable(struct drm_bridge *bridge)
goto unlock; goto unlock;
ret = pm_runtime_get_sync(mic->dev); ret = pm_runtime_get_sync(mic->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_noidle(mic->dev);
goto unlock; goto unlock;
}
mic_set_path(mic, 1); mic_set_path(mic, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment