Skip to contentSkip to conversation

drm/tinydrm: do not reply on drmP.h from drm_gem_cma_helper.h

PATCH Superseded Sam Ravnborg 3 participants 3 messages Dec 30, 2018 – Jan 7, 2019

Subsystems (2)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 13/14 drm/tinydrm: do not reply on drmP.h from drm_gem_cma_helper.h

drmP.h was the only header file in the past and a lot of files rely on that drmP.h defines everything. The goal is to one day to delete drmP.h and
as a step towards this it will no longer be included in the headers files in include/drm/

To prepare tinydrm/ for this add dependencies that othwewise was pulled in by drmP.h from drm_gem_cma_helper.h

To avoid that tinydrm.h became "include everything", push include files to the individual drivers.

Cc "Noralf Trønnes" <[email protected]>
Cc David Airlie <[email protected]>
Cc Eric Anholt <[email protected]>
Cc David Lechner <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 +++
 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 3 +++
 drivers/gpu/drm/tinydrm/hx8357d.c           | 1 +
 drivers/gpu/drm/tinydrm/ili9225.c           | 2 ++
 drivers/gpu/drm/tinydrm/ili9341.c           | 1 +
 drivers/gpu/drm/tinydrm/mi0283qt.c          | 1 +
 drivers/gpu/drm/tinydrm/mipi-dbi.c          | 3 +++
 drivers/gpu/drm/tinydrm/repaper.c           | 1 +
 drivers/gpu/drm/tinydrm/st7586.c            | 1 +
 drivers/gpu/drm/tinydrm/st7735r.c           | 1 +
 10 files changed, 17 insertions(+)
drivers/gpu/drm/tinydrm/core/tinydrm-core.c +3 -0
index 01a6f2d42440..aeb93eadb047 100644
@@ -10,11 +10,14 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_print.h>
 #include <drm/tinydrm/tinydrm.h>
 #include <linux/device.h>
 #include <linux/dma-buf.h>
+#include <linux/module.h>
 
 /**
  * DOC: overview
drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c +3 -0
index eacfc0ec8ff1..d4576d6e8ce4 100644
@@ -9,8 +9,11 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modes.h>
+#include <drm/drm_print.h>
+#include <drm/drm_vblank.h>
 #include <drm/tinydrm/tinydrm.h>
 
 struct tinydrm_connector {
drivers/gpu/drm/tinydrm/hx8357d.c +1 -0
index 81a2bbeb25d4..3ae11aa4b73b 100644
@@ -16,6 +16,7 @@
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
drivers/gpu/drm/tinydrm/ili9225.c +2 -0
index 78f7c2d1b449..b0ad58b97227 100644
@@ -20,7 +20,9 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.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_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
drivers/gpu/drm/tinydrm/ili9341.c +1 -0
index 51395bdc6ca2..bcdf10906ade 100644
@@ -15,6 +15,7 @@
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
drivers/gpu/drm/tinydrm/mi0283qt.c +1 -0
index 3fa62e77c30b..97805ca37a04 100644
@@ -17,6 +17,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
drivers/gpu/drm/tinydrm/mipi-dbi.c +3 -0
index 3a05e56f9b0d..10294e1283dd 100644
@@ -10,14 +10,17 @@
  */
 
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/dma-buf.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
 #include <drm/tinydrm/tinydrm-helpers.h>
drivers/gpu/drm/tinydrm/repaper.c +1 -0
index 54d6fe0f37ce..b2a8f894946a 100644
@@ -26,6 +26,7 @@
 #include <linux/spi/spi.h>
 #include <linux/thermal.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>
drivers/gpu/drm/tinydrm/st7586.c +1 -0
index a6a8a1081b73..bf518167760a 100644
@@ -17,6 +17,7 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.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>
drivers/gpu/drm/tinydrm/st7735r.c +1 -0
index b39779e0dcd8..9bc93d5a0401 100644
@@ -14,6 +14,7 @@
 #include <linux/spi/spi.h>
 #include <video/mipi_display.h>
 
+#include <drm/drm_drv.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/tinydrm/mipi-dbi.h>
Signature · 1 line
2.12.0
Acked-by on v2 13/14
#1 lore raw
Quoted 12 lines · Sam Ravnborg

drmP.h was the only header file in the past and a lot of files rely on that drmP.h defines everything. The goal is to one day to delete drmP.h and
as a step towards this it will no longer be included in the headers files in include/drm/

To prepare tinydrm/ for this add dependencies that othwewise was pulled in by drmP.h from drm_gem_cma_helper.h

To avoid that tinydrm.h became "include everything", push include files to the individual drivers.

Quoted 7 lines
Cc "Noralf Trønnes" <[email protected]>
Cc David Airlie <[email protected]>
Cc Eric Anholt <[email protected]>
Cc David Lechner <[email protected]>
Cc Daniel Vetter <[email protected]>

---

Reviewed-by on v2 13/14
#2 lore raw
In reply to Sam Ravnborg

Den 30.12.2018 18.48, skrev Sam Ravnborg:

Quoted 12 lines

drmP.h was the only header file in the past and a lot of files rely on that drmP.h defines everything. The goal is to one day to delete drmP.h and
as a step towards this it will no longer be included in the headers files in include/drm/

To prepare tinydrm/ for this add dependencies that othwewise was pulled in by drmP.h from drm_gem_cma_helper.h

To avoid that tinydrm.h became "include everything", push include files to the individual drivers.

Quoted 7 lines
Cc "Noralf Trønnes" <[email protected]>
Cc David Airlie <[email protected]>
Cc Eric Anholt <[email protected]>
Cc David Lechner <[email protected]>
Cc Daniel Vetter <[email protected]>

---

Thanks for doing this dep fix series:

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