Commit 66620f48 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/meson: drop use of drmP.h 



Drop use of the deprecated drmP.h header.
While doing so used the opportunity
to clean up a little so includes are now
sorted and removed unused include files.
In a few cases added some forwards to allow header
files to built in different include order.

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>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Maxime Jourdan <mjourdan@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-2-sam@ravnborg.org
parent 30fe7b07

drivers/gpu/drm/meson/meson_crtc.c

+7 −9
Original line number Diff line number Diff line
@@ -9,23 +9,21 @@ 
 *     Jasper St. Pierre <jstpierre@mecheye.net>

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/platform_device.h>

#include <linux/bitfield.h>

#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <linux/soc/amlogic/meson-canvas.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_flip_work.h>

#include <drm/drm_device.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "meson_crtc.h"

#include "meson_plane.h"

#include "meson_registers.h"

#include "meson_venc.h"

#include "meson_vpp.h"

#include "meson_viu.h"

#include "meson_registers.h"

#include "meson_vpp.h"



#define MESON_G12A_VIU_OFFSET	0x5ec0

drivers/gpu/drm/meson/meson_drv.c

+11 −16
Original line number Diff line number Diff line
@@ -8,35 +8,30 @@ 
 *     Jasper St. Pierre <jstpierre@mecheye.net>

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/platform_device.h>

#include <linux/component.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <linux/platform_device.h>

#include <linux/soc/amlogic/meson-canvas.h>



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_flip_work.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_modeset_helper_vtables.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_vblank.h>



#include "meson_crtc.h"

#include "meson_drv.h"

#include "meson_plane.h"

#include "meson_overlay.h"

#include "meson_crtc.h"

#include "meson_plane.h"

#include "meson_registers.h"

#include "meson_venc_cvbs.h"



#include "meson_vpp.h"

#include "meson_viu.h"

#include "meson_venc.h"

#include "meson_registers.h"

#include "meson_vpp.h"



#define DRIVER_NAME "meson"

#define DRIVER_DESC "Amlogic Meson DRM driver"

drivers/gpu/drm/meson/meson_drv.h

+7 −4
Original line number Diff line number Diff line
@@ -7,11 +7,14 @@ 
#ifndef __MESON_DRV_H

#define __MESON_DRV_H



#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/device.h>

#include <linux/of.h>

#include <linux/soc/amlogic/meson-canvas.h>

#include <drm/drmP.h>

#include <linux/regmap.h>



struct drm_crtc;

struct drm_device;

struct drm_plane;

struct meson_drm;



struct meson_drm {

	struct device *dev;

drivers/gpu/drm/meson/meson_dw_hdmi.c

+10 −9
Original line number Diff line number Diff line
@@ -5,29 +5,30 @@ 
 * Copyright (C) 2015 Amlogic, Inc. All rights reserved.

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/component.h>

#include <linux/of_device.h>

#include <linux/of_graph.h>

#include <linux/reset.h>

#include <linux/clk.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>



#include <drm/drmP.h>

#include <drm/bridge/dw_hdmi.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_device.h>

#include <drm/drm_edid.h>

#include <drm/drm_probe_helper.h>

#include <drm/bridge/dw_hdmi.h>

#include <drm/drm_print.h>



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

#include <uapi/linux/videodev2.h>

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

#include <linux/videodev2.h>



#include "meson_drv.h"

#include "meson_venc.h"

#include "meson_vclk.h"

#include "meson_dw_hdmi.h"

#include "meson_registers.h"

#include "meson_vclk.h"

#include "meson_venc.h"



#define DRIVER_NAME "meson-dw-hdmi"

#define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver"

drivers/gpu/drm/meson/meson_overlay.c

+5 −8
Original line number Diff line number Diff line
@@ -5,24 +5,21 @@ 
 * Copyright (C) 2015 Amlogic, Inc. All rights reserved.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/bitfield.h>

#include <linux/platform_device.h>

#include <drm/drmP.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_device.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_rect.h>



#include "meson_overlay.h"

#include "meson_vpp.h"

#include "meson_viu.h"

#include "meson_registers.h"

#include "meson_viu.h"

#include "meson_vpp.h"



/* VD1_IF0_GEN_REG */

#define VD_URGENT_CHROMA		BIT(28)

CRA Git | Maintained and supported by SUSTech CRA and CCSE