drm/etnaviv: drop use of drmP.h
Subsystems (2)
PATCH 1/1 drm/etnaviv: drop use of drmP.h
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.
---
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(-)
drivers/gpu/drm/etnaviv/etnaviv_buffer.c +2 -0
@@ -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"
drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c +2 -0
@@ -3,6 +3,8 @@* Copyright (C) 2017-2018 Etnaviv Project */ +#include <linux/dma-mapping.h> +#include <drm/drm_mm.h> #include "etnaviv_cmdbuf.h"
drivers/gpu/drm/etnaviv/etnaviv_drv.c +8 -0
@@ -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"
drivers/gpu/drm/etnaviv/etnaviv_drv.h +4 -5
@@ -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>
drivers/gpu/drm/etnaviv/etnaviv_gem.c +6 -2
@@ -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"
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +3 -0
@@ -4,6 +4,9 @@*/ #include <linux/dma-buf.h> + +#include <drm/drm_prime.h> +#include "etnaviv_drv.h" #include "etnaviv_gem.h"
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +6 -0
@@ -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"
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -0
@@ -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>
drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +3 -2
@@ -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"
drivers/gpu/drm/etnaviv/etnaviv_mmu.c +2 -0
@@ -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"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Lucas Stach
maintainerHi Sam.
Am Sonntag, den 30.06.2019, 07:21 +0200 schrieb Sam Ravnborg:
Quoted 6 lines
Drop use of the deprecated
drmP.hheader file. Fix fallout in all .c files.The
etnaviv_drv.hheader 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
Quoted 216 lines
Signed-off-by Sam Ravnborg <[email protected]>Cc Lucas Stach <[email protected]>Cc Russell King <[email protected]>Cc Christian Gmeiner <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>---
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(-)drivers/gpu/drm/etnaviv/etnaviv_buffer.c +0
-0@@ -3,6 +3,8 @@* Copyright (C) 2014-2018 Etnaviv Project */ drivers/gpu/drm/etnaviv/etnaviv_buffer.c +2
-0+#include <drm/drm_drv.h> +#include "
etnaviv_cmdbuf.h"
#include "etnaviv_gpu.h"
#include "etnaviv_gem.h"drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c +0
-0@@ -3,6 +3,8 @@* Copyright (C) 2017-2018 Etnaviv Project */ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c +2
-0+#include <linux/dma-mapping.h> +#include <
drm/drm_mm.h>
#include "etnaviv_cmdbuf.h"drivers/gpu/drm/etnaviv/etnaviv_drv.c +0
-0@@ -4,8 +4,16 @@*/
#include <linux/component.h>
+#include <linux/dma-mapping.h>
#include <linux/of_platform.h>drivers/gpu/drm/etnaviv/etnaviv_drv.c +6
-0+#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"drivers/gpu/drm/etnaviv/etnaviv_drv.h +0
-0@@ -6,21 +6,20 @@ #ifndef __ETNAVIV_DRV_H__ #define __ETNAVIV_DRV_H__
-#include <linux/kernel.h>
#include <linux/clk.h>
#include <linux/cpufreq.h>drivers/gpu/drm/etnaviv/etnaviv_drv.h +3
-0+#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>drivers/gpu/drm/etnaviv/etnaviv_drv.h +0
-2-#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>drivers/gpu/drm/etnaviv/etnaviv_gem.c +0
-0@@ -3,10 +3,14 @@* Copyright (C) 2015-2018 Etnaviv Project */ drivers/gpu/drm/etnaviv/etnaviv_gem.c +1
-2-#include <linux/spinlock.h> -#include <linux/shmem_fs.h> +#include <linux/dma-mapping.h> #include <
linux/sched/mm.h>
#include <linux/sched/task.h>drivers/gpu/drm/etnaviv/etnaviv_gem.c +5
-0+#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"drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +0
-0@@ -4,6 +4,9 @@*/
#include <linux/dma-buf.h>drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +3
-0+ +#include <drm/drm_prime.h> +#include "
etnaviv_drv.h"
#include "etnaviv_gem.h"drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +0
-0@@ -15,8 +15,14 @@*/
#include <linux/dma-fence-array.h>
+#include <linux/file.h>
#include <linux/reservation.h>
#include <linux/sync_file.h>drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +5
-0+#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"drivers/gpu/drm/etnaviv/etnaviv_gpu.c +0
-0@@ -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>drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +0
-0@@ -3,11 +3,12 @@* Copyright (C) 2016-2018 Etnaviv Project */ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +2
-0+#include <linux/bitops.h> +#include <linux/dma-mapping.h> #include <
linux/platform_device.h>
#include <linux/sizes.h>
#include <linux/slab.h>drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +1
-2-#include <linux/dma-mapping.h> -#include <linux/bitops.h> +#include <linux/vmalloc.h>
#include "etnaviv_cmdbuf.h"
#include "etnaviv_gpu.h"drivers/gpu/drm/etnaviv/etnaviv_mmu.c +0
-0@@ -3,6 +3,8 @@* Copyright (C) 2015-2018 Etnaviv Project */ drivers/gpu/drm/etnaviv/etnaviv_mmu.c +2
-0+#include <linux/scatterlist.h> +
Quoted 3 lines
#include "
common.xml.h"
#include "etnaviv_cmdbuf.h"
#include "etnaviv_drv.h"
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel