redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/sti: drop use of drmP.h 

Stop using the deprecated drmP.h header file.
Replaced with relevant forwards or headers files.
Header files sorted in all files touched.

Build tested with allyesconfig, allmodconfig for a number of
architectures.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605134835.25112-2-sam@ravnborg.org
alistair/sunxi64-5.4-dsi
Sam Ravnborg 2019-06-05 15:48:35 +02:00 committed by Benjamin Gaignard
parent 3bde449f0b
commit 5e2f97a93f
25 changed files with 85 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/sti/sti_awg_utils.c
View File

@ -4,6 +4,8 @@
* Author: Vincent Abriou <vincent.abriou@st.com> for STMicroelectronics.
*/
#include <drm/drm_print.h>
#include "sti_awg_utils.h"
#define AWG_DELAY (-5)

2
drivers/gpu/drm/sti/sti_awg_utils.h
View File

@ -7,7 +7,7 @@
#ifndef _STI_AWG_UTILS_H_
#define _STI_AWG_UTILS_H_
#include <drm/drmP.h>
#include <linux/types.h>
#define AWG_MAX_INST 64

5
drivers/gpu/drm/sti/sti_compositor.c
View File

@ -7,11 +7,14 @@
*/
#include <linux/component.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
#include <drm/drmP.h>
#include <drm/drm_device.h>
#include <drm/drm_print.h>
#include <drm/drm_vblank.h>
#include "sti_compositor.h"
#include "sti_crtc.h"

4
drivers/gpu/drm/sti/sti_crtc.c
View File

@ -8,11 +8,13 @@
#include <linux/clk.h>
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_device.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>
#include "sti_compositor.h"
#include "sti_crtc.h"

6
drivers/gpu/drm/sti/sti_crtc.h
View File

@ -7,8 +7,10 @@
#ifndef _STI_CRTC_H_
#define _STI_CRTC_H_
#include <drm/drmP.h>
struct drm_crtc;
struct drm_device;
struct drm_plane;
struct notifier_block;
struct sti_mixer;
int sti_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer,

2
drivers/gpu/drm/sti/sti_cursor.c
View File

@ -6,9 +6,11 @@
* for STMicroelectronics.
*/
#include <linux/dma-mapping.h>
#include <linux/seq_file.h>
#include <drm/drm_atomic.h>
#include <drm/drm_device.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h>

3
drivers/gpu/drm/sti/sti_cursor.h
View File

@ -7,6 +7,9 @@
#ifndef _STI_CURSOR_H_
#define _STI_CURSOR_H_
struct drm_device;
struct device;
struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
struct device *dev, int desc,
void __iomem *baseaddr,

11
drivers/gpu/drm/sti/sti_drv.c
View File

@ -4,25 +4,26 @@
* Author: Benjamin Gaignard <benjamin.gaignard@st.com> for STMicroelectronics.
*/
#include <drm/drmP.h>
#include <linux/component.h>
#include <linux/debugfs.h>
#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of_platform.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_drv.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_probe_helper.h>
#include "sti_crtc.h"
#include "sti_drv.h"
#include "sti_drv.h"
#include "sti_plane.h"
#define DRIVER_NAME "sti"

5
drivers/gpu/drm/sti/sti_drv.h
View File

@ -7,10 +7,11 @@
#ifndef _STI_DRV_H_
#define _STI_DRV_H_
#include <drm/drmP.h>
#include <linux/platform_device.h>
struct drm_device;
struct drm_property;
struct sti_compositor;
struct sti_tvout;
/**
* STI drm private structure

3
drivers/gpu/drm/sti/sti_dvo.c
View File

@ -11,9 +11,10 @@
#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_device.h>
#include <drm/drm_panel.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "sti_awg_utils.h"

4
drivers/gpu/drm/sti/sti_gdp.c
View File

@ -5,10 +5,14 @@
* Fabien Dessenne <fabien.dessenne@st.com>
* for STMicroelectronics.
*/
#include <linux/dma-mapping.h>
#include <linux/seq_file.h>
#include <drm/drm_atomic.h>
#include <drm/drm_device.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_cma_helper.h>
#include "sti_compositor.h"

5
drivers/gpu/drm/sti/sti_gdp.h
View File

@ -11,6 +11,11 @@
#include <linux/types.h>
#include <drm/drm_plane.h>
struct drm_device;
struct device;
struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
struct device *dev, int desc,
void __iomem *baseaddr,

6
drivers/gpu/drm/sti/sti_hda.c
View File

@ -6,12 +6,16 @@
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/seq_file.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_device.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
/* HDformatter registers */

5
drivers/gpu/drm/sti/sti_hdmi.c
View File

@ -13,9 +13,12 @@
#include <linux/platform_device.h>
#include <linux/reset.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include <sound/hdmi-codec.h>

4
drivers/gpu/drm/sti/sti_hdmi.h
View File

@ -10,9 +10,11 @@
#include <linux/hdmi.h>
#include <linux/platform_device.h>
#include <drm/drmP.h>
#include <media/cec-notifier.h>
#include <drm/drm_modes.h>
#include <drm/drm_property.h>
#define HDMI_STA 0x0010
#define HDMI_STA_DLL_LCK BIT(5)
#define HDMI_STA_HOT_PLUG BIT(4)

2
drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c
View File

@ -4,6 +4,8 @@
* Author: Vincent Abriou <vincent.abriou@st.com> for STMicroelectronics.
*/
#include <drm/drm_print.h>
#include "sti_hdmi_tx3g4c28phy.h"
#define HDMI_SRZ_CFG 0x504

8
drivers/gpu/drm/sti/sti_hqvdp.c
View File

@ -5,19 +5,25 @@
*/
#include <linux/component.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/firmware.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/reset.h>
#include <linux/seq_file.h>
#include <drm/drm_atomic.h>
#include <drm/drm_device.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_cma_helper.h>
#include "sti_compositor.h"
#include "sti_drv.h"
#include "sti_hqvdp_lut.h"
#include "sti_plane.h"
#include "sti_vtg.h"
#include "sti_drv.h"
/* Firmware name */
#define HQVDP_FMW_NAME "hqvdp-stih407.bin"

4
drivers/gpu/drm/sti/sti_mixer.c
View File

@ -5,8 +5,12 @@
* Fabien Dessenne <fabien.dessenne@st.com>
* for STMicroelectronics.
*/
#include <linux/moduleparam.h>
#include <linux/seq_file.h>
#include <drm/drm_print.h>
#include "sti_compositor.h"
#include "sti_mixer.h"
#include "sti_vtg.h"

7
drivers/gpu/drm/sti/sti_mixer.h
View File

@ -9,10 +9,15 @@
#ifndef _STI_MIXER_H_
#define _STI_MIXER_H_
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_file.h>
#include "sti_plane.h"
struct device;
#define to_sti_mixer(x) container_of(x, struct sti_mixer, drm_crtc)
enum sti_mixer_status {

4
drivers/gpu/drm/sti/sti_plane.c
View File

@ -6,8 +6,10 @@
* for STMicroelectronics.
*/
#include <drm/drmP.h>
#include <linux/types.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_cma_helper.h>
#include "sti_compositor.h"

1
drivers/gpu/drm/sti/sti_plane.h
View File

@ -7,7 +7,6 @@
#ifndef _STI_PLANE_H_
#define _STI_PLANE_H_
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h>

6
drivers/gpu/drm/sti/sti_tvout.c
View File

@ -8,14 +8,18 @@
#include <linux/clk.h>
#include <linux/component.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
#include <linux/seq_file.h>
#include <drm/drmP.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_device.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>
#include "sti_crtc.h"
#include "sti_drv.h"

4
drivers/gpu/drm/sti/sti_vid.c
View File

@ -5,7 +5,9 @@
*/
#include <linux/seq_file.h>
#include <drm/drmP.h>
#include <drm/drm_debugfs.h>
#include <drm/drm_file.h>
#include <drm/drm_print.h>
#include "sti_plane.h"
#include "sti_vid.h"

4
drivers/gpu/drm/sti/sti_vtg.c
View File

@ -8,11 +8,13 @@
*/
#include <linux/module.h>
#include <linux/io.h>
#include <linux/notifier.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <drm/drmP.h>
#include <drm/drm_modes.h>
#include <drm/drm_print.h>
#include "sti_drv.h"
#include "sti_vtg.h"

1
drivers/gpu/drm/sti/sti_vtg.h
View File

@ -16,6 +16,7 @@
#define VTG_SYNC_ID_DVO 4
struct sti_vtg;
struct drm_crtc;
struct drm_display_mode;
struct notifier_block;