Commit 71866a56 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/atmel_hlcdc: drop use of drmP.h 



Drop use of the deprecated header drmP.h.
Make header file self-contained, with only the required set
of include files.
And fixed fallout in remaining files.
Divide include files in blocks and sort them within each block.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-15-sam@ravnborg.org
parent a803bf0a

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+8 −4
Original line number Diff line number Diff line
@@ -19,15 +19,19 @@ 
 */



#include <linux/clk.h>

#include <linux/mfd/atmel-hlcdc.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/pinctrl/consumer.h>



#include <video/videomode.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_modeset_helper_vtables.h>

#include <drm/drm_probe_helper.h>

#include <drm/drmP.h>



#include <video/videomode.h>

#include <drm/drm_vblank.h>



#include "atmel_hlcdc_dc.h"

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+12 −0
Original line number Diff line number Diff line
@@ -22,8 +22,20 @@ 
#include <linux/clk.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/mfd/atmel-hlcdc.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/platform_device.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.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_probe_helper.h>

#include <drm/drm_vblank.h>



#include "atmel_hlcdc_dc.h"

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h

+3 −17
Original line number Diff line number Diff line
@@ -22,23 +22,9 @@ 
#ifndef DRM_ATMEL_HLCDC_H

#define DRM_ATMEL_HLCDC_H



#include <linux/clk.h>

#include <linux/dmapool.h>

#include <linux/irqdomain.h>

#include <linux/mfd/atmel-hlcdc.h>

#include <linux/pwm.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_fb_cma_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_panel.h>

#include <drm/drm_plane_helper.h>

#include <drm/drmP.h>

#include <linux/regmap.h>



#include <drm/drm_plane.h>



#define ATMEL_HLCDC_LAYER_CHER			0x0

#define ATMEL_HLCDC_LAYER_CHDR			0x4

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c

+2 −1
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/media-bus-format.h>

#include <linux/of_graph.h>



#include <drm/drmP.h>

#include <drm/drm_encoder.h>

#include <drm/drm_of.h>

#include <drm/drm_bridge.h>

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,16 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/dmapool.h>

#include <linux/mfd/atmel-hlcdc.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.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 "atmel_hlcdc_dc.h"



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE