Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDave Airlie <airlied@redhat.com>
Fri, 24 May 2013 00:14:57 +0000 (10:14 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 24 May 2013 00:14:57 +0000 (10:14 +1000)
Inki writes:
  This pull request includes drm_send_vblank_event() helper
   relevant patch I missed and code cleanups. And also it fixes
   a pended page flip issue.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: replace request_threaded_irq with devm function
  drm/exynos: remove unnecessary devm_kfree
  drm/exynos: fix build warnings from ipp fimc
  drm/exynos: cleanup device pointer usages
  drm/exynos: wait for the completion of pending page flip
  drm/exynos: use drm_send_vblank_event() helper
  drm/exynos: page flip fixes
  drm/exynos: exynos_hdmi: Pass correct pointer to free_irq()
  drm/exynos: exynos_drm_ipp: Fix incorrect usage of IS_ERR_OR_NULL
  drm/exynos: exynos_drm_fbdev: Fix incorrect usage of IS_ERR_OR_NULL

Conflicts:
drivers/gpu/drm/exynos/exynos_hdmi.c

1  2 
drivers/gpu/drm/exynos/exynos_hdmi.c

index 6652597586a18415280e790da3c5ac6b591c4d31,2f785325d6dedacf388910430b529645b6a88473..fd1426dca8824d48db62aa1bb27d62e7b4070d9f
@@@ -2005,7 -2005,12 +2005,7 @@@ static int hdmi_probe(struct platform_d
        }
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       hdata->regs = devm_ioremap_resource(&pdev->dev, res);
 -      if (!res) {
 -              DRM_ERROR("failed to find registers\n");
 -              return -ENOENT;
 -      }
 -
+       hdata->regs = devm_ioremap_resource(dev, res);
        if (IS_ERR(hdata->regs))
                return PTR_ERR(hdata->regs);