drm/bridge: drop drmP.h usage
Subsystems (5)
v2 cover drm/bridge: drop drmP.h usage
To avoid that people start to pick up bad habits get rid of the deprecated drmP.h in all of the bridge/ code.
Build tested using allmodconfig/allyesconfig with arm, x86, alpha (that has a tendency to break) and a few more
v2:
Sort include blocks like this:
#include <linux/*>
#include <media/*>
#include <drm/*>
#include "foo.h"
And within each block sort alphabetically.
Laurent pointed out the order of the blocks was not consistent. And it was not consistent what was in each block.
The re-ordering caused the build to fail due to dw_mipi_dsi.h. Fix so this header becomes self-contained to avoid this.
Sam Ravnborg (2):
drm/bridge: make dw_mipi_dsi.h self-contained drm/bridge: drop drmP.h usage
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +++---- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +++---- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 18 +++++++-------- drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +- drivers/gpu/drm/bridge/lvds-encoder.c | 10 ++++---- .../drm/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 | 27 +++++++++++----------- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 9 +++++--- 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 ++-- include/drm/bridge/dw_mipi_dsi.h | 8 +++++++ 17 files changed, 89 insertions(+), 64 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/2 drm/bridge: make dw_mipi_dsi.h self-contained
To allow users to include dw_mipi_dsi.h without pulling in dependencies make dw_mipi_dsi.h self-contained.
Use forward declarations when possible.
--- include/drm/bridge/dw_mipi_dsi.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/drm/bridge/dw_mipi_dsi.h +8 -0
@@ -9,8 +9,16 @@ #ifndef __DW_MIPI_DSI__ #define __DW_MIPI_DSI__ +#include <linux/types.h> +struct drm_display_mode; +struct drm_encoder; struct dw_mipi_dsi; +struct dw_mipi_dsi_host_ops; +struct dw_mipi_dsi_phy_ops; +struct dw_mipi_dsi_plat_data; +struct mipi_dsi_device; +struct platform_device; struct dw_mipi_dsi_phy_ops { int (*init)(void *priv_data);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 1/2] drm/bridge: make dw_mipi_dsi.h self-contained
Hi Sam,
Thank you for the patch.
Quoted 22 lines · Sam Ravnborg
To allow users to include
dw_mipi_dsi.hwithout pulling in dependencies makedw_mipi_dsi.hself-contained.
Use forward declarations when possible.Signed-off-by Sam Ravnborg <[email protected]>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]>--- include/drm/bridge/dw_mipi_dsi.h | 8 ++++++++ 1 file changed, 8 insertions(+)include/drm/bridge/dw_mipi_dsi.h +0
-0@@ -9,8 +9,16 @@
include/drm/bridge/dw_mipi_dsi.h line 19
Quoted 10 lines
include/drm/bridge/dw_mipi_dsi.h +6
-0#ifndef __DW_MIPI_DSI__#define __DW_MIPI_DSI__ +#include <linux/types.h> +struct drm_display_mode ; +struct drm_encoder ;struct dw_mipi_dsi ; +struct dw_mipi_dsi_host_ops ; +struct dw_mipi_dsi_phy_ops ; +struct dw_mipi_dsi_plat_data ;
No need to forward-declare these three structures, they're defined in this very .h file.
include/drm/bridge/dw_mipi_dsi.h line 21
Quoted 2 lines
include/drm/bridge/dw_mipi_dsi.h +2
-0+struct mipi_dsi_device ; +struct platform_device ;
You need to pull in drm/modes.h for drm_mode_status.
Apart from that,
Quoted 3 lines
include/drm/bridge/dw_mipi_dsi.h +0
-0struct dw_mipi_dsi_phy_ops {int (*init)(void *priv_data);
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 drm/bridge: drop drmP.h usage
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file.
While touching the list of include files:
- Divide include files in blocks of linux/* drm/* etc.
- Sort individual blocks of include files
- Remove duplicated header file
v2:
- Be consistent in the order of the include blocks (Laurent)
--- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +++--- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +++--- .../drm/bridge/analogix/analogix_dp_core.c | 18 ++++++------- 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 | 27 ++++++++++--------- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 9 ++++--- 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, 81 insertions(+), 64 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +4 -4
@@ -6,21 +6,21 @@* 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 <media/cec.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> -#include "adv7511.h" /* ADI recommended values for proper operation. */
drivers/gpu/drm/bridge/analogix-anx78xx.c +4 -4
@@ -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 +9 -9
@@ -10,27 +10,27 @@* 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/bridge/analogix_dp.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> -#include "analogix_dp_core.h" #include "analogix_dp_reg.h"
drivers/gpu/drm/bridge/dumb-vga-dac.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 +14 -13
@@ -11,34 +11,35 @@* (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 <media/cec-notifier.h> + +#include <uapi/linux/media-bus-format.h> +#include <uapi/linux/videodev2.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 <uapi/linux/media-bus-format.h> -#include <uapi/linux/videodev2.h> +#include <drm/drm_scdc_helper.h> -#include "dw-hdmi.h" #include "dw-hdmi-audio.h" #include "dw-hdmi-cec.h" - -#include <media/cec-notifier.h> +#include "dw-hdmi.h" #define DDC_SEGMENT_ADDR 0x30
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +6 -3
@@ -15,15 +15,18 @@#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> -#include <drm/drmP.h> + +#include <video/mipi_display.h> + +#include <drm/bridge/dw_mipi_dsi.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_modes.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
@@ -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
@@ -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
@@ -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
@@ -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
Hi Sam,
Thank you for the patch.
Quoted 10 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the list of include files:
- Divide include files in blocks of linux/* drm/* etc.
- Sort individual blocks of include files
- Remove duplicated header filev2:
- Be consistent in the order of the include blocks (Laurent)
Quoted 8 lines
Signed-off-by Sam Ravnborg <[email protected]>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]>
By the way, on a side note, I came across a neat trick recently to help making headers self-contained. By including the header related to a C file as the very first header, the compiler will throw an error if the header is not self-contained. It would be a bit of an intrusive change in DRM, but maybe something to keep in mind.
Quoted 451 lines
--- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +++--- drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +++--- .../drm/bridge/analogix/analogix_dp_core.c | 18 ++++++------- 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 | 27 ++++++++++--------- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 9 ++++--- 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, 81 insertions(+), 64 deletions(-)drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +4
-4@@ -6,21 +6,21 @@* 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 <media/cec.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> -#include "adv7511.h" /* ADI recommended values for proper operation. */ drivers/gpu/drm/bridge/analogix-anx78xx.c +4
-4@@ -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 +9
-9@@ -10,27 +10,27 @@* 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/bridge/analogix_dp.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> -#include "analogix_dp_core.h" #include "analogix_dp_reg.h" drivers/gpu/drm/bridge/dumb-vga-dac.c +1
-1@@ -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@@ -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@@ -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 0x7Edrivers/gpu/drm/bridge/nxp-ptn3460.c +2
-1@@ -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 0x84drivers/gpu/drm/bridge/panel.c +2
-3@@ -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@@ -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 0xffdrivers/gpu/drm/bridge/sii902x.c +2
-1@@ -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 0x0drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +14
-13@@ -11,34 +11,35 @@* (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 <media/cec-notifier.h> + +#include <uapi/linux/media-bus-format.h> +#include <uapi/linux/videodev2.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 <uapi/linux/media-bus-format.h> -#include <uapi/linux/videodev2.h> +#include <drm/drm_scdc_helper.h> -#include "dw-hdmi.h" #include "dw-hdmi-audio.h" #include "dw-hdmi-cec.h" - -#include <media/cec-notifier.h> +#include "dw-hdmi.h" #define DDC_SEGMENT_ADDR 0x30drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +6
-3@@ -15,15 +15,18 @@#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> -#include <drm/drmP.h> + +#include <video/mipi_display.h> + +#include <drm/bridge/dw_mipi_dsi.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_modes.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@@ -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@@ -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@@ -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@@ -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
Quoted 24 lines · Laurent Pinchart
Hi Sam,
Thank you for the patch.
Quoted 10 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the list of include files:
- Divide include files in blocks of linux/* drm/* etc.
- Sort individual blocks of include files
- Remove duplicated header filev2:
- Be consistent in the order of the include blocks (Laurent)Quoted 8 lines
Signed-off-by Sam Ravnborg <[email protected]>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]>
Quoted 7 lines
Reviewed-by Laurent Pinchart <[email protected]>By the way, on a side note, I came across a neat trick recently to help making headers self-contained. By including the header related to a C file as the very first header, the compiler will throw an error if the header is not self-contained. It would be a bit of an intrusive change in DRM, but maybe something to keep in mind.
In some projects I have worked with the rule was to include the most specific headers first - so we would caugth early if a header file missed something.
But as long as having all header files self-contained are not a hard rule we should not try to do something like this.
I once went through all the drm header files to make them minimal and self-contained.
But this triggered a massive update of all drm drivers / core files so I skipped that again. The pain/gain ratio was far to high. Just making them all self-contained is is smaller task that does not break the build - but until now I have not seen any good reasons / demands for this so I have left it.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel