Hi Sam.
Am Sonntag, den 30.06.2019, 07:21 +0200 schrieb Sam Ravnborg:
Drop use of the deprecated drmP.h header file. Fix fallout in all .c files.
The etnaviv_drv.h header file was made self-contained, and missing includes was then added to the .c files that needed them. In a few cases the list of include files was sorted.
Thanks for doing this! I didn't like some of the blank lines and took the liberty to remove them while I applied this patch.
Regards, Lucas
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Lucas Stach l.stach@pengutronix.de Cc: Russell King linux+etnaviv@armlinux.org.uk Cc: Christian Gmeiner christian.gmeiner@gmail.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: etnaviv@lists.freedesktop.org
The patch is build tested using several configs and several architectures (including arm, arm64, x86).
The patch is based on drm-misc.
If patch is OK, please apply to your tree as this driver is maintained outside drm-misc.
I am happy to rebase on another tree, just let me know.
Sam
drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 ++ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 2 ++ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++++++ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 9 ++++----- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 ++++++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +++ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 ++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 ++ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 5 +++-- drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 ++ 10 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c index 160ce3c060a5..fe0d2d67007d 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -3,6 +3,8 @@ * Copyright (C) 2014-2018 Etnaviv Project */ +#include <drm/drm_drv.h>
#include "etnaviv_cmdbuf.h" #include "etnaviv_gpu.h" #include "etnaviv_gem.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c index a3c44f145c1d..bdc35c0d4e79 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c @@ -3,6 +3,8 @@ * Copyright (C) 2017-2018 Etnaviv Project */ +#include <linux/dma-mapping.h>
#include <drm/drm_mm.h> #include "etnaviv_cmdbuf.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 08e033c1758d..13e3398fae59 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -4,8 +4,16 @@ */ #include <linux/component.h> +#include <linux/dma-mapping.h> #include <linux/of_platform.h> +#include <linux/uaccess.h>
+#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> #include <drm/drm_of.h> +#include <drm/drm_prime.h> #include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index 8798423705e1..f887a431a11f 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -6,21 +6,20 @@ #ifndef __ETNAVIV_DRV_H__ #define __ETNAVIV_DRV_H__ -#include <linux/kernel.h> #include <linux/clk.h> #include <linux/cpufreq.h> +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/mm_types.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/sizes.h> #include <linux/slab.h> -#include <linux/list.h> #include <linux/time64.h> #include <linux/types.h> -#include <linux/sizes.h> -#include <linux/mm_types.h> -#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/etnaviv_drm.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 17ca602db60a..f1a4aab6f3eb 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -3,10 +3,14 @@ * Copyright (C) 2015-2018 Etnaviv Project */ -#include <linux/spinlock.h> -#include <linux/shmem_fs.h> +#include <linux/dma-mapping.h> #include <linux/sched/mm.h> #include <linux/sched/task.h> +#include <linux/shmem_fs.h> +#include <linux/spinlock.h> +#include <linux/vmalloc.h>
+#include <drm/drm_prime.h> #include "etnaviv_drv.h" #include "etnaviv_gem.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index a05292e8ed6f..e138f0d415c5 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -4,6 +4,9 @@ */ #include <linux/dma-buf.h>
+#include <drm/drm_prime.h>
#include "etnaviv_drv.h" #include "etnaviv_gem.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index e054f09ac828..ee351a2c9a7c 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -15,8 +15,14 @@ */ #include <linux/dma-fence-array.h> +#include <linux/file.h> #include <linux/reservation.h> #include <linux/sync_file.h> +#include <linux/uaccess.h> +#include <linux/vmalloc.h>
+#include <drm/drm_file.h>
#include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h" #include "etnaviv_gpu.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 72d01e873160..b9d5fd0530fa 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -5,7 +5,9 @@ #include <linux/clk.h> #include <linux/component.h> +#include <linux/delay.h> #include <linux/dma-fence.h> +#include <linux/dma-mapping.h> #include <linux/moduleparam.h> #include <linux/of_device.h> #include <linux/regulator/consumer.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c index f794e04be9e6..d7cc184da571 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c @@ -3,11 +3,12 @@ * Copyright (C) 2016-2018 Etnaviv Project */ +#include <linux/bitops.h> +#include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/sizes.h> #include <linux/slab.h> -#include <linux/dma-mapping.h> -#include <linux/bitops.h> +#include <linux/vmalloc.h> #include "etnaviv_cmdbuf.h" #include "etnaviv_gpu.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c index 8069f9f36a2e..731275999a57 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c @@ -3,6 +3,8 @@ * Copyright (C) 2015-2018 Etnaviv Project */ +#include <linux/scatterlist.h>
#include "common.xml.h" #include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h"