Skip to contentSkip to conversation

drm/exynos: drop use of drmP.h (2nd round)

PATCH Superseded Sam Ravnborg 2 participants 4 messages Aug 3, 2019 – Aug 13, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/exynos: drop use of drmP.h (2nd round)

There was a few uses of drmP that was missed in the last patch removing this header from exynos.

Remove the final uses of this header.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c     | 8 ++++++++
 drivers/gpu/drm/exynos/exynos_drm_fimc.c    | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_gsc.c     | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_ipp.c     | 5 ++++-
 drivers/gpu/drm/exynos/exynos_drm_ipp.h     | 2 --
 drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_scaler.c  | 1 +
 7 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +8 -0
index cc53dcad25e4..8a03a33c32cb 100644
@@ -8,12 +8,20 @@
  */
 
 #include <linux/component.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/uaccess.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_file.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_fimc.c +2 -0
index a594ab7be2c0..5cf0ed0d714c 100644
@@ -17,6 +17,8 @@
 #include <linux/regmap.h>
 #include <linux/spinlock.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_gsc.c +2 -0
index 1e4b21c49a06..a0fc9a2a58f6 100644
@@ -16,6 +16,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_ipp.c +4 -1
index d45bfab6fe40..4f2b7551b251 100644
@@ -16,7 +16,10 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_file.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_mode.h>
 #include <drm/exynos_drm.h>
 
drivers/gpu/drm/exynos/exynos_drm_ipp.h +0 -2
index 9cbbc301bec9..67a0805ee009 100644
@@ -6,8 +6,6 @@
 #ifndef _EXYNOS_DRM_IPP_H_
 #define _EXYNOS_DRM_IPP_H_
 
-#include <drm/drmP.h>
-
 struct exynos_drm_ipp;
 struct exynos_drm_ipp_task;
 
drivers/gpu/drm/exynos/exynos_drm_rotator.c +2 -0
index 8ebad2740ad5..b98482990d1a 100644
@@ -15,7 +15,9 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/sizes.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_scaler.c +1 -0
index 9af096479e1c..f082f259ca6d 100644
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Hi Inki.

Any plans to take this to the exynos tree?

Sam

Quoted 138 lines · Sam Ravnborg

There was a few uses of drmP that was missed in the last patch removing this header from exynos.

Remove the final uses of this header.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c     | 8 ++++++++
 drivers/gpu/drm/exynos/exynos_drm_fimc.c    | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_gsc.c     | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_ipp.c     | 5 ++++-
 drivers/gpu/drm/exynos/exynos_drm_ipp.h     | 2 --
 drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_scaler.c  | 1 +
 7 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +8 -0
index cc53dcad25e4..8a03a33c32cb 100644
@@ -8,12 +8,20 @@
  */
 
 #include <linux/component.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/uaccess.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_file.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_fimc.c +2 -0
index a594ab7be2c0..5cf0ed0d714c 100644
@@ -17,6 +17,8 @@
 #include <linux/regmap.h>
 #include <linux/spinlock.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_gsc.c +2 -0
index 1e4b21c49a06..a0fc9a2a58f6 100644
@@ -16,6 +16,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_ipp.c +4 -1
index d45bfab6fe40..4f2b7551b251 100644
@@ -16,7 +16,10 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_file.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_mode.h>
 #include <drm/exynos_drm.h>
 
drivers/gpu/drm/exynos/exynos_drm_ipp.h +0 -2
index 9cbbc301bec9..67a0805ee009 100644
@@ -6,8 +6,6 @@
 #ifndef _EXYNOS_DRM_IPP_H_
 #define _EXYNOS_DRM_IPP_H_
 
-#include <drm/drmP.h>
-
 struct exynos_drm_ipp;
 struct exynos_drm_ipp_task;
 
drivers/gpu/drm/exynos/exynos_drm_rotator.c +2 -0
index 8ebad2740ad5..b98482990d1a 100644
@@ -15,7 +15,9 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/sizes.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_scaler.c +1 -0
index 9af096479e1c..f082f259ca6d 100644
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#2 lore raw

Hi,

Quoted 4 lines · Sam Ravnborg

Hi Inki.

Any plans to take this to the exynos tree?

It will be merged to next.

Thanks,
Inki Dae

Quoted 133 lines

Sam

Quoted 130 lines · Sam Ravnborg

There was a few uses of drmP that was missed in the last patch removing this header from exynos.

Remove the final uses of this header.

Cc Inki Dae <[email protected]>
Cc Joonyoung Shim <[email protected]>
Cc Seung-Woo Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Jingoo Han <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c     | 8 ++++++++
 drivers/gpu/drm/exynos/exynos_drm_fimc.c    | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_gsc.c     | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_ipp.c     | 5 ++++-
 drivers/gpu/drm/exynos/exynos_drm_ipp.h     | 2 --
 drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++
 drivers/gpu/drm/exynos/exynos_drm_scaler.c  | 1 +
 7 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +8 -0
index cc53dcad25e4..8a03a33c32cb 100644
@@ -8,12 +8,20 @@
  */
 
 #include <linux/component.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/uaccess.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_file.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_ioctl.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_fimc.c +2 -0
index a594ab7be2c0..5cf0ed0d714c 100644
@@ -17,6 +17,8 @@
 #include <linux/regmap.h>
 #include <linux/spinlock.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_gsc.c +2 -0
index 1e4b21c49a06..a0fc9a2a58f6 100644
@@ -16,6 +16,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_ipp.c +4 -1
index d45bfab6fe40..4f2b7551b251 100644
@@ -16,7 +16,10 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_file.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_mode.h>
 #include <drm/exynos_drm.h>
 
drivers/gpu/drm/exynos/exynos_drm_ipp.h +0 -2
index 9cbbc301bec9..67a0805ee009 100644
@@ -6,8 +6,6 @@
 #ifndef _EXYNOS_DRM_IPP_H_
 #define _EXYNOS_DRM_IPP_H_
 
-#include <drm/drmP.h>
-
 struct exynos_drm_ipp;
 struct exynos_drm_ipp_task;
 
drivers/gpu/drm/exynos/exynos_drm_rotator.c +2 -0
index 8ebad2740ad5..b98482990d1a 100644
@@ -15,7 +15,9 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/sizes.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
 #include "exynos_drm_drv.h"
drivers/gpu/drm/exynos/exynos_drm_scaler.c +1 -0
index 9af096479e1c..f082f259ca6d 100644
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
+#include <drm/drm_fourcc.h>
 #include <drm/exynos_drm.h>
 
Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/exynos/exynos_drm_scaler.c +0 -0
 #include "exynos_drm_drv.h"
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel