Commit 535d1b94 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/arm: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.

While touching the list of include files divide them
into blocks and sort within each block.
Fix fallout.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: malidp@foss.arm.com
Link: https://patchwork.freedesktop.org/patch/msgid/20190804094132.29463-5-sam@ravnborg.org
parent 25e28ef2

drivers/gpu/drm/arm/hdlcd_crtc.c

+7 −5
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ 
 *  Implementation of a CRTC class for the HDLCD driver.

 */



#include <drm/drmP.h>

#include <linux/clk.h>

#include <linux/of_graph.h>

#include <linux/platform_data/simplefb.h>



#include <video/videomode.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>
@@ -19,10 +24,7 @@ 
#include <drm/drm_of.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>

#include <linux/clk.h>

#include <linux/of_graph.h>

#include <linux/platform_data/simplefb.h>

#include <video/videomode.h>

#include <drm/drm_vblank.h>



#include "hdlcd_drv.h"

#include "hdlcd_regs.h"

drivers/gpu/drm/arm/hdlcd_drv.c

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

#include <linux/component.h>

#include <linux/console.h>

#include <linux/dma-mapping.h>

#include <linux/list.h>

#include <linux/of_graph.h>

#include <linux/of_reserved_mem.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>



#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.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_irq.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "hdlcd_drv.h"

#include "hdlcd_regs.h"

drivers/gpu/drm/arm/malidp_crtc.c

+7 −4
Original line number Diff line number Diff line
@@ -6,14 +6,17 @@ 
 * ARM Mali DP500/DP550/DP650 driver (crtc operations)

 */



#include <drm/drmP.h>

#include <linux/clk.h>

#include <linux/pm_runtime.h>



#include <video/videomode.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <linux/clk.h>

#include <linux/pm_runtime.h>

#include <video/videomode.h>

#include <drm/drm_vblank.h>



#include "malidp_drv.h"

#include "malidp_hw.h"

drivers/gpu/drm/arm/malidp_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -15,17 +15,19 @@ 
#include <linux/pm_runtime.h>

#include <linux/debugfs.h>



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "malidp_drv.h"

#include "malidp_mw.h"

drivers/gpu/drm/arm/malidp_drv.h

+4 −3
Original line number Diff line number Diff line
@@ -9,12 +9,13 @@ 
#ifndef __MALIDP_DRV_H__

#define __MALIDP_DRV_H__



#include <drm/drm_writeback.h>

#include <drm/drm_encoder.h>

#include <linux/mutex.h>

#include <linux/wait.h>

#include <linux/spinlock.h>

#include <drm/drmP.h>



#include <drm/drm_writeback.h>

#include <drm/drm_encoder.h>



#include "malidp_hw.h"



#define MALIDP_CONFIG_VALID_INIT	0