drm/exynos: drop use of drmP.h
Subsystems (4)
cover drm/exynos: drop use of drmP.h
Drop the use of the deprecated drmP.h header file.
Build tested using allyesconfig, allmodconfig for various architectures.
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 | 8 +++--- 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, 151 insertions(+), 136 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 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.
--- 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 | 8 ++-- 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, 151 insertions(+), 136 deletions(-)
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +5 -2
@@ -10,7 +10,6 @@* published by the Free Software Foundationr */ -#include <linux/platform_device.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h>
@@ -18,11 +17,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
@@ -11,8 +11,6 @@* option) any later version. * */ -#include <drm/drmP.h> -#include <drm/exynos_drm.h> #include <linux/clk.h> #include <linux/component.h>
@@ -26,10 +24,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
@@ -10,25 +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/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
@@ -12,11 +12,11 @@* option) any later version. */ -#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
@@ -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
@@ -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
@@ -11,25 +11,23 @@* option) any later version. */ +#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
@@ -15,9 +15,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
@@ -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
@@ -12,19 +12,19 @@* option) any later version. */ -#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
@@ -12,14 +12,15 @@* option) any later version. */ -#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
@@ -11,21 +11,22 @@* option) any later version. * */ -#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
@@ -11,26 +11,28 @@* option) any later version. * */ -#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 +4 -4
@@ -7,21 +7,21 @@* published by the Free Software Foundationr */ -#include <linux/kernel.h> #include <linux/clk.h> #include <linux/component.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/workqueue.h> -#include <linux/dma-mapping.h> -#include <linux/of.h> -#include <drm/drmP.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
@@ -9,12 +9,13 @@* option) any later version. */ -#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
@@ -11,20 +11,21 @@* option) any later version. * */ -#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
@@ -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
@@ -8,23 +8,25 @@* published by the Free Software Foundationr */ -#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
@@ -9,14 +9,14 @@* */ -#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
@@ -9,21 +9,21 @@* published by the Free Software Foundationr */ -#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
@@ -8,22 +8,22 @@* published by the Free Software Foundationr */ -#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
@@ -10,21 +10,20 @@* option) any later version. * */ -#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
@@ -14,33 +14,32 @@* */ -#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
Inki Dae
maintainerRe: [PATCH v1 1/1] drm/exynos: drop drmP.h usage
Hi,
19. 6. 5. 오후 11:49에 Sam Ravnborg 이(가) 쓴 글:
Quoted 5 lines
Drop use of the deprecated
drmP.hfile. Replace with forwards / externals as appropriate.While touching the list of include files divide them up in blocks and sort them.
Build error happens with this patch.
[error log]
--------------------------------------------------------------------------------------------------------
drivers/gpu/drm/exynos/exynos_drm_g2d.c:196:27: error: field 'base' has incomplete type
struct drm_pending_event base;
^
drivers/gpu/drm/exynos/exynos_drm_g2d.c: In function 'g2d_userptr_get_dma_addr':
drivers/gpu/drm/exynos/exynos_drm_g2d.c:421:50: error: dereferencing pointer to incomplete type
struct drm_exynos_file_private *file_priv = filp->driver_priv;
-- snip ----------------------------------------------------------------------------------------------------------
Thanks,
Inki Dae
Quoted 776 lines
Signed-off-by Sam Ravnborg <[email protected]>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 | 8 ++-- 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, 151 insertions(+), 136 deletions(-)drivers/gpu/drm/exynos/exynos5433_drm_decon.c +5
-2@@ -10,7 +10,6 @@* published by the Free Software Foundationr */ -#include <linux/platform_device.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h> @@ -18,11 +17,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@@ -11,8 +11,6 @@* option) any later version. * */ -#include <drm/drmP.h> -#include <drm/exynos_drm.h> #include <linux/clk.h> #include <linux/component.h> @@ -26,10 +24,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@@ -10,25 +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/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@@ -12,11 +12,11 @@* option) any later version. */ -#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@@ -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@@ -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@@ -11,25 +11,23 @@* option) any later version. */ +#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@@ -15,9 +15,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 4drivers/gpu/drm/exynos/exynos_drm_dsi.c +11
-10@@ -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@@ -12,19 +12,19 @@* option) any later version. */ -#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@@ -12,14 +12,15 @@* option) any later version. */ -#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@@ -11,21 +11,22 @@* option) any later version. * */ -#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@@ -11,26 +11,28 @@* option) any later version. * */ -#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 +4
-4@@ -7,21 +7,21 @@* published by the Free Software Foundationr */ -#include <linux/kernel.h> #include <linux/clk.h> #include <linux/component.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/workqueue.h> -#include <linux/dma-mapping.h> -#include <linux/of.h> -#include <drm/drmP.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@@ -9,12 +9,13 @@* option) any later version. */ -#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@@ -11,20 +11,21 @@* option) any later version. * */ -#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@@ -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@@ -8,23 +8,25 @@* published by the Free Software Foundationr */ -#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@@ -9,14 +9,14 @@* */ -#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@@ -9,21 +9,21 @@* published by the Free Software Foundationr */ -#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@@ -8,22 +8,22 @@* published by the Free Software Foundationr */ -#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@@ -10,21 +10,20 @@* option) any later version. * */ -#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@@ -14,38 +14,37 @@* */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_probe_helper.h> - -#include "regs-hdmi.h" - -#include <linux/kernel.h> -#include <linux/wait.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 <drm/exynos_drm.h> #include <linux/clk.h> +#include <linux/component.h> +#include <linux/delay.h> #include <linux/gpio/consumer.h> -#include <linux/regulator/consumer.h> +#include <linux/hdmi.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> #include <linux/io.h> +#include <linux/irq.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/hdmi.h> -#include <linux/component.h> -#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> -#include <sound/hdmi-codec.h> -#include <drm/exynos_drm.h> +#include <linux/regulator/consumer.h> +#include <linux/wait.h> +#include <sound/hdmi-codec.h> #include <media/cec-notifier.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "exynos_drm_crtc.h" +#include "regs-hdmi.h" #define HOTPLUG_DEBOUNCE_MS 1100drivers/gpu/drm/exynos/exynos_mixer.c +12
-15@@ -14,33 +14,32 @@* */ -#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>
drivers/gpu/drm/exynos/exynos_mixer.c line 45
Quoted 10 lines
drivers/gpu/drm/exynos/exynos_mixer.c +3
-1-#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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel