Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c7b178a authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Patrik Jakobsson
Browse files

drm/gma500: drop drmp.h include from all .c files 



Drop remaining uses of the deprecated drmP.h in gma500

Replaced drmp.h with forward declarations or include files
as relevant.

Moved all include files to blocks in following order:
\#include <linux/*>

\#include <asm/*>

\#include <drm/*>

\#include ""

And within each block sort the include files alphabetically.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190519195526.3422-6-sam@ravnborg.org
parent bc9f1007

drivers/gpu/drm/gma500/accel_2d.c

+9 −9
Original line number Diff line number Diff line
@@ -20,24 +20,24 @@ 
 *

 **************************************************************************/



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/console.h>

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/tty.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/console.h>

#include <linux/string.h>

#include <linux/tty.h>



#include <drm/drmP.h>

#include <drm/drm.h>

#include <drm/drm_crtc.h>

#include <drm/drm_fourcc.h>



#include "framebuffer.h"

#include "psb_drv.h"

#include "psb_reg.h"

#include "framebuffer.h"



/**

 *	psb_spank		-	reset the 2D engine

drivers/gpu/drm/gma500/cdv_device.c

+6 −5
Original line number Diff line number Diff line
@@ -18,15 +18,16 @@ 
 **************************************************************************/



#include <linux/backlight.h>

#include <drm/drmP.h>

#include <linux/delay.h>



#include <drm/drm.h>



#include "psb_drv.h"

#include "psb_reg.h"

#include "psb_intel_reg.h"

#include "intel_bios.h"

#include "cdv_device.h"

#include "gma_device.h"

#include "intel_bios.h"

#include "psb_drv.h"

#include "psb_intel_reg.h"

#include "psb_reg.h"



#define VGA_SR_INDEX		0x3c4

#define VGA_SR_DATA		0x3c5

drivers/gpu/drm/gma500/cdv_intel_crt.c

+4 −4
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ 
 *	Eric Anholt <eric@anholt.net>

 */



#include <linux/delay.h>

#include <linux/i2c.h>

#include <drm/drmP.h>

#include <linux/pm_runtime.h>



#include "cdv_device.h"

#include "intel_bios.h"

#include "power.h"

#include "psb_drv.h"

#include "psb_intel_drv.h"

#include "psb_intel_reg.h"

#include "power.h"

#include "cdv_device.h"

#include <linux/pm_runtime.h>





static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)

drivers/gpu/drm/gma500/cdv_intel_display.c

+6 −4
Original line number Diff line number Diff line
@@ -18,16 +18,18 @@ 
 *	Eric Anholt <eric@anholt.net>

 */



#include <linux/delay.h>

#include <linux/i2c.h>



#include <drm/drmP.h>

#include <drm/drm_crtc.h>



#include "cdv_device.h"

#include "framebuffer.h"

#include "gma_display.h"

#include "power.h"

#include "psb_drv.h"

#include "psb_intel_drv.h"

#include "psb_intel_reg.h"

#include "gma_display.h"

#include "power.h"

#include "cdv_device.h"



static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit,

				  struct drm_crtc *crtc, int target,

drivers/gpu/drm/gma500/cdv_intel_dp.c

+5 −4
Original line number Diff line number Diff line
@@ -26,16 +26,17 @@ 
 */



#include <linux/i2c.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <drm/drmP.h>

#include <linux/slab.h>



#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_dp_helper.h>



#include "gma_display.h"

#include "psb_drv.h"

#include "psb_intel_drv.h"

#include "psb_intel_reg.h"

#include "gma_display.h"

#include <drm/drm_dp_helper.h>



/**

 * struct i2c_algo_dp_aux_data - driver interface structure for i2c over dp