Commit 25e28ef2 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/armada: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.
While touching the list of include files group them and sort them.
Fix fallout from the header file removal.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190804094132.29463-4-sam@ravnborg.org
parent eb1df694

drivers/gpu/drm/armada/armada_crtc.c

+7 −3
Original line number Diff line number Diff line
@@ -3,15 +3,19 @@ 
 * Copyright (C) 2012 Russell King

 *  Rewritten from the dovefb driver, and Armada510 manuals.

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <drm/drmP.h>



#include <drm/drm_atomic.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "armada_crtc.h"

#include "armada_drm.h"

#include "armada_fb.h"

drivers/gpu/drm/armada/armada_debugfs.c

+6 −2
Original line number Diff line number Diff line
@@ -3,11 +3,15 @@ 
 * Copyright (C) 2012 Russell King

 *  Rewritten from the dovefb driver, and Armada510 manuals.

 */



#include <linux/ctype.h>

#include <linux/debugfs.h>

#include <linux/module.h>

#include <linux/seq_file.h>

#include <drm/drmP.h>

#include <linux/uaccess.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_file.h>



#include "armada_crtc.h"

#include "armada_drm.h"

drivers/gpu/drm/armada/armada_drm.h

+4 −1
Original line number Diff line number Diff line
@@ -8,11 +8,14 @@ 
#include <linux/kfifo.h>

#include <linux/io.h>

#include <linux/workqueue.h>

#include <drm/drmP.h>



#include <drm/drm_device.h>

#include <drm/drm_mm.h>



struct armada_crtc;

struct armada_gem_object;

struct clk;

struct drm_display_mode;

struct drm_fb_helper;



static inline void

drivers/gpu/drm/armada/armada_drv.c

+8 −0
Original line number Diff line number Diff line
@@ -2,14 +2,22 @@ 
/*

 * Copyright (C) 2012 Russell King

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <linux/platform_device.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_prime.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_vblank.h>



#include "armada_crtc.h"

#include "armada_drm.h"

#include "armada_gem.h"

drivers/gpu/drm/armada/armada_fb.c

+3 −0
Original line number Diff line number Diff line
@@ -2,9 +2,12 @@ 
/*

 * Copyright (C) 2012 Russell King

 */



#include <drm/drm_modeset_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_framebuffer_helper.h>



#include "armada_drm.h"

#include "armada_fb.h"

#include "armada_gem.h"