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

Miscellaneous R-Car DU fixes and enhancements

Signed-off-by: Dave Airlie <[email protected]>
From: Laurent Pinchart <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/YtIEWkE0nk/[email protected]

diff --combined drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index abf8022eb88426c5f8491e510760133ba46db57f,bf76a60776bdbd2169932fe3cd4ec65710565512..60d6be78323b7af7766a7457ca6bd7cf40e055c4
--- 1/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
--- 2/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@@ -1,6 -1,6 +1,6 @@@
  // SPDX-License-Identifier: GPL-2.0+
  /*
-  * rcar_du_encoder.c  --  R-Car Display Unit Encoder
+  * R-Car Display Unit Encoder
   *
   * Copyright (C) 2013-2014 Renesas Electronics Corporation
   *
@@@ -8,7 -8,6 +8,7 @@@
   */
  
  #include <linux/export.h>
 +#include <linux/of.h>
  #include <linux/slab.h>
  
  #include <drm/drm_bridge.h>

diff --combined drivers/gpu/drm/rcar-du/rcar_lvds.c
index 830aac0a2cb462e06e1403c4d3856eded15ea1c6,8d22ade69df19b05a36d5ab8478eccbbea28658c..d85aa4bc7f843830769ed5229a80c37db01eb256
--- 1/drivers/gpu/drm/rcar-du/rcar_lvds.c
--- 2/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@@ -1,6 -1,6 +1,6 @@@
  // SPDX-License-Identifier: GPL-2.0
  /*
-  * rcar_lvds.c  --  R-Car LVDS Encoder
+  * R-Car LVDS Encoder
   *
   * Copyright (C) 2013-2018 Renesas Electronics Corporation
   *
@@@ -10,7 -10,6 +10,7 @@@
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/io.h>
 +#include <linux/media-bus-format.h>
  #include <linux/module.h>
  #include <linux/of.h>
  #include <linux/of_device.h>