Commit fd6d6d80 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/vc4: drop use of drmP.h 



Drop use of the deprecated header drmP.h.
Fix so vc4_drv.h is now self-contained, and fixed fall-out in remaining
files.

Divided include files in blocks.
Sorted include files within their blocks.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-7-sam@ravnborg.org
parent 9c25a297

drivers/gpu/drm/vc4/vc4_crtc.c

+7 −4
Original line number Diff line number Diff line
@@ -32,15 +32,18 @@ 
 * ones that set the clock.

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/of_device.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <linux/clk.h>

#include <drm/drm_fb_cma_helper.h>

#include <linux/component.h>

#include <linux/of_device.h>

#include <drm/drm_vblank.h>



#include "vc4_drv.h"

#include "vc4_regs.h"

drivers/gpu/drm/vc4/vc4_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/circ_buf.h>

#include <linux/ctype.h>

#include <linux/debugfs.h>

#include <drm/drmP.h>



#include "vc4_drv.h"

#include "vc4_regs.h"

drivers/gpu/drm/vc4/vc4_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -26,16 +26,21 @@ 
#include <linux/clk.h>

#include <linux/component.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_vblank.h>



#include "uapi/drm/vc4_drm.h"



#include "vc4_drv.h"

#include "vc4_regs.h"

drivers/gpu/drm/vc4/vc4_drv.h

+12 −5
Original line number Diff line number Diff line
@@ -6,16 +6,23 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/mm_types.h>

#include <drm/drmP.h>

#include <drm/drm_util.h>

#include <linux/delay.h>

#include <linux/refcount.h>

#include <linux/uaccess.h>



#include <drm/drm_atomic.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_device.h>

#include <drm/drm_encoder.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_syncobj.h>

#include <drm/drm_mm.h>

#include <drm/drm_modeset_lock.h>



#include "uapi/drm/vc4_drm.h"



struct drm_device;

struct drm_gem_object;



/* Don't forget to update vc4_bo.c: bo_type_names[] when adding to

 * this.

 */

drivers/gpu/drm/vc4/vc4_dsi.c

+10 −7
Original line number Diff line number Diff line
@@ -29,22 +29,25 @@ 
 * hopefully present.

 */



#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.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/clk-provider.h>

#include <linux/clk.h>

#include <linux/completion.h>

#include <linux/component.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/pm_runtime.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>



#include "vc4_drv.h"

#include "vc4_regs.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE