Skip to contentSkip to conversation

drm/exynos: drop use of drmP.h

PATCH Superseded Sam Ravnborg 2 participants 6 messages Jun 21, 2019 – Jun 22, 2019

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover drm/exynos: drop use of drmP.h

Build tested using allyesconfig, allmodconfig for various architectures.

v2:
- add missing people to recipient list of mail
- no change in actual patch

v3:
- fix build breakage (Inki Dae)

The testing I had done with allyesconfig, allmodconfig did not trigger a configuration where exynos_drm_g2d.c was built. So a build error had slipped through.

Verified that all 23 .c files are built now.

Sam

Sam Ravnborg (1):
drm/exynos: drop drmP.h usage

 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |  7 +++--
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  8 ++++--
 drivers/gpu/drm/exynos/exynos_dp.c            | 13 ++++-----
 drivers/gpu/drm/exynos/exynos_drm_crtc.c      |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_dma.c       |  6 ++--
 drivers/gpu/drm/exynos/exynos_drm_dpi.c       |  8 +++---
 drivers/gpu/drm/exynos/exynos_drm_drv.c       | 12 ++++----
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |  8 +++++-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c       | 21 +++++++-------
 drivers/gpu/drm/exynos/exynos_drm_fb.c        |  6 ++--
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |  7 +++--
 drivers/gpu/drm/exynos/exynos_drm_fimc.c      | 15 +++++-----
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      | 14 +++++----
 drivers/gpu/drm/exynos/exynos_drm_g2d.c       | 11 ++++---
 drivers/gpu/drm/exynos/exynos_drm_gem.c       |  7 +++--
 drivers/gpu/drm/exynos/exynos_drm_gsc.c       | 13 +++++----
 drivers/gpu/drm/exynos/exynos_drm_ipp.c       |  3 +-
 drivers/gpu/drm/exynos/exynos_drm_mic.c       | 22 +++++++-------
 drivers/gpu/drm/exynos/exynos_drm_plane.c     |  4 +--
 drivers/gpu/drm/exynos/exynos_drm_rotator.c   | 10 +++----
 drivers/gpu/drm/exynos/exynos_drm_scaler.c    | 12 ++++----
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  9 +++---
 drivers/gpu/drm/exynos/exynos_hdmi.c          | 41 +++++++++++++--------------
 drivers/gpu/drm/exynos/exynos_mixer.c         | 31 ++++++++++----------
 24 files changed, 154 insertions(+), 136 deletions(-)

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#1 lore raw

PATCH v3 1/1 drm/exynos: drop drmP.h usage

Drop use of the deprecated drmP.h file. Replace with forwards / externals as appropriate.

While touching the list of include files divide them up in blocks and sort them.

v3:
- fix build errors in exynos_drm_g2d.c (Inki Dae) The exynos_drm_g2d.c file is not built in the standard configurations and was therefore missed.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |  7 +++-
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  8 ++--
 drivers/gpu/drm/exynos/exynos_dp.c            | 13 +++---
 drivers/gpu/drm/exynos/exynos_drm_crtc.c      |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_dma.c       |  6 ++-
 drivers/gpu/drm/exynos/exynos_drm_dpi.c       |  8 ++--
 drivers/gpu/drm/exynos/exynos_drm_drv.c       | 12 +++---
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |  8 +++-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c       | 21 +++++-----
 drivers/gpu/drm/exynos/exynos_drm_fb.c        |  6 +--
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |  7 ++--
 drivers/gpu/drm/exynos/exynos_drm_fimc.c      | 15 +++----
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      | 14 ++++---
 drivers/gpu/drm/exynos/exynos_drm_g2d.c       | 11 +++--
 drivers/gpu/drm/exynos/exynos_drm_gem.c       |  7 ++--
 drivers/gpu/drm/exynos/exynos_drm_gsc.c       | 13 +++---
 drivers/gpu/drm/exynos/exynos_drm_ipp.c       |  3 +-
 drivers/gpu/drm/exynos/exynos_drm_mic.c       | 22 +++++-----
 drivers/gpu/drm/exynos/exynos_drm_plane.c     |  4 +-
 drivers/gpu/drm/exynos/exynos_drm_rotator.c   | 10 ++---
 drivers/gpu/drm/exynos/exynos_drm_scaler.c    | 12 +++---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  9 ++--
 drivers/gpu/drm/exynos/exynos_hdmi.c          | 41 +++++++++----------
 drivers/gpu/drm/exynos/exynos_mixer.c         | 31 +++++++-------
 24 files changed, 154 insertions(+), 136 deletions(-)
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +5 -2
index 0650b619de24..2d5cbfda3ca7 100644
@@ -7,7 +7,6 @@
  *	Hyungwon Hwang <[email protected]>
  */
 
-#include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/iopoll.h>
@@ -15,11 +14,15 @@
 #include <linux/mfd/syscon.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 
-#include "exynos_drm_drv.h"
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+
 #include "exynos_drm_crtc.h"
+#include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_plane.h"
 #include "regs-decon5433.h"
drivers/gpu/drm/exynos/exynos7_drm_decon.c +5 -3
index 13509ca8aa35..f0640950bd46 100644
@@ -6,8 +6,6 @@
  *	Akshu Agarwal <[email protected]>
  *	Ajay Kumar <[email protected]>
  */
-#include <drm/drmP.h>
-#include <drm/exynos_drm.h>
 
 #include <linux/clk.h>
 #include <linux/component.h>
@@ -21,10 +19,14 @@
 #include <video/of_display_timing.h>
 #include <video/of_videomode.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+#include <drm/exynos_drm.h>
+
 #include "exynos_drm_crtc.h"
-#include "exynos_drm_plane.h"
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
+#include "exynos_drm_plane.h"
 #include "regs-decon7.h"
 
 /*
drivers/gpu/drm/exynos/exynos_dp.c +6 -7
index c0653d007ca4..3a0f0ba8c63a 100644
@@ -6,25 +6,24 @@
  * Author: Jingoo Han <[email protected]>
  */
 
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/of_graph.h>
 #include <linux/component.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <video/of_display_timing.h>
 #include <video/of_videomode.h>
 #include <video/videomode.h>
 
-#include <drm/drmP.h>
+#include <drm/bridge/analogix_dp.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-
-#include <drm/bridge/analogix_dp.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_crtc.h"
drivers/gpu/drm/exynos/exynos_drm_crtc.c +1 -1
index 98bec7418f01..77ce78986408 100644
@@ -8,11 +8,11 @@
  *	Seung-Woo Kim <[email protected]>
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_dma.c +4 -2
index bef8bc3c8e00..9ebc02768847 100644
@@ -4,11 +4,13 @@
 // Author: Inki Dae <[email protected]>
 // Author: Andrzej Hajda <[email protected]>
 
-#include <drm/drmP.h>
-#include <drm/exynos_drm.h>
 #include <linux/dma-iommu.h>
 #include <linux/dma-mapping.h>
 #include <linux/iommu.h>
+#include <linux/platform_device.h>
+
+#include <drm/drm_print.h>
+#include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
 
drivers/gpu/drm/exynos/exynos_drm_dpi.c +4 -4
index 6ea92173db9f..87289db12868 100644
@@ -10,14 +10,14 @@
  * published by the Free Software Foundation.
 */
 
-#include <drm/drmP.h>
+#include <linux/of_graph.h>
+#include <linux/regulator/consumer.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
-#include <linux/of_graph.h>
-#include <linux/regulator/consumer.h>
-
 #include <video/of_videomode.h>
 #include <video/videomode.h>
 
drivers/gpu/drm/exynos/exynos_drm_drv.c +5 -7
index e43640fc42d3..e19fb8466bef 100644
@@ -7,25 +7,23 @@
  *	Seung-Woo Kim <[email protected]>
  */
 
+#include <linux/component.h>
 #include <linux/pm_runtime.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_probe_helper.h>
-
-#include <linux/component.h>
-
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
-#include "exynos_drm_fbdev.h"
 #include "exynos_drm_fb.h"
+#include "exynos_drm_fbdev.h"
+#include "exynos_drm_g2d.h"
 #include "exynos_drm_gem.h"
-#include "exynos_drm_plane.h"
 #include "exynos_drm_ipp.h"
