Skip to contentSkip to conversation

MSM: Remove iommu include from drivers/gpu/drm/msm/mdp4/mdp4_kms.c

PATCH In review Joerg Roedel 2 participants 5 messages Sep 25, 2013 – Sep 27, 2013

Subsystems (5)
lore
Share & tools
lore

Joerg Roedel

author maintainer
#0 lore raw

PATCH 1/3 MSM: Remove iommu include from drivers/gpu/drm/msm/mdp4/mdp4_kms.c

The include file has been removed and the file does not need it anyway, so remove it. Fixes a compile error.

---
 drivers/gpu/drm/msm/mdp4/mdp4_kms.c |    2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/mdp4/mdp4_kms.c +0 -2
index 5db5bba..bc7fd11 100644
@@ -19,8 +19,6 @@
 #include "msm_drv.h"
 #include "mdp4_kms.h"
 
-#include <mach/iommu.h>
-
 static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev);
 
 static int mdp4_hw_init(struct msm_kms *kms)
Signature · 1 line
1.7.9.5
author maintainer
#1 lore raw

PATCH 2/3 Fix compile error in drivers/gpu/drm/msm/msm_drv.c

The include file has been moved but this file was not updated, so compile breaks.

---
 drivers/gpu/drm/msm/Makefile  |    3 ---
 drivers/gpu/drm/msm/msm_drv.c |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/Makefile +0 -3
index e179148..fc7ed9e 100644
@@ -1,7 +1,4 @@
 ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
-ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
-	ccflags-y += -Werror
-endif
 
 msm-y := \
 	adreno/adreno_gpu.o \
drivers/gpu/drm/msm/msm_drv.c +4 -1
index 008d772..08acebb 100644
@@ -18,7 +18,10 @@
 #include "msm_drv.h"
 #include "msm_gpu.h"
 
-#include <mach/iommu.h>
+#ifndef I_AM_NOT_TOO_LAZY_TO_FIX_DRIVERS_WHEN_I_MOVE_INCLUDE_FILES
+#warning "Help! I use non-public subsystem headers. Please fix me!"
+#include <../../../iommu/msm_iommu.h>
+#endif
 
 static void msm_fb_output_poll_changed(struct drm_device *dev)
 {
Signature · 1 line
1.7.9.5
author maintainer
#2 lore raw

PATCH 3/3 Fix compile error in drivers/gpu/drm/msm/msm_drv.c with IOMMU disabled

In reply to Joerg Roedel

The function msm_iommu_get_ctx() is needed buy the MSM-GPU driver with and wiithout IOMMU compiled in. Make the function available when no IOMMU driver is there.

---
 drivers/iommu/msm_iommu.h |    7 +++++++
 1 file changed, 7 insertions(+)
drivers/iommu/msm_iommu.h +7 -0
index 5c7c955..da53558 100644
@@ -108,7 +108,14 @@ struct msm_iommu_ctx_drvdata {
  * Useful for testing and drivers that do not yet fully have IOMMU stuff in
  * their platform devices.
  */
+#ifdef CONFIG_MSM_IOMMU
 struct device *msm_iommu_get_ctx(const char *ctx_name);
+#else
+static inline struct device *msm_iommu_get_ctx(const char *ctx_name)
+{
+	return NULL;
+}
+#endif
 
 /*
  * Interrupt handler for the IOMMU context fault interrupt. Hooking the
Signature · 1 line
1.7.9.5
Reviewed-by on v1 3/3
#3 lore raw

Re: [PATCH 3/3] Fix compile error in drivers/gpu/drm/msm/msm_drv.c with IOMMU disabled

Quoted 4 lines · Joerg Roedel

The function msm_iommu_get_ctx() is needed buy the MSM-GPU driver with and wiithout IOMMU compiled in. Make the function available when no IOMMU driver is there.

For this one,

But I am not the right one to merge this one. And, well, if there is a way to make this work without msm_iommu_get_ctx(), I am interested in some hints ;-)

Of the other two, 1/3 looks fine and I'll pull that in. And I'll see if I can come up with a better way for 2/3

BR,
-R

Quoted 28 lines
---
 drivers/iommu/msm_iommu.h |    7 +++++++
 1 file changed, 7 insertions(+)
drivers/iommu/msm_iommu.h +7 -1
index 5c7c955..da53558 100644
@@ -108,7 +108,14 @@ struct msm_iommu_ctx_drvdata {
  * Useful for testing and drivers that do not yet fully have IOMMU stuff in
  * their platform devices.
  */
+#ifdef CONFIG_MSM_IOMMU
 struct device *msm_iommu_get_ctx(const char *ctx_name);
+#else
+static inline struct device *msm_iommu_get_ctx(const char *ctx_name)
+{
+       return NULL;
+}
+#endif
 
 /*
  * Interrupt handler for the IOMMU context fault interrupt. Hooking the
--

1.7.9.5

author maintainer
#4 lore raw

Re: [PATCH 3/3] Fix compile error in drivers/gpu/drm/msm/msm_drv.c with IOMMU disabled

Hi Rob,

Quoted 6 lines · Rob Clark

But I am not the right one to merge this one. And, well, if there is a way to make this work without msm_iommu_get_ctx(), I am interested in some hints ;-)

Of the other two, 1/3 looks fine and I'll pull that in. And I'll see if I can come up with a better way for 2/3

Yeah, patch 2/3 was not meant very seriously, it was more a way to say that someone should fix it who knows the best way how to do it ;) Thanks for your review and taking 1/3.

Joerg