Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next

some rcar-du fixes.

* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
  drm: rcar-du: error message is not needed for EPROBE_DEFER
  drm: rcar-du: error message is not needed for drm_vblank_init()
  rcar-du: add/rename DEFR6 TCON bits

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index d1c0512e4a9e..899ef7a2a7b4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -336,15 +336,15 @@ static int rcar_du_probe(struct platform_device *pdev)
          * disabled for all CRTCs.
          */
         ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize vblank\n");
+        if (ret < 0)
                 goto error;
-        }
 
         /* DRM/KMS objects */
         ret = rcar_du_modeset_init(rcdu);
         if (ret < 0) {
-                dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret);
+                if (ret != -EPROBE_DEFER)
+                        dev_err(&pdev->dev,
+                                "failed to initialize DRM/KMS (%d)\n", ret);
                 goto error;
         }
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
index d2f66068e52c..fedb0161e234 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -195,9 +195,10 @@
 #define DEFR6_ODPM12_DISP       (2 << 8)
 #define DEFR6_ODPM12_CDE        (3 << 8)
 #define DEFR6_ODPM12_MASK       (3 << 8)
-#define DEFR6_TCNE2             (1 << 6)
+#define DEFR6_TCNE1             (1 << 6)
+#define DEFR6_TCNE0             (1 << 4)
 #define DEFR6_MLOS1             (1 << 2)
-#define DEFR6_DEFAULT           (DEFR6_CODE | DEFR6_TCNE2)
+#define DEFR6_DEFAULT           (DEFR6_CODE | DEFR6_TCNE1)
 
 /* -----------------------------------------------------------------------------
  * R8A7790-only Control Registers