Commit 09a56fbe authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/pl111: drop use of drmP.h 



Drop use of the deprecated drmP.h header.
Sort includes in blocks while touching the files.

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>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-4-sam@ravnborg.org
parent 220989e7

drivers/gpu/drm/pl111/pl111_debugfs.c

+3 −1
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 


#include <linux/amba/clcd-regs.h>

#include <linux/seq_file.h>



#include <drm/drm_debugfs.h>

#include <drm/drmP.h>

#include <drm/drm_file.h>



#include "pl111_drm.h"



#define REGDEF(reg) { reg, #reg }

drivers/gpu/drm/pl111/pl111_display.c

+4 −2
Original line number Diff line number Diff line
@@ -11,14 +11,16 @@ 


#include <linux/amba/clcd-regs.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/version.h>

#include <linux/dma-buf.h>

#include <linux/of_graph.h>



#include <drm/drmP.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_vblank.h>



#include "pl111_drm.h"

drivers/gpu/drm/pl111/pl111_drm.h

+6 −5
Original line number Diff line number Diff line
@@ -13,14 +13,15 @@ 
#ifndef _PL111_DRM_H_

#define _PL111_DRM_H_



#include <drm/drm_gem.h>

#include <drm/drm_simple_kms_helper.h>

#include <linux/clk-provider.h>

#include <linux/interrupt.h>



#include <drm/drm_bridge.h>

#include <drm/drm_connector.h>

#include <drm/drm_encoder.h>

#include <drm/drm_gem.h>

#include <drm/drm_panel.h>

#include <drm/drm_bridge.h>

#include <linux/clk-provider.h>

#include <linux/interrupt.h>

#include <drm/drm_simple_kms_helper.h>



#define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)

drivers/gpu/drm/pl111/pl111_drv.c

+5 −4
Original line number Diff line number Diff line
@@ -48,18 +48,18 @@ 


#include <linux/amba/bus.h>

#include <linux/amba/clcd-regs.h>

#include <linux/version.h>

#include <linux/shmem_fs.h>

#include <linux/dma-buf.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_graph.h>

#include <linux/of_reserved_mem.h>

#include <linux/shmem_fs.h>

#include <linux/slab.h>

#include <linux/version.h>



#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_bridge.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>
@@ -67,6 +67,7 @@ 
#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "pl111_drm.h"

#include "pl111_versatile.h"

drivers/gpu/drm/pl111/pl111_nomadik.h

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

#include <linux/device.h>



#ifndef PL111_NOMADIK_H

#define PL111_NOMADIK_H

#endif



struct device;



#ifdef CONFIG_ARCH_NOMADIK



void pl111_nomadik_init(struct device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE