Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1399297 > unrolled thread

More build fixes for omapdrm in current -next

Started byArnd Bergmann <arnd@arndb.de>
First post2016-05-11 18:10 +0200
Last post2016-05-12 12:50 +0200
Articles 7 — 3 participants

Back to article view | Back to linux.kernel

Contents

  More build fixes for omapdrm in current -next Arnd Bergmann <arnd@arndb.de> - 2016-05-11 18:10 +0200
    [PATCH 1/3] drm/omap: include linux/seq_file.h where needed Arnd Bergmann <arnd@arndb.de> - 2016-05-11 18:10 +0200
    [PATCH 2/3] drm/omap: include linux/of.h where needed Arnd Bergmann <arnd@arndb.de> - 2016-05-11 18:10 +0200
    [PATCH] drm: mediatek: remove IOMMU_DMA select Arnd Bergmann <arnd@arndb.de> - 2016-05-11 22:20 +0200
      Re: [PATCH] drm: mediatek: remove IOMMU_DMA select Arnd Bergmann <arnd@arndb.de> - 2016-05-11 22:20 +0200
      Re: [PATCH] drm: mediatek: remove IOMMU_DMA select Robin Murphy <robin.murphy@arm.com> - 2016-05-12 11:30 +0200
      Re: [PATCH] drm: mediatek: remove IOMMU_DMA select Philipp Zabel <p.zabel@pengutronix.de> - 2016-05-12 12:50 +0200

#1399297 — More build fixes for omapdrm in current -next

FromArnd Bergmann <arnd@arndb.de>
Date2016-05-11 18:10 +0200
SubjectMore build fixes for omapdrm in current -next
Message-ID<rxERX-3dg-3@gated-at.bofh.it>
A couple more errors showed up in linux-next in the last few
days, all because of missing header files. I have not seen these
before, and most configurations appear to be fine. There
must have been an implicit inclusion somewhere before that
just got removed, but I couldn't find it and doing the
explicit #include should always be better here.

Please apply for 4.7 to avoid regressing on randconfig builds.

	Arnd

[toc] | [next] | [standalone]

#1399301 — [PATCH 1/3] drm/omap: include linux/seq_file.h where needed

FromArnd Bergmann <arnd@arndb.de>
Date2016-05-11 18:10 +0200
Subject[PATCH 1/3] drm/omap: include linux/seq_file.h where needed
Message-ID<rxERY-3dg-11@gated-at.bofh.it>
In reply to#1399297
The omapdrm driver relies on this header to be included
implicitly, but this does not always work, and I get
this error in randconfig builds:

gpu/drm/omapdrm/dss/hdmi_phy.c: In function 'hdmi_phy_dump':
gpu/drm/omapdrm/dss/hdmi_phy.c:34:2: error: implicit declaration of function 'seq_printf' [-Werror=implicit-function-declaration]
gpu/drm/omapdrm/dss/hdmi_wp.c: In function 'hdmi_wp_dump':
gpu/drm/omapdrm/dss/hdmi_wp.c:26:2: error: implicit declaration of function 'seq_printf' [-Werror=implicit-function-declaration]
gpu/drm/omapdrm/dss/hdmi_pll.c: In function 'hdmi_pll_dump':
gpu/drm/omapdrm/dss/hdmi_pll.c:30:2: error: implicit declaration of function 'seq_printf' [-Werror=implicit-function-declaration]

This adds the #include statements in all files that have
a seq_printf statement.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/omapdrm/dss/hdmi_phy.c   | 1 +
 drivers/gpu/drm/omapdrm/dss/hdmi_pll.c   | 1 +
 drivers/gpu/drm/omapdrm/dss/hdmi_wp.c    | 1 +
 drivers/gpu/drm/omapdrm/omap_debugfs.c   | 2 ++
 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 +
 drivers/gpu/drm/omapdrm/omap_fb.c        | 2 ++
 drivers/gpu/drm/omapdrm/omap_gem.c       | 1 +
 7 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 1f5d19c119ce..f98b750fc499 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -13,6 +13,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/seq_file.h>
 #include <video/omapdss.h>
 
 #include "dss.h"
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index 06e23a7c432c..f1015e8b8267 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/seq_file.h>
 
 #include <video/omapdss.h>
 
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 13442b9052d1..055f62fca5dc 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/seq_file.h>
 #include <video/omapdss.h>
 
 #include "dss.h"
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c
index 6f5fc14fc015..479bf24050f8 100644
--- a/drivers/gpu/drm/omapdrm/omap_debugfs.c
+++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -17,6 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
+
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>
 
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index de275a5be1db..4ceed7a9762f 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h> /* platform_device() */
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 610962396eb0..dce41e176a64 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -17,6 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
+
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 907154f5b67c..d2d879da6287 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -17,6 +17,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/seq_file.h>
 #include <linux/shmem_fs.h>
 #include <linux/spinlock.h>
 #include <linux/pfn_t.h>
