[17/49] staging: hikey9xx/gpu: change the includes to reflect upstream

Commit Message

Mauro Carvalho Chehab Aug. 19, 2020, 11:45 a.m. UTC

The includes there reflect a downstream version back on v4.4
times. change them to reflect the current upstream and to
avoid the need of using a -I flag at the Makefile.

Signed-off-by: Mauro Carvalho Chehab <[e-mail]>
---
 ...{kirin9xx_dpe_reg.h => kirin960_dpe_reg.h} |  3 +++
 .../staging/hikey9xx/gpu/kirin970_dpe_reg.h   |  3 +++
 .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c     |  6 +++---
 .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h     |  4 ++--
 .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c   | 11 ++++++----
 .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h   | 10 +++++-----
 .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c   | 20 ++++++++++---------
 .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 15 +++++++-------
 .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c        |  2 ++
 drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c   | 12 ++++++-----
 10 files changed, 51 insertions(+), 35 deletions(-)
 rename drivers/staging/hikey9xx/gpu/{kirin9xx_dpe_reg.h => kirin960_dpe_reg.h} (99%)

Patch

diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
similarity index 99%
rename from drivers/staging/hikey9xx/gpu/kirin9xx_dpe_reg.h
rename to drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
index 282ba9b55e43..995ab8f7c9f4 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_dpe_reg.h
+++ b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h
@@ -24,6 +24,9 @@ 
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 
+#include <drm/drm_plane.h>
+#include <drm/drm_crtc.h>
+
 #include <linux/ion.h>
 #include <linux/hisi/hisi_ion.h>
 
diff --git a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
index 59e43722de56..ece49b99dca7 100644
--- a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
+++ b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h
@@ -24,6 +24,9 @@ 
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 
+#include <drm/drm_plane.h>
+#include <drm/drm_crtc.h>
+
 #include <linux/ion.h>
 #include <linux/hisi/hisi_ion.h>
 
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c
index fe8372838bb3..a15c335da026 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c
@@ -10,10 +10,10 @@ 
  * GNU General Public License for more details.
  *
  */
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_mipi_dsi.h>
 
-#include "drm_mipi_dsi.h"
-#include "kirin_drm_dpe_utils.h"
+#include "kirin9xx_drm_dpe_utils.h"
 
 int g_debug_set_reg_val = 0;
 
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h
index 89aaf6691f1d..0c5681d0a5ac 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h
@@ -17,9 +17,9 @@ 
 #if defined (CONFIG_DRM_HISI_KIRIN970)
 #include "kirin970_dpe_reg.h"
 #else
-#include "kirin_dpe_reg.h"
+#include "kirin960_dpe_reg.h"
 #endif
-#include "kirin_drm_drv.h"
+#include "kirin9xx_drm_drv.h"
 
 void set_reg(char __iomem *addr, uint32_t val, uint8_t bw, uint8_t bs);
 uint32_t set_bits32(uint32_t old_val, uint32_t val, uint8_t bw, uint8_t bs);
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
index f5b05b26bc18..616fa7ca9c77 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
@@ -18,13 +18,16 @@ 
 #include <linux/component.h>
 #include <linux/of_graph.h>
 
-#include <drm/drmP.h>
-#include <drm/drm_gem_cma_helper.h>
-#include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
-#include "kirin_drm_drv.h"
+#include "kirin9xx_drm_drv.h"
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 static bool fbdev = true;
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
index 18a7478fee10..15ef96840e9f 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h
@@ -11,18 +11,18 @@ 
 #ifndef __KIRIN_DRM_DRV_H__
 #define __KIRIN_DRM_DRV_H__
 
-#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_print.h>
+
 #include <linux/iommu.h>
 #include <linux/ion.h>
 #include <linux/hisi/hisi_ion.h>
 #include <linux/hisi/hisi-iommu.h>
 
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
-
 #define MAX_CRTC	2
 
-//#define CMA_BUFFER_USED
 #define to_kirin_fbdev(x) container_of(x, struct kirin_fbdev, fb_helper)
 
 /* display controller init/cleanup ops */
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c
index b4c1bb8288de..fd0ccbaebd3f 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c
@@ -25,22 +25,24 @@ 
 #include <linux/of.h>
 #include <linux/of_irq.h>
 
-#include <drm/drmP.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_crtc_helper.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_plane_helper.h>
-#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+#include <drm/drm_modeset_helper_vtables.h>
 
-#include "kirin_drm_drv.h"
-
-#include "kirin_drm_dpe_utils.h"
+#include "kirin9xx_drm_drv.h"
+#include "kirin9xx_drm_dpe_utils.h"
 #if defined (CONFIG_DRM_HISI_KIRIN970)
 #include "kirin970_dpe_reg.h"
 #else
-#include "kirin_dpe_reg.h"
+#include "kirin960_dpe_reg.h"
 #endif
 
 //#define DSS_POWER_UP_ON_UEFI
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c
index 342a7f6fc964..4e79f630de96 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c
@@ -16,17 +16,18 @@ 
  *
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_crtc_helper.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_plane_helper.h>
-#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_plane_helper.h>
 
-#include "kirin_drm_dpe_utils.h"
-#include "kirin_drm_drv.h"
+#include "kirin9xx_drm_dpe_utils.h"
+#include "kirin9xx_drm_drv.h"
 
 static int mid_array[DSS_CHN_MAX_DEFINE] = {0xb, 0xa, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4, 0x2, 0x1, 0x3, 0x0};
 
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c b/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c
index 4fef154cd701..21fddeaa3c66 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c
@@ -28,6 +28,8 @@ 
 #include <drm/drm_encoder_slave.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
+
 
 #include "dw_dsi_reg.h"
 #if defined (CONFIG_HISI_FB_970)
diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c b/drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c
index 3d25c48f0769..bb540f5d77a6 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c
@@ -10,18 +10,20 @@ 
 * GNU General Public License for more details.
 *
 */
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_mipi_dsi.h>
+
 #include <linux/clk.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
 #include <linux/of_address.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
 
-#include "drm_mipi_dsi.h"
-#include "kirin_drm_dpe_utils.h"
-#include "kirin_fb_panel.h"
-#include "dw_dsi_reg.h"
+#include "kirin9xx_drm_dpe_utils.h"
+#include "kirin9xx_fb_panel.h"
+#include "kirin9xx_dw_dsi_reg.h"
 
 /* default pwm clk */
 #define DEFAULT_PWM_CLK_RATE	(80 * 1000000L)