diff mbox series

drm: Drop ARCH_MULTIPLATFORM from dependencies

Message ID 20221209220555.3631364-1-u.kleine-koenig@pengutronix.de
State New
Headers show
Series drm: Drop ARCH_MULTIPLATFORM from dependencies | expand

Commit Message

Uwe Kleine-König Dec. 9, 2022, 10:05 p.m. UTC 
Some of these dependencies used to be sensible when only a small part of
the platforms supported by ARCH=arm could be compiled together in a
single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
for kernel options incompatible with a multiplatform image. See commit
84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
details.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/gpu/drm/exynos/Kconfig  | 2 +-
 drivers/gpu/drm/imx/Kconfig     | 2 +-
 drivers/gpu/drm/omapdrm/Kconfig | 2 +-
 drivers/gpu/drm/sti/Kconfig     | 2 +-
 drivers/gpu/drm/stm/Kconfig     | 2 +-
 drivers/gpu/ipu-v3/Kconfig      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)


base-commit: 0d1409e4ff08aa4a9a254d3f723410db32aa7552

Comments

Arnd Bergmann Dec. 9, 2022, 10:53 p.m. UTC | #1 
On Fri, Dec 9, 2022, at 23:05, Uwe Kleine-König wrote:
> Some of these dependencies used to be sensible when only a small part of
> the platforms supported by ARCH=arm could be compiled together in a
> single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
> for kernel options incompatible with a multiplatform image. See commit
> 84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
> details.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Makes sense,

Acked-by: Arnd Bergmann <arnd@arndb.de>

> diff --git a/drivers/gpu/drm/omapdrm/Kconfig 
> b/drivers/gpu/drm/omapdrm/Kconfig
> index 455e1a91f0e5..76ded1568bd0 100644
> --- a/drivers/gpu/drm/omapdrm/Kconfig
> +++ b/drivers/gpu/drm/omapdrm/Kconfig
> @@ -2,7 +2,7 @@
>  config DRM_OMAP
>  	tristate "OMAP DRM"
>  	depends on DRM && OF
> -	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
> +	depends on ARCH_OMAP2PLUS
>  	select DRM_KMS_HELPER
>  	select VIDEOMODE_HELPERS
>  	select HDMI

Since the original purpose of the ||ARCH_MULTIPLATFORM was to allow
building the driver on more targets, I wonder if we should instead
make that ||COMPILE_TEST, which would also allow building it on
x86 and others.

> diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
> index f2a880c48485..3c7a5feff8de 100644
> --- a/drivers/gpu/drm/sti/Kconfig
> +++ b/drivers/gpu/drm/sti/Kconfig
> @@ -1,7 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  config DRM_STI
>  	tristate "DRM Support for STMicroelectronics SoC stiH4xx Series"
> -	depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM)
> +	depends on OF && DRM && ARCH_STI
>  	select RESET_CONTROLLER
>  	select DRM_KMS_HELPER
>  	select DRM_GEM_DMA_HELPER
> diff --git a/drivers/gpu/drm/stm/Kconfig b/drivers/gpu/drm/stm/Kconfig
> index ded72f879482..fa49cde43bb2 100644
> --- a/drivers/gpu/drm/stm/Kconfig
> +++ b/drivers/gpu/drm/stm/Kconfig
> @@ -1,7 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  config DRM_STM
>  	tristate "DRM Support for STMicroelectronics SoC Series"
> -	depends on DRM && (ARCH_STM32 || ARCH_MULTIPLATFORM)
> +	depends on DRM && ARCH_STM32
>  	select DRM_KMS_HELPER
>  	select DRM_GEM_DMA_HELPER
>  	select DRM_PANEL_BRIDGE

Same here.

     arnd
Uwe Kleine-König Dec. 10, 2022, 9:21 a.m. UTC | #2 
Hello Arnd,

On Fri, Dec 09, 2022 at 11:53:49PM +0100, Arnd Bergmann wrote:
> On Fri, Dec 9, 2022, at 23:05, Uwe Kleine-König wrote:
> > Some of these dependencies used to be sensible when only a small part of
> > the platforms supported by ARCH=arm could be compiled together in a
> > single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
> > for kernel options incompatible with a multiplatform image. See commit
> > 84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
> > details.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Makes sense,
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Thanks. (But honestly I'm not surprised you agree to this patch after
our conversation on irc :-)
 
> > diff --git a/drivers/gpu/drm/omapdrm/Kconfig 
> > b/drivers/gpu/drm/omapdrm/Kconfig
> > index 455e1a91f0e5..76ded1568bd0 100644
> > --- a/drivers/gpu/drm/omapdrm/Kconfig
> > +++ b/drivers/gpu/drm/omapdrm/Kconfig
> > @@ -2,7 +2,7 @@
> >  config DRM_OMAP
> >  	tristate "OMAP DRM"
> >  	depends on DRM && OF
> > -	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
> > +	depends on ARCH_OMAP2PLUS
> >  	select DRM_KMS_HELPER
> >  	select VIDEOMODE_HELPERS
> >  	select HDMI
> 
> Since the original purpose of the ||ARCH_MULTIPLATFORM was to allow
> building the driver on more targets, I wonder if we should instead
> make that ||COMPILE_TEST, which would also allow building it on
> x86 and others.

I wondered about that, too, but thought that would be a new patch.

Best regards
Uwe
Javier Martinez Canillas Jan. 10, 2023, 5:43 p.m. UTC | #3 
On 12/10/22 10:21, Uwe Kleine-König wrote:
> Hello Arnd,
> 
> On Fri, Dec 09, 2022 at 11:53:49PM +0100, Arnd Bergmann wrote:
>> On Fri, Dec 9, 2022, at 23:05, Uwe Kleine-König wrote:
>>> Some of these dependencies used to be sensible when only a small part of
>>> the platforms supported by ARCH=arm could be compiled together in a
>>> single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
>>> for kernel options incompatible with a multiplatform image. See commit
>>> 84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
>>> details.
>>>
>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>>
>> Makes sense,
>>
>> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> Thanks. (But honestly I'm not surprised you agree to this patch after
> our conversation on irc :-)
>

This makes sense to me as well, but it would be great if someone else
from DRM can review/ack before pushing it.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
  
>>> diff --git a/drivers/gpu/drm/omapdrm/Kconfig 
>>> b/drivers/gpu/drm/omapdrm/Kconfig
>>> index 455e1a91f0e5..76ded1568bd0 100644
>>> --- a/drivers/gpu/drm/omapdrm/Kconfig
>>> +++ b/drivers/gpu/drm/omapdrm/Kconfig
>>> @@ -2,7 +2,7 @@
>>>  config DRM_OMAP
>>>  	tristate "OMAP DRM"
>>>  	depends on DRM && OF
>>> -	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
>>> +	depends on ARCH_OMAP2PLUS
>>>  	select DRM_KMS_HELPER
>>>  	select VIDEOMODE_HELPERS
>>>  	select HDMI
>>
>> Since the original purpose of the ||ARCH_MULTIPLATFORM was to allow
>> building the driver on more targets, I wonder if we should instead
>> make that ||COMPILE_TEST, which would also allow building it on
>> x86 and others.
> 
> I wondered about that, too, but thought that would be a new patch.
>

Agreed that making it || COMPILE_TEST should be in a separate patch.
Philipp Zabel March 14, 2023, 9:22 a.m. UTC | #4 
On Fr, 2022-12-09 at 23:05 +0100, Uwe Kleine-König wrote:
> Some of these dependencies used to be sensible when only a small part of
> the platforms supported by ARCH=arm could be compiled together in a
> single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
> for kernel options incompatible with a multiplatform image. See commit
> 84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
> details.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/gpu/drm/imx/Kconfig     | 2 +-
>  drivers/gpu/ipu-v3/Kconfig      | 2 +-

For i.MX / IPUv3,

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

regards
Philipp
Javier Martinez Canillas March 14, 2023, 4:05 p.m. UTC | #5 
Philipp Zabel <p.zabel@pengutronix.de> writes:

> On Fr, 2022-12-09 at 23:05 +0100, Uwe Kleine-König wrote:
>> Some of these dependencies used to be sensible when only a small part of
>> the platforms supported by ARCH=arm could be compiled together in a
>> single kernel image. Nowadays ARCH_MULTIPLATFORM is only used as a guard
>> for kernel options incompatible with a multiplatform image. See commit
>> 84fc86360623 ("ARM: make ARCH_MULTIPLATFORM user-visible") for some more
>> details.
>> 
>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>> ---
>>  drivers/gpu/drm/imx/Kconfig     | 2 +-
>>  drivers/gpu/ipu-v3/Kconfig      | 2 +-
>
> For i.MX / IPUv3,
>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
>

Pushed to drm-misc (drm-misc-next). Thanks!
diff mbox series

Patch

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 3d2f025d4fd4..4049fa4273ab 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -2,7 +2,7 @@ 
 config DRM_EXYNOS
 	tristate "DRM Support for Samsung SoC Exynos Series"
 	depends on OF && DRM && COMMON_CLK
-	depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST
+	depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	depends on MMU
 	select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
 	select DRM_KMS_HELPER
diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
index fd5b2471fdf0..773888839497 100644
--- a/drivers/gpu/drm/imx/Kconfig
+++ b/drivers/gpu/drm/imx/Kconfig
@@ -4,7 +4,7 @@  config DRM_IMX
 	select DRM_KMS_HELPER
 	select VIDEOMODE_HELPERS
 	select DRM_GEM_DMA_HELPER
-	depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST)
+	depends on DRM && (ARCH_MXC || COMPILE_TEST)
 	depends on IMX_IPUV3_CORE
 	help
 	  enable i.MX graphics support
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 455e1a91f0e5..76ded1568bd0 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -2,7 +2,7 @@ 
 config DRM_OMAP
 	tristate "OMAP DRM"
 	depends on DRM && OF
-	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
+	depends on ARCH_OMAP2PLUS
 	select DRM_KMS_HELPER
 	select VIDEOMODE_HELPERS
 	select HDMI
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index f2a880c48485..3c7a5feff8de 100644
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_STI
 	tristate "DRM Support for STMicroelectronics SoC stiH4xx Series"
-	depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM)
+	depends on OF && DRM && ARCH_STI
 	select RESET_CONTROLLER
 	select DRM_KMS_HELPER
 	select DRM_GEM_DMA_HELPER
diff --git a/drivers/gpu/drm/stm/Kconfig b/drivers/gpu/drm/stm/Kconfig
index ded72f879482..fa49cde43bb2 100644
--- a/drivers/gpu/drm/stm/Kconfig
+++ b/drivers/gpu/drm/stm/Kconfig
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_STM
 	tristate "DRM Support for STMicroelectronics SoC Series"
-	depends on DRM && (ARCH_STM32 || ARCH_MULTIPLATFORM)
+	depends on DRM && ARCH_STM32
 	select DRM_KMS_HELPER
 	select DRM_GEM_DMA_HELPER
 	select DRM_PANEL_BRIDGE
diff --git a/drivers/gpu/ipu-v3/Kconfig b/drivers/gpu/ipu-v3/Kconfig
index 061fb990c120..7dece2a53c5c 100644
--- a/drivers/gpu/ipu-v3/Kconfig
+++ b/drivers/gpu/ipu-v3/Kconfig
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config IMX_IPUV3_CORE
 	tristate "IPUv3 core support"
-	depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM || COMPILE_TEST
+	depends on SOC_IMX5 || SOC_IMX6Q || COMPILE_TEST
 	depends on DRM || !DRM # if DRM=m, this can't be 'y'
 	select BITREVERSE
 	select GENERIC_ALLOCATOR if DRM