Commit eb1df694 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/tegra: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.

For all touched files divide include files into blocks,
and sort them within the blocks.
Fix fallout.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190804094132.29463-3-sam@ravnborg.org
parent 5c8a5f1d

drivers/gpu/drm/tegra/dc.c

+9 −4
Original line number Diff line number Diff line
@@ -6,23 +6,28 @@ 


#include <linux/clk.h>

#include <linux/debugfs.h>

#include <linux/delay.h>

#include <linux/iommu.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>



#include <soc/tegra/pmc.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_vblank.h>



#include "dc.h"

#include "drm.h"

#include "gem.h"

#include "hub.h"

#include "plane.h"



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>



static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc,

					    struct drm_crtc_state *state);

drivers/gpu/drm/tegra/dpaux.c

+3 −2
Original line number Diff line number Diff line
@@ -8,14 +8,15 @@ 
#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_gpio.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/pm_runtime.h>

#include <linux/platform_device.h>

#include <linux/reset.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>

#include <linux/workqueue.h>



#include <drm/drm_dp_helper.h>

drivers/gpu/drm/tegra/drm.c

+8 −0
Original line number Diff line number Diff line
@@ -8,9 +8,17 @@ 
#include <linux/host1x.h>

#include <linux/idr.h>

#include <linux/iommu.h>

#include <linux/module.h>

#include <linux/platform_device.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_drv.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_prime.h>

#include <drm/drm_vblank.h>



#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)

#include <asm/dma-iommu.h>

drivers/gpu/drm/tegra/drm.h

+1 −2
Original line number Diff line number Diff line
@@ -7,18 +7,17 @@ 
#ifndef HOST1X_DRM_H

#define HOST1X_DRM_H 1



#include <uapi/drm/tegra_drm.h>

#include <linux/host1x.h>

#include <linux/iova.h>

#include <linux/of_gpio.h>



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_edid.h>

#include <drm/drm_encoder.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fixed.h>

#include <drm/drm_probe_helper.h>

#include <uapi/drm/tegra_drm.h>



#include "gem.h"

#include "hub.h"

drivers/gpu/drm/tegra/dsi.c

+5 −3
Original line number Diff line number Diff line
@@ -5,22 +5,24 @@ 


#include <linux/clk.h>

#include <linux/debugfs.h>

#include <linux/delay.h>

#include <linux/host1x.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>



#include <linux/regulator/consumer.h>

#include <video/mipi_display.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_file.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_panel.h>



#include <video/mipi_display.h>



#include "dc.h"

#include "drm.h"

#include "dsi.h"