-- 
2.7.0

[toc] | [prev] | [next] | [standalone]

#1399303 — [PATCH 2/3] drm/omap: include linux/of.h where needed

FromArnd Bergmann <arnd@arndb.de>
Date2016-05-11 18:10 +0200
Subject[PATCH 2/3] drm/omap: include linux/of.h where needed
Message-ID<rxERY-3dg-27@gated-at.bofh.it>
In reply to#1399297
Some parts of the OMAP drm driver rely on implicit inclusion of
linux/of.h but fail in some configurations:

drivers/gpu/drm/omapdrm/dss/hdmi4.c: In function 'hdmi_probe_of':
drivers/gpu/drm/omapdrm/dss/hdmi4.c:564:2: error: implicit declaration of function 'of_node_put' [-Werror=implicit-function-declaration]
drivers/gpu/drm/omapdrm/dss/hdmi5.c: In function 'hdmi_probe_of':
drivers/gpu/drm/omapdrm/dss/hdmi5.c:590:2: error: implicit declaration of function 'of_node_put' [-Werror=implicit-function-declaration]

This adds an explicit #include statement to those files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 +
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index f892ae157ff3..079bcfcbc8ef 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index a43f7b10e113..68ac2491d4b1 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
+#include <linux/of.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-- 
2.7.0

[toc] | [prev] | [next] | [standalone]

#1399485 — [PATCH] drm: mediatek: remove IOMMU_DMA select

FromArnd Bergmann <arnd@arndb.de>
Date2016-05-11 22:20 +0200
Subject[PATCH] drm: mediatek: remove IOMMU_DMA select
Message-ID<rxILT-7dz-1@gated-at.bofh.it>
In reply to#1399297
We get a harmless build warning when trying to use the mediatek
DRM driver with IOMMU support disabled:

warning: (DRM_MEDIATEK) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT)

However, the IOMMU_DMA symbol is not meant to be used by drivers
at all, and this driver doesn't seem to have a strict dependency
on it other than using the mediatek IOMMU driver that does.

Since we also want to be able to do compile tests with the
driver on other platforms, the IOMMU_DMA symbol should not
be selected here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
If someone has a better explanation about why the 'select' is here,
let me know, it certainly seems out of place.

 drivers/gpu/drm/mediatek/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index 0c06a69d7f04..545973f6b743 100644
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -7,7 +7,6 @@ config DRM_MEDIATEK
 	select DRM_KMS_HELPER
 	select DRM_MIPI_DSI
 	select DRM_PANEL
-	select IOMMU_DMA
 	select MEMORY
 	select MTK_SMI
 	help
-- 
2.7.0

[toc] | [prev] | [next] | [standalone]

#1399489 — Re: [PATCH] drm: mediatek: remove IOMMU_DMA select

FromArnd Bergmann <arnd@arndb.de>
Date2016-05-11 22:20 +0200
SubjectRe: [PATCH] drm: mediatek: remove IOMMU_DMA select
Message-ID<rxILU-7dz-7@gated-at.bofh.it>
In reply to#1399485
On Wednesday 11 May 2016 22:11:07 Arnd Bergmann wrote:
> We get a harmless build warning when trying to use the mediatek
> DRM driver with IOMMU support disabled:
> 
> warning: (DRM_MEDIATEK) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT)
> 
> However, the IOMMU_DMA symbol is not meant to be used by drivers
> at all, and this driver doesn't seem to have a strict dependency
> on it other than using the mediatek IOMMU driver that does.
> 
> Since we also want to be able to do compile tests with the
> driver on other platforms, the IOMMU_DMA symbol should not
> be selected here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> If someone has a better explanation about why the 'select' is here,
> let me know, it certainly seems out of place.

Sorry, I didn't mean to send this as a reply to "More build fixes for
omapdrm in current -next", I copied the wrong command line.

I'll resend it if necessary.

	Arnd

[toc] | [prev] | [next] | [standalone]

#1399820 — Re: [PATCH] drm: mediatek: remove IOMMU_DMA select

FromRobin Murphy <robin.murphy@arm.com>
Date2016-05-12 11:30 +0200
SubjectRe: [PATCH] drm: mediatek: remove IOMMU_DMA select
Message-ID<rxV6q-2GU-1@gated-at.bofh.it>
In reply to#1399485
On 11/05/16 21:11, Arnd Bergmann wrote:
> We get a harmless build warning when trying to use the mediatek
> DRM driver with IOMMU support disabled:
>
> warning: (DRM_MEDIATEK) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT)
>
> However, the IOMMU_DMA symbol is not meant to be used by drivers
> at all, and this driver doesn't seem to have a strict dependency
> on it other than using the mediatek IOMMU driver that does.
>
> Since we also want to be able to do compile tests with the
> driver on other platforms, the IOMMU_DMA symbol should not
> be selected here.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> If someone has a better explanation about why the 'select' is here,
> let me know, it certainly seems out of place.

Ack - it's neither an IOMMU driver nor a DMA API implementation, so it 
has no business with IOMMU_DMA. If there's an IOMMU dependency in 
general it should be on MTK_IOMMU, not underlying implementation details.

Robin.

>   drivers/gpu/drm/mediatek/Kconfig | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> index 0c06a69d7f04..545973f6b743 100644
> --- a/drivers/gpu/drm/mediatek/Kconfig
> +++ b/drivers/gpu/drm/mediatek/Kconfig
> @@ -7,7 +7,6 @@ config DRM_MEDIATEK
>   	select DRM_KMS_HELPER
>   	select DRM_MIPI_DSI
>   	select DRM_PANEL
> -	select IOMMU_DMA
>   	select MEMORY
>   	select MTK_SMI
>   	help
>

[toc] | [prev] | [next] | [standalone]

#1399907 — Re: [PATCH] drm: mediatek: remove IOMMU_DMA select

FromPhilipp Zabel <p.zabel@pengutronix.de>
Date2016-05-12 12:50 +0200
SubjectRe: [PATCH] drm: mediatek: remove IOMMU_DMA select
Message-ID<rxWlQ-3Oh-13@gated-at.bofh.it>
In reply to#1399485
Am Mittwoch, den 11.05.2016, 22:11 +0200 schrieb Arnd Bergmann:
> We get a harmless build warning when trying to use the mediatek
> DRM driver with IOMMU support disabled:
> 
> warning: (DRM_MEDIATEK) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT)
> 
> However, the IOMMU_DMA symbol is not meant to be used by drivers
> at all, and this driver doesn't seem to have a strict dependency
> on it other than using the mediatek IOMMU driver that does.
> 
> Since we also want to be able to do compile tests with the
> driver on other platforms, the IOMMU_DMA symbol should not
> be selected here.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> If someone has a better explanation about why the 'select' is here,
> let me know, it certainly seems out of place.

No, it just has been there since the initial RFC and nobody noticed.

>  drivers/gpu/drm/mediatek/Kconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> index 0c06a69d7f04..545973f6b743 100644
> --- a/drivers/gpu/drm/mediatek/Kconfig
> +++ b/drivers/gpu/drm/mediatek/Kconfig
> @@ -7,7 +7,6 @@ config DRM_MEDIATEK
>  	select DRM_KMS_HELPER
>  	select DRM_MIPI_DSI
>  	select DRM_PANEL
> -	select IOMMU_DMA
>  	select MEMORY
>  	select MTK_SMI
>  	help

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

I tried
  make ARCH=arm64 allnoconfig
and then set
  CONFIG_MODULES=y
  CONFIG_ARCH_MEDIATEK=y
  CONFIG_DRM=m
  CONFIG_DRM_MEDIATEK=m

And it builds fine with IOMMU_DMA/MTK_IOMMU disabled.

thanks
Philipp

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web