Commit 9c25a297 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/sun4i: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.

While touching the list of include file, use the typical order of the
blocks:
\#include <linux/*>

\#include <video/*>

\#include <drm/*>

\#include ""

Within each block, sort the files.
Include necessary files to fix build after the drmP.h removal.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-6-sam@ravnborg.org
parent 647d295b

drivers/gpu/drm/sun4i/sun4i_backend.c

+9 −7
Original line number Diff line number Diff line
@@ -6,21 +6,23 @@ 
 * Maxime Ripard <maxime.ripard@free-electrons.com>

 */



#include <drm/drmP.h>

#include <linux/component.h>

#include <linux/list.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of_graph.h>

#include <linux/platform_device.h>

#include <linux/reset.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>



#include <linux/component.h>

#include <linux/list.h>

#include <linux/of_device.h>

#include <linux/of_graph.h>

#include <linux/reset.h>



#include "sun4i_backend.h"

#include "sun4i_drv.h"

#include "sun4i_frontend.h"

drivers/gpu/drm/sun4i/sun4i_crtc.c

+7 −6
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ 
 * Maxime Ripard <maxime.ripard@free-electrons.com>

 */



#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_modes.h>

#include <drm/drm_probe_helper.h>



#include <linux/clk-provider.h>

#include <linux/ioport.h>

#include <linux/of_address.h>
@@ -21,6 +15,13 @@ 


#include <video/videomode.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_modes.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "sun4i_backend.h"

#include "sun4i_crtc.h"

#include "sun4i_drv.h"

drivers/gpu/drm/sun4i/sun4i_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -8,16 +8,19 @@ 


#include <linux/component.h>

#include <linux/kfifo.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <linux/of_reserved_mem.h>

#include <linux/platform_device.h>



#include <drm/drmP.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_gem_cma_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "sun4i_drv.h"

#include "sun4i_frontend.h"

drivers/gpu/drm/sun4i/sun4i_framebuffer.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drmP.h>



#include "sun4i_drv.h"

#include "sun4i_framebuffer.h"

drivers/gpu/drm/sun4i/sun4i_frontend.c

+7 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
 * Copyright (C) 2017 Free Electrons

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 */

#include <drm/drmP.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>



#include <linux/clk.h>

#include <linux/component.h>
@@ -16,6 +13,13 @@ 
#include <linux/regmap.h>

#include <linux/reset.h>



#include <drm/drm_device.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_framebuffer.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_plane.h>



#include "sun4i_drv.h"

#include "sun4i_frontend.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE