Re: [PATCH] OMAPDSS: enable omapdss for ARCH_MULTIPLATFORM

[Tomi Valkeinen <tomi.valkeinen@ti.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1850 bytes --]

Hi Arnd, Rob,

On 2013-02-05 18:31, Arnd Bergmann wrote:
> On Tuesday 22 January 2013, Arnd Bergmann wrote:
>> On Tuesday 22 January 2013, Rob Clark wrote:
>>> At least core omapdss does not have any build dependencies on
>>> ARCH_OMAP2PLUS, and adding this dependency in the Kconfig breaks omapdrm
>>> for ARCH_MULTIPLATFORM builds.
>>>
>>> Signed-off-by: Rob Clark <robdclark@gmail.com>
>>
>> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> It seems nobody has applied this patch, as it has not shown up in
> linux-next or upstream. Who should take care of this? If nobody feels
> responsible, I can put it into arm-soc/fixes.

That would normally be me, but I've been on a long leave, and just came
back. It'll take me some time to get back on track.

I don't think it makes sense to add ARCH_MULTIPLATFORM only for omapdss,
like this patch does. I think we should add it for omapfb and the panel
drivers also.

I did get a report of an omapdss build-break with allyesconfig. It seems
to happen because omapdrm and omap_vout use "select" to enable omapdss,
instead of depending on omapdss. This causes an illegal config to be
created. Perhaps this is the problem that Rob mentions in his patch?

Adding ARCH_MULTIPLATFORM for omapdss, as this patch does, removes
(well, hides) the above mentioned problem and allyesconfig works ok. You
can still break the config, but you need to manually select the Kconfig
options the wrong way.

I have patches to add the ARCH_MULTIPLATFORM for omapdss, and to fix the
omap_vout and omapdrm Kconfig files. Each of them changes only one line.
Arnd, are you ok with queuing those patches via arm-soc/fixes? Or should
I send them individually to respective maintainers?

I can send the patches properly for review, but I've also attached them
here so Rob can test.

 Tomi


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-OMAPDSS-add-support-for-ARCH_MULTIPLATFORM.patch --]
[-- Type: text/x-patch; name="0001-OMAPDSS-add-support-for-ARCH_MULTIPLATFORM.patch", Size: 1052 bytes --]

From b2a01a69089c965a703125e001037eff4f09af4e Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 6 Feb 2013 15:21:14 +0200
Subject: [PATCH 1/3] OMAPDSS: add support for ARCH_MULTIPLATFORM

omapdss, omapfb and omap's panel drivers currently depend on
ARCH_OMAP2PLUS. To make omapdss usable on multiplatform builds, add an
optinal dependency to ARCH_MULTIPLATFORM.

No other change is needed, as omapdss, omapfb and panel drivers already
compile on non-omap platforms.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/video/omap2/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig
index b07b2b0..e1cd489 100644
--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig
@@ -1,7 +1,7 @@
 config OMAP2_VRFB
 	bool
 
-if ARCH_OMAP2PLUS
+if ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
 
 source "drivers/video/omap2/dss/Kconfig"
 source "drivers/video/omap2/omapfb/Kconfig"
-- 
1.7.10.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-omap_vout-fix-the-dependency-on-OMAPDSS.patch --]
[-- Type: text/x-patch; name="0002-omap_vout-fix-the-dependency-on-OMAPDSS.patch", Size: 1246 bytes --]

From 61fb1e64b5374510bfaeb2137a5af5f6ea33ba34 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 6 Feb 2013 15:54:08 +0200
Subject: [PATCH 2/3] omap_vout: fix the dependency on OMAPDSS

omap_vout uses "select" in Kconfig to enable omapdss. This doesn't work
correctly, as "select" forces omapdss to be enabled in the config even
if it normally could not be enabled.

Instead of using select, this patch changes omap_vout to use "depend
on".

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/media/platform/omap/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index 390ab09..c102615 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -4,9 +4,9 @@ config VIDEO_OMAP2_VOUT_VRFB
 config VIDEO_OMAP2_VOUT
 	tristate "OMAP2/OMAP3 V4L2-Display driver"
 	depends on ARCH_OMAP2 || ARCH_OMAP3
+	depends on OMAP2_DSS
 	select VIDEOBUF_GEN
 	select VIDEOBUF_DMA_CONTIG
-	select OMAP2_DSS
 	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
 	select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
 	default n
-- 
1.7.10.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-omapdrm-fix-the-dependency-on-OMAPDSS.patch --]
[-- Type: text/x-patch; name="0003-omapdrm-fix-the-dependency-on-OMAPDSS.patch", Size: 1131 bytes --]

From aca9e04648a6cef98f65ff754bf903f456c8bc5d Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 6 Feb 2013 16:03:44 +0200
Subject: [PATCH 3/3] omapdrm: fix the dependency on OMAPDSS

omapdrm uses "select" in Kconfig to enable omapdss. This doesn't work
correctly, as "select" forces omapdss to be enabled in the config even
if it normally could not be enabled.

Instead of using select, this patch changes omapdrm to use "depend
on".

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/staging/omapdrm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/omapdrm/Kconfig b/drivers/staging/omapdrm/Kconfig
index b724a41..09f65dc 100644
--- a/drivers/staging/omapdrm/Kconfig
+++ b/drivers/staging/omapdrm/Kconfig
@@ -3,8 +3,8 @@ config DRM_OMAP
 	tristate "OMAP DRM"
 	depends on DRM && !CONFIG_FB_OMAP2
 	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
+	depends on OMAP2_DSS
 	select DRM_KMS_HELPER
-	select OMAP2_DSS
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA
 	select FB_SYS_IMAGEBLIT
-- 
1.7.10.4


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]