Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.
- Sort individual blocks of include files
- Remove duplicated header file

v2:
- Be consistent in the order of the include blocks (Laurent)

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Martin Donnelly <martin.donnelly@ge.com>
Cc: Martyn Welch <martyn.welch@collabora.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190519183636.19588-1-sam@ravnborg.org

+85 -67
+4 -4
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
··· 6 6 * Licensed under the GPL-2. 7 7 */ 8 8 9 + #include <linux/clk.h> 9 10 #include <linux/device.h> 10 11 #include <linux/gpio/consumer.h> 11 12 #include <linux/module.h> 12 13 #include <linux/of_device.h> 13 14 #include <linux/slab.h> 14 - #include <linux/clk.h> 15 15 16 - #include <drm/drmP.h> 16 + #include <media/cec.h> 17 + 17 18 #include <drm/drm_atomic.h> 18 19 #include <drm/drm_atomic_helper.h> 19 20 #include <drm/drm_edid.h> 21 + #include <drm/drm_print.h> 20 22 #include <drm/drm_probe_helper.h> 21 - 22 - #include <media/cec.h> 23 23 24 24 #include "adv7511.h" 25 25
+4 -4
drivers/gpu/drm/bridge/analogix-anx78xx.c
··· 16 16 */ 17 17 #include <linux/delay.h> 18 18 #include <linux/err.h> 19 - #include <linux/interrupt.h> 19 + #include <linux/gpio/consumer.h> 20 20 #include <linux/i2c.h> 21 + #include <linux/interrupt.h> 21 22 #include <linux/kernel.h> 22 23 #include <linux/module.h> 23 24 #include <linux/of_gpio.h> 24 25 #include <linux/of_irq.h> 25 26 #include <linux/of_platform.h> 26 27 #include <linux/regmap.h> 27 - #include <linux/types.h> 28 - #include <linux/gpio/consumer.h> 29 28 #include <linux/regulator/consumer.h> 29 + #include <linux/types.h> 30 30 31 - #include <drm/drmP.h> 32 31 #include <drm/drm_atomic_helper.h> 33 32 #include <drm/drm_crtc.h> 34 33 #include <drm/drm_dp_helper.h> 35 34 #include <drm/drm_edid.h> 35 + #include <drm/drm_print.h> 36 36 #include <drm/drm_probe_helper.h> 37 37 38 38 #include "analogix-anx78xx.h"
+12 -12
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
··· 10 10 * option) any later version. 11 11 */ 12 12 13 - #include <linux/module.h> 14 - #include <linux/platform_device.h> 15 - #include <linux/err.h> 16 13 #include <linux/clk.h> 14 + #include <linux/component.h> 15 + #include <linux/err.h> 16 + #include <linux/gpio.h> 17 + #include <linux/interrupt.h> 17 18 #include <linux/io.h> 18 19 #include <linux/iopoll.h> 19 - #include <linux/interrupt.h> 20 + #include <linux/module.h> 20 21 #include <linux/of.h> 21 22 #include <linux/of_gpio.h> 22 - #include <linux/gpio.h> 23 - #include <linux/component.h> 24 23 #include <linux/phy/phy.h> 25 - 26 - #include <drm/drmP.h> 27 - #include <drm/drm_atomic_helper.h> 28 - #include <drm/drm_crtc.h> 29 - #include <drm/drm_panel.h> 30 - #include <drm/drm_probe_helper.h> 24 + #include <linux/platform_device.h> 31 25 32 26 #include <drm/bridge/analogix_dp.h> 27 + #include <drm/drm_atomic_helper.h> 28 + #include <drm/drm_crtc.h> 29 + #include <drm/drm_device.h> 30 + #include <drm/drm_panel.h> 31 + #include <drm/drm_print.h> 32 + #include <drm/drm_probe_helper.h> 33 33 34 34 #include "analogix_dp_core.h" 35 35 #include "analogix_dp_reg.h"
+1 -1
drivers/gpu/drm/bridge/dumb-vga-dac.c
··· 15 15 #include <linux/of_graph.h> 16 16 #include <linux/regulator/consumer.h> 17 17 18 - #include <drm/drmP.h> 19 18 #include <drm/drm_atomic_helper.h> 20 19 #include <drm/drm_crtc.h> 20 + #include <drm/drm_print.h> 21 21 #include <drm/drm_probe_helper.h> 22 22 23 23 struct dumb_vga {
+6 -4
drivers/gpu/drm/bridge/lvds-encoder.c
··· 7 7 * the License, or (at your option) any later version. 8 8 */ 9 9 10 - #include <drm/drmP.h> 10 + #include <linux/gpio/consumer.h> 11 + #include <linux/module.h> 12 + #include <linux/of.h> 13 + #include <linux/of_graph.h> 14 + #include <linux/platform_device.h> 15 + 11 16 #include <drm/drm_bridge.h> 12 17 #include <drm/drm_panel.h> 13 - 14 - #include <linux/gpio/consumer.h> 15 - #include <linux/of_graph.h> 16 18 17 19 struct lvds_encoder { 18 20 struct drm_bridge bridge;
+2 -1
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
··· 34 34 #include <linux/i2c.h> 35 35 #include <linux/module.h> 36 36 #include <linux/of.h> 37 + 37 38 #include <drm/drm_atomic.h> 38 39 #include <drm/drm_atomic_helper.h> 39 40 #include <drm/drm_edid.h> 41 + #include <drm/drm_print.h> 40 42 #include <drm/drm_probe_helper.h> 41 - #include <drm/drmP.h> 42 43 43 44 #define EDID_EXT_BLOCK_CNT 0x7E 44 45
+2 -1
drivers/gpu/drm/bridge/nxp-ptn3460.c
··· 20 20 #include <linux/module.h> 21 21 #include <linux/of.h> 22 22 #include <linux/of_gpio.h> 23 + 23 24 #include <drm/drm_atomic_helper.h> 24 25 #include <drm/drm_crtc.h> 25 26 #include <drm/drm_edid.h> 26 27 #include <drm/drm_of.h> 27 28 #include <drm/drm_panel.h> 29 + #include <drm/drm_print.h> 28 30 #include <drm/drm_probe_helper.h> 29 - #include <drm/drmP.h> 30 31 31 32 #define PTN3460_EDID_ADDR 0x0 32 33 #define PTN3460_EDID_EMULATION_ADDR 0x84
+1 -1
drivers/gpu/drm/bridge/panel.c
··· 8 8 * the License, or (at your option) any later version. 9 9 */ 10 10 11 - #include <drm/drmP.h> 12 11 #include <drm/drm_atomic_helper.h> 13 12 #include <drm/drm_connector.h> 14 13 #include <drm/drm_encoder.h> 15 14 #include <drm/drm_modeset_helper_vtables.h> 16 15 #include <drm/drm_panel.h> 16 + #include <drm/drm_print.h> 17 17 #include <drm/drm_probe_helper.h> 18 18 19 19 struct panel_bridge {
+2 -1
drivers/gpu/drm/bridge/parade-ps8622.c
··· 24 24 #include <linux/of_device.h> 25 25 #include <linux/pm.h> 26 26 #include <linux/regulator/consumer.h> 27 + 27 28 #include <drm/drm_atomic_helper.h> 28 29 #include <drm/drm_crtc.h> 29 30 #include <drm/drm_of.h> 30 31 #include <drm/drm_panel.h> 32 + #include <drm/drm_print.h> 31 33 #include <drm/drm_probe_helper.h> 32 - #include <drm/drmP.h> 33 34 34 35 /* Brightness scale on the Parade chip */ 35 36 #define PS8622_MAX_BRIGHTNESS 0xff
+2 -1
drivers/gpu/drm/bridge/sii902x.c
··· 28 28 #include <linux/module.h> 29 29 #include <linux/regmap.h> 30 30 31 - #include <drm/drmP.h> 32 31 #include <drm/drm_atomic_helper.h> 32 + #include <drm/drm_drv.h> 33 33 #include <drm/drm_edid.h> 34 + #include <drm/drm_print.h> 34 35 #include <drm/drm_probe_helper.h> 35 36 36 37 #define SII902X_TPI_VIDEO_DATA 0x0
+15 -14
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
··· 11 11 * (at your option) any later version. 12 12 * 13 13 */ 14 - #include <linux/module.h> 15 - #include <linux/irq.h> 14 + #include <linux/clk.h> 16 15 #include <linux/delay.h> 17 16 #include <linux/err.h> 18 - #include <linux/clk.h> 19 17 #include <linux/hdmi.h> 18 + #include <linux/irq.h> 19 + #include <linux/module.h> 20 20 #include <linux/mutex.h> 21 21 #include <linux/of_device.h> 22 22 #include <linux/regmap.h> 23 + #include <linux/dma-mapping.h> 23 24 #include <linux/spinlock.h> 24 25 25 - #include <drm/drm_of.h> 26 - #include <drm/drmP.h> 27 - #include <drm/drm_atomic_helper.h> 28 - #include <drm/drm_edid.h> 29 - #include <drm/drm_encoder_slave.h> 30 - #include <drm/drm_scdc_helper.h> 31 - #include <drm/drm_probe_helper.h> 32 - #include <drm/bridge/dw_hdmi.h> 26 + #include <media/cec-notifier.h> 33 27 34 28 #include <uapi/linux/media-bus-format.h> 35 29 #include <uapi/linux/videodev2.h> 36 30 37 - #include "dw-hdmi.h" 31 + #include <drm/bridge/dw_hdmi.h> 32 + #include <drm/drm_atomic_helper.h> 33 + #include <drm/drm_edid.h> 34 + #include <drm/drm_encoder_slave.h> 35 + #include <drm/drm_of.h> 36 + #include <drm/drm_print.h> 37 + #include <drm/drm_probe_helper.h> 38 + #include <drm/drm_scdc_helper.h> 39 + 38 40 #include "dw-hdmi-audio.h" 39 41 #include "dw-hdmi-cec.h" 40 - 41 - #include <media/cec-notifier.h> 42 + #include "dw-hdmi.h" 42 43 43 44 #define DDC_SEGMENT_ADDR 0x30 44 45
+6 -3
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
··· 15 15 #include <linux/of_device.h> 16 16 #include <linux/pm_runtime.h> 17 17 #include <linux/reset.h> 18 - #include <drm/drmP.h> 18 + 19 + #include <video/mipi_display.h> 20 + 21 + #include <drm/bridge/dw_mipi_dsi.h> 19 22 #include <drm/drm_atomic_helper.h> 20 23 #include <drm/drm_bridge.h> 21 24 #include <drm/drm_crtc.h> 22 25 #include <drm/drm_mipi_dsi.h> 26 + #include <drm/drm_modes.h> 23 27 #include <drm/drm_of.h> 28 + #include <drm/drm_print.h> 24 29 #include <drm/drm_probe_helper.h> 25 - #include <drm/bridge/dw_mipi_dsi.h> 26 - #include <video/mipi_display.h> 27 30 28 31 #define HWVER_131 0x31333100 /* IP version 1.31 */ 29 32
+9 -5
drivers/gpu/drm/bridge/tc358764.c
··· 7 7 * Maciej Purski <m.purski@samsung.com> 8 8 */ 9 9 10 + #include <linux/delay.h> 11 + #include <linux/gpio/consumer.h> 12 + #include <linux/module.h> 13 + #include <linux/of_graph.h> 14 + #include <linux/regulator/consumer.h> 15 + 16 + #include <video/mipi_display.h> 17 + 10 18 #include <drm/drm_atomic_helper.h> 11 19 #include <drm/drm_crtc.h> 12 20 #include <drm/drm_fb_helper.h> 13 21 #include <drm/drm_mipi_dsi.h> 14 22 #include <drm/drm_of.h> 15 23 #include <drm/drm_panel.h> 24 + #include <drm/drm_print.h> 16 25 #include <drm/drm_probe_helper.h> 17 - #include <drm/drmP.h> 18 - #include <linux/gpio/consumer.h> 19 - #include <linux/of_graph.h> 20 - #include <linux/regulator/consumer.h> 21 - #include <video/mipi_display.h> 22 26 23 27 #define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end)) 24 28 #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
+6 -4
drivers/gpu/drm/bridge/thc63lvd1024.c
··· 5 5 * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org> 6 6 */ 7 7 8 - #include <drm/drmP.h> 9 - #include <drm/drm_bridge.h> 10 - #include <drm/drm_panel.h> 11 - 12 8 #include <linux/gpio/consumer.h> 9 + #include <linux/module.h> 10 + #include <linux/of.h> 13 11 #include <linux/of_graph.h> 12 + #include <linux/platform_device.h> 14 13 #include <linux/regulator/consumer.h> 15 14 #include <linux/slab.h> 15 + 16 + #include <drm/drm_bridge.h> 17 + #include <drm/drm_panel.h> 16 18 17 19 enum thc63_ports { 18 20 THC63_LVDS_IN0,
+11 -9
drivers/gpu/drm/bridge/ti-sn65dsi86.c
··· 3 3 * Copyright (c) 2018, The Linux Foundation. All rights reserved. 4 4 */ 5 5 6 - #include <drm/drmP.h> 6 + #include <linux/clk.h> 7 + #include <linux/gpio/consumer.h> 8 + #include <linux/i2c.h> 9 + #include <linux/iopoll.h> 10 + #include <linux/module.h> 11 + #include <linux/of_graph.h> 12 + #include <linux/pm_runtime.h> 13 + #include <linux/regmap.h> 14 + #include <linux/regulator/consumer.h> 15 + 7 16 #include <drm/drm_atomic.h> 8 17 #include <drm/drm_atomic_helper.h> 9 18 #include <drm/drm_dp_helper.h> 10 19 #include <drm/drm_mipi_dsi.h> 11 20 #include <drm/drm_of.h> 12 21 #include <drm/drm_panel.h> 22 + #include <drm/drm_print.h> 13 23 #include <drm/drm_probe_helper.h> 14 - #include <linux/clk.h> 15 - #include <linux/gpio/consumer.h> 16 - #include <linux/i2c.h> 17 - #include <linux/iopoll.h> 18 - #include <linux/of_graph.h> 19 - #include <linux/pm_runtime.h> 20 - #include <linux/regmap.h> 21 - #include <linux/regulator/consumer.h> 22 24 23 25 #define SN_DEVICE_REV_REG 0x08 24 26 #define SN_DPPLL_SRC_REG 0x0A
+2 -2
drivers/gpu/drm/bridge/ti-tfp410.c
··· 11 11 #include <linux/delay.h> 12 12 #include <linux/fwnode.h> 13 13 #include <linux/gpio/consumer.h> 14 + #include <linux/i2c.h> 14 15 #include <linux/irq.h> 15 16 #include <linux/module.h> 16 17 #include <linux/of_graph.h> 17 18 #include <linux/platform_device.h> 18 - #include <linux/i2c.h> 19 19 20 - #include <drm/drmP.h> 21 20 #include <drm/drm_atomic_helper.h> 22 21 #include <drm/drm_crtc.h> 22 + #include <drm/drm_print.h> 23 23 #include <drm/drm_probe_helper.h> 24 24 25 25 #define HOTPLUG_DEBOUNCE_MS 1100