+#include "exynos_drm_plane.h"
 #include "exynos_drm_vidi.h"
-#include "exynos_drm_g2d.h"
 
 #define DRIVER_NAME	"exynos"
 #define DRIVER_DESC	"Samsung SoC DRM"
drivers/gpu/drm/exynos/exynos_drm_drv.h +7 -1
index 18b03b83f8a3..139c04d16b0d 100644
@@ -11,9 +11,15 @@
 #ifndef _EXYNOS_DRM_DRV_H_
 #define _EXYNOS_DRM_DRV_H_
 
-#include <drm/drmP.h>
 #include <linux/module.h>
 
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_plane.h>
+
+struct drm_crtc_state;
+struct drm_display_mode;
+
 #define MAX_CRTC	3
 #define MAX_PLANE	5
 #define MAX_FB_BUFFER	4
drivers/gpu/drm/exynos/exynos_drm_dsi.c +11 -10
index 63a4b5074a99..5f6f523821a2 100644
@@ -10,16 +10,9 @@
  * published by the Free Software Foundation.
 */
 
-#include <asm/unaligned.h>
-
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_mipi_dsi.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_probe_helper.h>
-
 #include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/component.h>
 #include <linux/gpio/consumer.h>
 #include <linux/irq.h>
 #include <linux/of_device.h>
@@ -27,11 +20,19 @@
 #include <linux/of_graph.h>
 #include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>
-#include <linux/component.h>
+
+#include <asm/unaligned.h>
 
 #include <video/mipi_display.h>
 #include <video/videomode.h>
 
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
 
drivers/gpu/drm/exynos/exynos_drm_fb.c +3 -3
index ea048905849a..64370b634cca 100644
@@ -8,19 +8,19 @@
  *	Seung-Woo Kim <[email protected]>
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_probe_helper.h>
-#include <uapi/drm/exynos_drm.h>
+#include <drm/exynos_drm.h>
 
+#include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_fbdev.h"
-#include "exynos_drm_crtc.h"
 
 static int check_fb_gem_memory_type(struct drm_device *drm_dev,
 				    struct exynos_drm_gem *exynos_gem)
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +4 -3
index 9dc33c6b6687..aefcd624fe32 100644
@@ -8,14 +8,15 @@
  *	Seung-Woo Kim <[email protected]>
  */
 
-#include <drm/drmP.h>
+#include <linux/console.h>
+#include <linux/dma-mapping.h>
+
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/exynos_drm.h>
 
-#include <linux/console.h>
-
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_fbdev.h"
drivers/gpu/drm/exynos/exynos_drm_fimc.c +8 -7
index 0db29690ede3..a594ab7be2c0 100644
@@ -6,21 +6,22 @@
  *	Jinyoung Jeon <[email protected]>
  *	Sangmin Lee <[email protected]>
  */
-#include <linux/kernel.h>
+
+#include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/platform_device.h>
+#include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
-#include <linux/clk.h>
-#include <linux/pm_runtime.h>
 #include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
 #include <linux/spinlock.h>
 
-#include <drm/drmP.h>
 #include <drm/exynos_drm.h>
-#include "regs-fimc.h"
+
 #include "exynos_drm_drv.h"
 #include "exynos_drm_ipp.h"
+#include "regs-fimc.h"
 
 /*
  * FIMC stands for Fully Interactive Mobile Camera and
drivers/gpu/drm/exynos/exynos_drm_fimd.c +8 -6
index e9106b1f4a50..8d0a929104e5 100644
@@ -6,26 +6,28 @@
  *	Joonyoung Shim <[email protected]>
  *	Inki Dae <[email protected]>
  */
-#include <drm/drmP.h>
 
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include <linux/component.h>
-#include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
 #include <video/of_display_timing.h>
 #include <video/of_videomode.h>
 #include <video/samsung_fimd.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
 #include <drm/exynos_drm.h>
 
+#include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_crtc.h"
 #include "exynos_drm_plane.h"
 
 /*
drivers/gpu/drm/exynos/exynos_drm_g2d.c +7 -4
index 2e4b9434245b..50904eee96f7 100644
@@ -4,21 +4,24 @@
  * Authors: Joonyoung Shim <[email protected]>
  */
 
-#include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/workqueue.h>
-#include <linux/dma-mapping.h>
-#include <linux/of.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
 #include <drm/exynos_drm.h>
+
 #include "exynos_drm_drv.h"
 #include "exynos_drm_g2d.h"
 #include "exynos_drm_gem.h"
drivers/gpu/drm/exynos/exynos_drm_gem.c +4 -3
index d8f1fe9b68d8..d734d9d51762 100644
@@ -5,12 +5,13 @@
  * Author: Inki Dae <[email protected]>
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_vma_manager.h>
 
-#include <linux/shmem_fs.h>
 #include <linux/dma-buf.h>
 #include <linux/pfn_t.h>
+#include <linux/shmem_fs.h>
+
+#include <drm/drm_prime.h>
+#include <drm/drm_vma_manager.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_gsc.c +7 -6
index 05b0fe21b81e..1e4b21c49a06 100644
@@ -6,20 +6,21 @@
  *	Jinyoung Jeon <[email protected]>
  *	Sangmin Lee <[email protected]>
  */
-#include <linux/kernel.h>
-#include <linux/component.h>
-#include <linux/platform_device.h>
+
 #include <linux/clk.h>
-#include <linux/pm_runtime.h>
+#include <linux/component.h>
+#include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 
-#include <drm/drmP.h>
 #include <drm/exynos_drm.h>
-#include "regs-gsc.h"
+
 #include "exynos_drm_drv.h"
 #include "exynos_drm_ipp.h"
+#include "regs-gsc.h"
 
 /*
  * GSC stands for General SCaler and
drivers/gpu/drm/exynos/exynos_drm_ipp.c +1 -2
index c862099723a0..d45bfab6fe40 100644
@@ -16,10 +16,9 @@
  * all copies or substantial portions of the Software.
  */
 
-
 #include <drm/drmP.h>
 #include <drm/drm_mode.h>
-#include <uapi/drm/exynos_drm.h>
+#include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
 #include "exynos_drm_gem.h"
drivers/gpu/drm/exynos/exynos_drm_mic.c +12 -10
index 8363cb40daed..b78e8c5ba553 100644
@@ -5,23 +5,25 @@
  *	Hyungwon Hwang <[email protected]>
  */
 
-#include <linux/platform_device.h>
-#include <video/of_videomode.h>
-#include <linux/of_address.h>
-#include <video/videomode.h>
-#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/component.h>
 #include <linux/delay.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_graph.h>
-#include <linux/clk.h>
-#include <linux/component.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include <drm/drmP.h>
-#include <drm/drm_encoder.h>
-#include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
+#include <video/of_videomode.h>
+#include <video/videomode.h>
+
+#include <drm/drm_encoder.h>
+#include <drm/drm_print.h>
+
 #include "exynos_drm_drv.h"
 
 /* Sysreg registers for MIC */
drivers/gpu/drm/exynos/exynos_drm_plane.c +2 -2
index 2f3c9b993acd..b29afced7374 100644
@@ -4,14 +4,14 @@
  * Authors: Joonyoung Shim <[email protected]>
  */
 
-#include <drm/drmP.h>
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/exynos_drm.h>
-#include "exynos_drm_drv.h"
+
 #include "exynos_drm_crtc.h"
+#include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
 #include "exynos_drm_plane.h"
drivers/gpu/drm/exynos/exynos_drm_rotator.c +5 -5
index 85e30cb6c23f..8ebad2740ad5 100644
@@ -6,21 +6,21 @@
  *	Eunchul Kim <[email protected]>
  */
 
-#include <linux/kernel.h>
+#include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
+#include <linux/kernel.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/drmP.h>
 #include <drm/exynos_drm.h>
-#include "regs-rotator.h"
+
 #include "exynos_drm_drv.h"
 #include "exynos_drm_ipp.h"
+#include "regs-rotator.h"
 
 /*
  * Rotator supports image crop/rotator and input/output DMA operations.
drivers/gpu/drm/exynos/exynos_drm_scaler.c +6 -6
index ec9c1b7d3103..9af096479e1c 100644
@@ -5,22 +5,22 @@
  *	Andrzej Pietrasiewicz <[email protected]>
  */
 
-#include <linux/kernel.h>
+#include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
+#include <linux/kernel.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/drmP.h>
 #include <drm/exynos_drm.h>
-#include "regs-scaler.h"
-#include "exynos_drm_fb.h"
+
 #include "exynos_drm_drv.h"
+#include "exynos_drm_fb.h"
 #include "exynos_drm_ipp.h"
+#include "regs-scaler.h"
 
 #define scaler_read(offset)		readl(scaler->regs + (offset))
 #define scaler_write(cfg, offset)	writel(cfg, scaler->regs + (offset))
drivers/gpu/drm/exynos/exynos_drm_vidi.c +4 -5
index eb2667b4500c..65b891cb9c50 100644
@@ -5,21 +5,20 @@
  * Authors:
  *	Inki Dae <[email protected]>
  */
-#include <drm/drmP.h>
 
+#include <linux/component.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/component.h>
 #include <linux/timer.h>
 
-#include <drm/exynos_drm.h>
-
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+#include <drm/exynos_drm.h>
 
-#include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
+#include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_plane.h"
 #include "exynos_drm_vidi.h"
drivers/gpu/drm/exynos/exynos_hdmi.c +20 -21

58 lines not on this page · raw message

drivers/gpu/drm/exynos/exynos_mixer.c +15 -16
index db0b698ea8ea..7b24338fad3c 100644
@@ -9,33 +9,32 @@
  * Based on drivers/media/video/s5p-tv/mixer_reg.c
  */
 
-#include <drm/drmP.h>
-
-#include "regs-mixer.h"
-#include "regs-vp.h"
-
-#include <linux/kernel.h>
-#include <linux/ktime.h>
-#include <linux/spinlock.h>
-#include <linux/wait.h>
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/delay.h>
-#include <linux/pm_runtime.h>
-#include <linux/clk.h>
-#include <linux/regulator/consumer.h>
+#include <linux/kernel.h>
+#include <linux/ktime.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/component.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
 #include <drm/exynos_drm.h>
 
-#include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
+#include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_plane.h"
+#include "regs-mixer.h"
+#include "regs-vp.h"
 
 #define MIXER_WIN_NR		3
 #define VP_DEFAULT_WIN		2
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
In reply to Sam Ravnborg
Quoted 3 lines · Sam Ravnborg

Build tested using allyesconfig, allmodconfig for various architectures.

Hi,

Thanks for fixes. Just for the record, allyesconfig/allmodconfig are not a proper way for build test specific drivers. They are nice but since all dependencies are in, they might miss a lot. You should build mentioned platform (exynos_defconfig on ARMv7, defconfig on ARMv8) and multi configs (multi_v7 on ARMv7). Such rule is also valid for other drivers, not specific to Exynos.

Best regards,
Krzysztof

Quoted 8 lines

v2:
- add missing people to recipient list of mail
- no change in actual patch

v3:
- fix build breakage (Inki Dae)

Quoted 7 lines

The testing I had done with allyesconfig, allmodconfig did not trigger a configuration where exynos_drm_g2d.c was built. So a build error had slipped through.

Verified that all 23 .c files are built now.

Sam

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Hi Krzysztof.

Quoted 11 lines
Quoted 2 lines

Build tested using allyesconfig, allmodconfig for various architectures.

Hi,

Thanks for fixes. Just for the record, allyesconfig/allmodconfig are not a proper way for build test specific drivers. They are nice but since all dependencies are in, they might miss a lot. You should build mentioned platform (exynos_defconfig on ARMv7, defconfig on ARMv8) and multi configs (multi_v7 on ARMv7). Such rule is also valid for other drivers, not specific to Exynos.

Thanks for the feedback. I have added exynos_defconfig, multi_v7_defconfig to my growing list of configs that I try when doing cross driver changes.
They include defconfig + allnoconfig for the supported archs too.

None of these configs would have triggered a build of exynos_drm_g2d.c so to do that some manual twaeks of the confg was necessary.

Adding a COMPILE_TEST dependency will enable the build for the allyesconfig, allmodconfig.
Thats worths to consider to avoid future mistakes.

Sam

Something like this:

From 9b29b85f25f4cc485f36efb8d658766fa9a252d9 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <[email protected]>
Date: Sat, 22 Jun 2019 09:24:06 +0200
Subject: [PATCH v1] drm/exynos: trigger build of all modules

Add COMPILE_TEST dependency to a few options to trigger that the modules get built using allyesconfig, allmodconfig.
This allows a non-exynos developer to catch build issues
in files that is usually not built.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/Kconfig +2 -2
index cbe58d307d1c..eadea2daf1ab 100644
@@ -86,7 +86,7 @@ comment "Sub-drivers"
 
 config DRM_EXYNOS_G2D
 	bool "G2D"
-	depends on VIDEO_SAMSUNG_S5P_G2D=n
+	depends on VIDEO_SAMSUNG_S5P_G2D=n || COMPILE_TEST
 	select FRAME_VECTOR
 	help
 	  Choose this option if you want to use Exynos G2D for DRM.
@@ -114,7 +114,7 @@ config DRM_EXYNOS_SCALER
 
 config DRM_EXYNOS_GSC
 	bool "GScaler"
-	depends on VIDEO_SAMSUNG_EXYNOS_GSC=n
+	depends on VIDEO_SAMSUNG_EXYNOS_GSC=n || COMPILE_TEST
 	select DRM_EXYNOS_IPP
 	help
 	  Choose this option if you want to use Exynos GSC for DRM.
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw
Quoted 60 lines · Sam Ravnborg

Hi Krzysztof.

Quoted 11 lines
Quoted 2 lines

Build tested using allyesconfig, allmodconfig for various architectures.

Hi,

Thanks for fixes. Just for the record, allyesconfig/allmodconfig are not a proper way for build test specific drivers. They are nice but since all dependencies are in, they might miss a lot. You should build mentioned platform (exynos_defconfig on ARMv7, defconfig on ARMv8) and multi configs (multi_v7 on ARMv7). Such rule is also valid for other drivers, not specific to Exynos.

Thanks for the feedback. I have added exynos_defconfig, multi_v7_defconfig to my growing list of configs that I try when doing cross driver changes.
They include defconfig + allnoconfig for the supported archs too.

None of these configs would have triggered a build of exynos_drm_g2d.c so to do that some manual twaeks of the confg was necessary.

Adding a COMPILE_TEST dependency will enable the build for the allyesconfig, allmodconfig.
Thats worths to consider to avoid future mistakes.

Sam

Something like this:

From 9b29b85f25f4cc485f36efb8d658766fa9a252d9 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <[email protected]>
Date: Sat, 22 Jun 2019 09:24:06 +0200
Subject: [PATCH v1] drm/exynos: trigger build of all modules

Add COMPILE_TEST dependency to a few options to trigger that the modules get built using allyesconfig, allmodconfig.
This allows a non-exynos developer to catch build issues
in files that is usually not built.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/Kconfig +0 -0
index cbe58d307d1c..eadea2daf1ab 100644

drivers/gpu/drm/exynos/Kconfig comment "Sub-drivers" · line 89

Quoted 5 lines
drivers/gpu/drm/exynos/Kconfig +1 -1
@@ -86,7 +86,7 @@ comment "Sub-drivers"
 
 config DRM_EXYNOS_G2D
        bool "G2D"
-       depends on VIDEO_SAMSUNG_S5P_G2D=n
+       depends on VIDEO_SAMSUNG_S5P_G2D=n || COMPILE_TEST

Oh yes, that definitely makes sense (assuming it compiles on all archs). Maybe you can send a follow up adding these?

Best regards,
Krzysztof
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

Hi Krzysztof.

Quoted 7 lines
Quoted 4 lines

Adding a COMPILE_TEST dependency will enable the build for the allyesconfig, allmodconfig.
Thats worths to consider to avoid future mistakes.

Oh yes, that definitely makes sense (assuming it compiles on all archs). Maybe you can send a follow up adding these?

The driver is limited to ARM today.
I could take a shot at fixing build erros on other archs and then let the full driver depend on COMPILE_TEST.

I will give it a spin.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel