Skip to contentSkip to conversation

drm/bridge: drop drmP.h usage

PATCH In review Sam Ravnborg 2 participants 3 messages May 19, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/bridge: drop drmP.h usage

Drop use of the deprecated drmP.h header file.

While touching the list of include files:
- Divide include files in blocks of linux/* drm/* etc. Followed the drm style with the most general files first
- Sort individual blocks of include files

Cc Andrzej Hajda <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Peter Senna Tschudin <[email protected]>
Cc Martin Donnelly <[email protected]>
Cc Martyn Welch <[email protected]>

---

The patch is made on top of drm-misc-next.
Buildtested using x86,arm,arm64,alpha + more
allyesconfig + allmodconfig

This is part of the ongoing effort to drop use of drmP.h.

Squashed into a single patch as this touched an acceptable low amount of files - and the individual changes are trivial.

With this patch drm/bridge/ no longer uses drmP.h.

Sam

 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c   |  4 ++--
 drivers/gpu/drm/bridge/analogix-anx78xx.c      |  8 ++++----
 .../gpu/drm/bridge/analogix/analogix_dp_core.c | 15 ++++++++-------
 drivers/gpu/drm/bridge/dumb-vga-dac.c          |  2 +-
 drivers/gpu/drm/bridge/lvds-encoder.c          | 10 ++++++----
 .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c   |  3 ++-
 drivers/gpu/drm/bridge/nxp-ptn3460.c           |  3 ++-
 drivers/gpu/drm/bridge/panel.c                 |  5 ++---
 drivers/gpu/drm/bridge/parade-ps8622.c         |  3 ++-
 drivers/gpu/drm/bridge/sii902x.c               |  3 ++-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c      | 17 +++++++++--------
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c  |  5 ++++-
 drivers/gpu/drm/bridge/tc358764.c              | 14 +++++++++-----
 drivers/gpu/drm/bridge/thc63lvd1024.c          | 10 ++++++----
 drivers/gpu/drm/bridge/ti-sn65dsi86.c          | 18 ++++++++++--------
 drivers/gpu/drm/bridge/ti-tfp410.c             |  4 ++--
 16 files changed, 71 insertions(+), 53 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +2 -2
index ec2ca71e1323..f9fff1b6f245 100644
@@ -6,17 +6,17 @@
  * Licensed under the GPL-2.
  */
 
+#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
-#include <linux/clk.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include <media/cec.h>
drivers/gpu/drm/bridge/analogix-anx78xx.c +4 -4
index c09aaf93ae1b..479ce3642a79 100644
@@ -16,23 +16,23 @@
  */
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/interrupt.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/regmap.h>
-#include <linux/types.h>
-#include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
+#include <linux/types.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include "analogix-anx78xx.h"
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +8 -7
index 225f5e5dd69b..a0cf70c450d7 100644
@@ -10,23 +10,24 @@
 * option) any later version.
 */
 
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/gpio.h>
-#include <linux/component.h>
 #include <linux/phy/phy.h>
+#include <linux/platform_device.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include <drm/bridge/analogix_dp.h>
drivers/gpu/drm/bridge/dumb-vga-dac.c +1 -1
index e64736c39a9f..1a3800a58aaf 100644
@@ -15,9 +15,9 @@
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 struct dumb_vga {
drivers/gpu/drm/bridge/lvds-encoder.c +6 -4
index ae8fc597eb38..6eaaa76970b1 100644
@@ -7,12 +7,14 @@
  * the License, or (at your option) any later version.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_panel.h>
-
 #include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_graph.h>
+#include <linux/platform_device.h>
+
+#include <drm/drm_bridge.h>
+#include <drm/drm_panel.h>
 
 struct lvds_encoder {
 	struct drm_bridge bridge;
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +2 -1
index a01028ec4de6..1644d281558a 100644
@@ -34,11 +34,12 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
 
 #define EDID_EXT_BLOCK_CNT 0x7E
 
drivers/gpu/drm/bridge/nxp-ptn3460.c +2 -1
index fb335afea4cf..3f4d4aef19e1 100644
@@ -20,13 +20,14 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
 
 #define PTN3460_EDID_ADDR			0x0
 #define PTN3460_EDID_EMULATION_ADDR		0x84
drivers/gpu/drm/bridge/panel.c +2 -3
index 38eeaf8ba959..08517740e6a0 100644
@@ -8,14 +8,13 @@
  * the License, or (at your option) any later version.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_panel.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
 
 struct panel_bridge {
 	struct drm_bridge bridge;
drivers/gpu/drm/bridge/parade-ps8622.c +2 -1
index fda1395b7481..05b9da6284f0 100644
@@ -24,12 +24,13 @@
 #include <linux/of_device.h>
 #include <linux/pm.h>
 #include <linux/regulator/consumer.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/drmP.h>
 
 /* Brightness scale on the Parade chip */
 #define PS8622_MAX_BRIGHTNESS 0xff
drivers/gpu/drm/bridge/sii902x.c +2 -1
index 08e12fef1349..cdb8dfdb2dff 100644
@@ -28,9 +28,10 @@
 #include <linux/module.h>
 #include <linux/regmap.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #define SII902X_TPI_VIDEO_DATA			0x0
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +9 -8
index db761329a1e3..ab7d0c702da0 100644
@@ -11,32 +11,33 @@
  * (at your option) any later version.
  *
  */
-#include <linux/module.h>
-#include <linux/irq.h>
+#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/hdmi.h>
+#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
+#include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
+#include <drm/bridge/dw_hdmi.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_encoder_slave.h>
-#include <drm/drm_scdc_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_scdc_helper.h>
 
 #include <uapi/linux/media-bus-format.h>
 #include <uapi/linux/videodev2.h>
 
-#include "dw-hdmi.h"
 #include "dw-hdmi-audio.h"
 #include "dw-hdmi-cec.h"
+#include "dw-hdmi.h"
 
 #include <media/cec-notifier.h>
 
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +4 -1
index e915ae8c9a92..e6591ec9022c 100644
@@ -15,14 +15,17 @@
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
+
 #include <drm/bridge/dw_mipi_dsi.h>
+
 #include <video/mipi_display.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
drivers/gpu/drm/bridge/tc358764.c +9 -5
index a20e454ddd64..170f162ffa55 100644
@@ -7,18 +7,22 @@
  *	Maciej Purski <[email protected]>
  */
 
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/mipi_display.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of_graph.h>
-#include <linux/regulator/consumer.h>
-#include <video/mipi_display.h>
 
 #define FLD_MASK(start, end)    (((1 << ((start) - (end) + 1)) - 1) << (end))
 #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
drivers/gpu/drm/bridge/thc63lvd1024.c +6 -4
index b083a740565c..fd597f58f4e6 100644
@@ -5,15 +5,17 @@
  * Copyright (C) 2018 Jacopo Mondi <[email protected]>
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_panel.h>
-
 #include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_graph.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
+#include <drm/drm_bridge.h>
+#include <drm/drm_panel.h>
+
 enum thc63_ports {
 	THC63_LVDS_IN0,
 	THC63_LVDS_IN1,
drivers/gpu/drm/bridge/ti-sn65dsi86.c +10 -8
index f72ee137e5f1..b77a52d05061 100644
@@ -3,23 +3,25 @@
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_atomic.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_dp_helper.h>
-#include <drm/drm_mipi_dsi.h>
-#include <drm/drm_of.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_probe_helper.h>
 #include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/iopoll.h>
+#include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
 #define SN_DEVICE_REV_REG			0x08
 #define SN_DPPLL_SRC_REG			0x0A
 #define  DPPLL_CLK_SRC_DSICLK			BIT(0)
drivers/gpu/drm/bridge/ti-tfp410.c +2 -2
index 8b0e71bd3ca7..bfb21b5eefe1 100644
@@ -11,15 +11,15 @@
 #include <linux/delay.h>
 #include <linux/fwnode.h>
 #include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
-#include <linux/i2c.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #define HOTPLUG_DEBOUNCE_MS		1100
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
reviewer Reviewed-by on v1 1/1
#1 lore raw

Hi Sam,

Thank you for the patch.

Quoted 21 lines · Sam Ravnborg

Drop use of the deprecated drmP.h header file.

While touching the list of include files:
- Divide include files in blocks of linux/* drm/* etc. Followed the drm style with the most general files first
- Sort individual blocks of include files

Cc Andrzej Hajda <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Peter Senna Tschudin <[email protected]>
Cc Martin Donnelly <[email protected]>
Cc Martyn Welch <[email protected]>

---

The patch is made on top of drm-misc-next.
Buildtested using x86,arm,arm64,alpha + more
allyesconfig + allmodconfig

Quoted 6 lines

This is part of the ongoing effort to drop use of drmP.h.

Squashed into a single patch as this touched an acceptable low amount of files - and the individual changes are trivial.

With this patch drm/bridge/ no longer uses drmP.h.

Great work !

Quoted 297 lines
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c   |  4 ++--
 drivers/gpu/drm/bridge/analogix-anx78xx.c      |  8 ++++----
 .../gpu/drm/bridge/analogix/analogix_dp_core.c | 15 ++++++++-------
 drivers/gpu/drm/bridge/dumb-vga-dac.c          |  2 +-
 drivers/gpu/drm/bridge/lvds-encoder.c          | 10 ++++++----
 .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c   |  3 ++-
 drivers/gpu/drm/bridge/nxp-ptn3460.c           |  3 ++-
 drivers/gpu/drm/bridge/panel.c                 |  5 ++---
 drivers/gpu/drm/bridge/parade-ps8622.c         |  3 ++-
 drivers/gpu/drm/bridge/sii902x.c               |  3 ++-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c      | 17 +++++++++--------
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c  |  5 ++++-
 drivers/gpu/drm/bridge/tc358764.c              | 14 +++++++++-----
 drivers/gpu/drm/bridge/thc63lvd1024.c          | 10 ++++++----
 drivers/gpu/drm/bridge/ti-sn65dsi86.c          | 18 ++++++++++--------
 drivers/gpu/drm/bridge/ti-tfp410.c             |  4 ++--
 16 files changed, 71 insertions(+), 53 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +2 -2
index ec2ca71e1323..f9fff1b6f245 100644
@@ -6,17 +6,17 @@
  * Licensed under the GPL-2.
  */
 
+#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
-#include <linux/clk.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include <media/cec.h>
drivers/gpu/drm/bridge/analogix-anx78xx.c +4 -4
index c09aaf93ae1b..479ce3642a79 100644
@@ -16,23 +16,23 @@
  */
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/interrupt.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/regmap.h>
-#include <linux/types.h>
-#include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
+#include <linux/types.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include "analogix-anx78xx.h"
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +8 -7
index 225f5e5dd69b..a0cf70c450d7 100644
@@ -10,23 +10,24 @@
 * option) any later version.
 */
 
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/gpio.h>
-#include <linux/component.h>
 #include <linux/phy/phy.h>
+#include <linux/platform_device.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include <drm/bridge/analogix_dp.h>
drivers/gpu/drm/bridge/dumb-vga-dac.c +1 -1
index e64736c39a9f..1a3800a58aaf 100644
@@ -15,9 +15,9 @@
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 struct dumb_vga {
drivers/gpu/drm/bridge/lvds-encoder.c +6 -4
index ae8fc597eb38..6eaaa76970b1 100644
@@ -7,12 +7,14 @@
  * the License, or (at your option) any later version.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_panel.h>
-
 #include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_graph.h>
+#include <linux/platform_device.h>
+
+#include <drm/drm_bridge.h>
+#include <drm/drm_panel.h>
 
 struct lvds_encoder {
 	struct drm_bridge bridge;
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +2 -1
index a01028ec4de6..1644d281558a 100644
@@ -34,11 +34,12 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
 
 #define EDID_EXT_BLOCK_CNT 0x7E
 
drivers/gpu/drm/bridge/nxp-ptn3460.c +2 -1
index fb335afea4cf..3f4d4aef19e1 100644
@@ -20,13 +20,14 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
 
 #define PTN3460_EDID_ADDR			0x0
 #define PTN3460_EDID_EMULATION_ADDR		0x84
drivers/gpu/drm/bridge/panel.c +2 -3
index 38eeaf8ba959..08517740e6a0 100644
@@ -8,14 +8,13 @@
  * the License, or (at your option) any later version.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_panel.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
 
 struct panel_bridge {
 	struct drm_bridge bridge;
drivers/gpu/drm/bridge/parade-ps8622.c +2 -1
index fda1395b7481..05b9da6284f0 100644
@@ -24,12 +24,13 @@
 #include <linux/of_device.h>
 #include <linux/pm.h>
 #include <linux/regulator/consumer.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/drmP.h>
 
 /* Brightness scale on the Parade chip */
 #define PS8622_MAX_BRIGHTNESS 0xff
drivers/gpu/drm/bridge/sii902x.c +2 -1
index 08e12fef1349..cdb8dfdb2dff 100644
@@ -28,9 +28,10 @@
 #include <linux/module.h>
 #include <linux/regmap.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #define SII902X_TPI_VIDEO_DATA			0x0
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +9 -8
index db761329a1e3..ab7d0c702da0 100644
@@ -11,32 +11,33 @@
  * (at your option) any later version.
  *
  */
-#include <linux/module.h>
-#include <linux/irq.h>
+#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/hdmi.h>
+#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
+#include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 
-#include <drm/drm_of.h>
-#include <drm/drmP.h>
+#include <drm/bridge/dw_hdmi.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_encoder_slave.h>
-#include <drm/drm_scdc_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_scdc_helper.h>
 
 #include <uapi/linux/media-bus-format.h>
 #include <uapi/linux/videodev2.h>
 
-#include "dw-hdmi.h"
 #include "dw-hdmi-audio.h"
 #include "dw-hdmi-cec.h"
+#include "dw-hdmi.h"
 
 #include <media/cec-notifier.h>
 
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -1
index e915ae8c9a92..e6591ec9022c 100644
@@ -15,14 +15,17 @@
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
-#include <drm/drmP.h>

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c line 27

Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +3 -0
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
+
 #include <drm/bridge/dw_mipi_dsi.h>

If you separate this file fromt he rest of the drm/ includes, you should do the same in drivers/gpu/drm/bridge/synopsys/dw-hdmi.c for consistency. I'm fine either way.

Quoted 23 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+
 #include <video/mipi_display.h>
 
 #define HWVER_131			0x31333100	/* IP version 1.31 */
drivers/gpu/drm/bridge/tc358764.c +8 -0
index a20e454ddd64..170f162ffa55 100644
@@ -7,18 +7,22 @@
  *	Maciej Purski <[email protected]>
  */
 
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/mipi_display.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>

drivers/gpu/drm/bridge/tc358764.c line 21

Quoted 10 lines
drivers/gpu/drm/bridge/tc358764.c +1 -5
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of_graph.h>
-#include <linux/regulator/consumer.h>
-#include <video/mipi_display.h>

Similarly, in drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c you have video/ after drm/, while it's the other way around. I think we should pick one order and stick with it.

With these small issues fixed,

Quoted 89 lines
drivers/gpu/drm/bridge/tc358764.c +0 -0
 #define FLD_MASK(start, end)    (((1 << ((start) - (end) + 1)) - 1) << (end))
 #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
drivers/gpu/drm/bridge/thc63lvd1024.c +6 -4
index b083a740565c..fd597f58f4e6 100644
@@ -5,15 +5,17 @@
  * Copyright (C) 2018 Jacopo Mondi <[email protected]>
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_panel.h>
-
 #include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_graph.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
+#include <drm/drm_bridge.h>
+#include <drm/drm_panel.h>
+
 enum thc63_ports {
 	THC63_LVDS_IN0,
 	THC63_LVDS_IN1,
drivers/gpu/drm/bridge/ti-sn65dsi86.c +10 -8
index f72ee137e5f1..b77a52d05061 100644
@@ -3,23 +3,25 @@
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  */
 
-#include <drm/drmP.h>
-#include <drm/drm_atomic.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_dp_helper.h>
-#include <drm/drm_mipi_dsi.h>
-#include <drm/drm_of.h>
-#include <drm/drm_panel.h>
-#include <drm/drm_probe_helper.h>
 #include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/iopoll.h>
+#include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+
 #define SN_DEVICE_REV_REG			0x08
 #define SN_DPPLL_SRC_REG			0x0A
 #define  DPPLL_CLK_SRC_DSICLK			BIT(0)
drivers/gpu/drm/bridge/ti-tfp410.c +2 -2
index 8b0e71bd3ca7..bfb21b5eefe1 100644
@@ -11,15 +11,15 @@
 #include <linux/delay.h>
 #include <linux/fwnode.h>
 #include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
-#include <linux/i2c.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #define HOTPLUG_DEBOUNCE_MS		1100
Signature · 7 lines
Regards,

Laurent Pinchart
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Hi Laurent

Thanks for the quick feedback.

Quoted 44 lines
Quoted 5 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -1
@@ -15,14 +15,17 @@
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
-#include <drm/drmP.h>

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c line 27

Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +3 -0
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
+
 #include <drm/bridge/dw_mipi_dsi.h>

If you separate this file fromt he rest of the drm/ includes, you should do the same in drivers/gpu/drm/bridge/synopsys/dw-hdmi.c for consistency. I'm fine either way.

Quoted 24 lines

index a20e454ddd64..170f162ffa55 100644

drivers/gpu/drm/bridge/tc358764.c +9 -1
@@ -7,18 +7,22 @@
  *	Maciej Purski <[email protected]>
  */
 
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/mipi_display.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drmP.h>
Quoted 8 lines

drivers/gpu/drm/bridge/tc358764.c line 21

Quoted 4 lines
drivers/gpu/drm/bridge/tc358764.c +0 -4
-#include <linux/gpio/consumer.h>
-#include <linux/of_graph.h>
-#include <linux/regulator/consumer.h>
-#include <video/mipi_display.h>

Similarly, in drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c you have video/ after drm/, while it's the other way around. I think we should pick one order and stick with it.

Well done to spot this inconsistency.

I will go through the files and consistently use following order:

<linux/*>

<asm/*>

<video/*>

<drm/*>

""

This seems to match the majority but all variants can be found. And then the principle is:
- most general includes first, with linux/* first
- drm includes second-last
- local drm includes last

Quoted 4 lines

With these small issues fixed,

Thanks. I will post a v2 - where I can also fix so the mail is sent to the relevant people (my cc: was missing some this time).

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