From: Arnd Bergmann <arnd@arndb.de>
To: dri-devel@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
linux-fbdev@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>, Nicolas Pitre <nico@fluxnic.net>,
Andrzej Hajda <a.hajda@samsung.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Saeed Mahameed <saeedm@mellanox.com>,
masahiroy@kernel.org, Laurent.pinchart@ideasonboard.com,
linux-renesas-soc@vger.kernel.org,
kieran.bingham+renesas@ideasonboard.com, airlied@linux.ie,
daniel@zonque.org, haojian.zhuang@gmail.com,
robert.jarzmik@free.fr, daniel@ffwll.ch, marex@denx.de,
stefan@agner.ch, linux-graphics-maintainer@vmware.com,
thellstrom@vmware.com, jfrederich@gmail.com, dsd@laptop.org,
geert@linux-m68k.org
Subject: [PATCH 4/8] drm/rcar: stop using 'imply' for dependencies
Date: Fri, 17 Apr 2020 17:55:49 +0200 [thread overview]
Message-ID: <20200417155553.675905-5-arnd@arndb.de> (raw)
In-Reply-To: <20200417155553.675905-1-arnd@arndb.de>
The meaning of the 'imply' keyword has changed recently, and neither the
old meaning (select the symbol if its dependencies are met) nor the new
meaning (enable it by default, but let the user set any other setting)
is what we want here.
Work around this by adding two more Kconfig options that lead to
the correct behavior: if DRM_RCAR_USE_CMM and DRM_RCAR_USE_LVDS
are enabled, that portion of the driver becomes usable, and no
configuration results in a link error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/rcar-du/Kconfig | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 0919f1f159a4..d2fcec807dfa 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -4,8 +4,6 @@ config DRM_RCAR_DU
depends on DRM && OF
depends on ARM || ARM64
depends on ARCH_RENESAS || COMPILE_TEST
- imply DRM_RCAR_CMM
- imply DRM_RCAR_LVDS
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
select DRM_GEM_CMA_HELPER
@@ -14,13 +12,17 @@ config DRM_RCAR_DU
Choose this option if you have an R-Car chipset.
If M is selected the module will be called rcar-du-drm.
-config DRM_RCAR_CMM
- tristate "R-Car DU Color Management Module (CMM) Support"
- depends on DRM && OF
+config DRM_RCAR_USE_CMM
+ bool "R-Car DU Color Management Module (CMM) Support"
depends on DRM_RCAR_DU
+ default DRM_RCAR_DU
help
Enable support for R-Car Color Management Module (CMM).
+config DRM_RCAR_CMM
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_CMM
+
config DRM_RCAR_DW_HDMI
tristate "R-Car DU Gen3 HDMI Encoder Support"
depends on DRM && OF
@@ -28,15 +30,20 @@ config DRM_RCAR_DW_HDMI
help
Enable support for R-Car Gen3 internal HDMI encoder.
-config DRM_RCAR_LVDS
- tristate "R-Car DU LVDS Encoder Support"
- depends on DRM && DRM_BRIDGE && OF
+config DRM_RCAR_USE_LVDS
+ bool "R-Car DU LVDS Encoder Support"
+ depends on DRM_BRIDGE && OF
+ default DRM_RCAR_DU
select DRM_PANEL
select OF_FLATTREE
select OF_OVERLAY
help
Enable support for the R-Car Display Unit embedded LVDS encoders.
+config DRM_RCAR_LVDS
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_LVDS
+
config DRM_RCAR_VSP
bool "R-Car DU VSP Compositor Support" if ARM
default y if ARM64
--
2.26.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: dri-devel@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
linux-fbdev@vger.kernel.org
Cc: marex@denx.de, dsd@laptop.org, Arnd Bergmann <arnd@arndb.de>,
Andrzej Hajda <a.hajda@samsung.com>,
airlied@linux.ie, masahiroy@kernel.org,
Nicolas Pitre <nico@fluxnic.net>,
Saeed Mahameed <saeedm@mellanox.com>,
thellstrom@vmware.com, haojian.zhuang@gmail.com,
geert@linux-m68k.org, linux-renesas-soc@vger.kernel.org,
Jason Gunthorpe <jgg@ziepe.ca>,
kieran.bingham+renesas@ideasonboard.com,
linux-graphics-maintainer@vmware.com,
Laurent.pinchart@ideasonboard.com, jfrederich@gmail.com,
robert.jarzmik@free.fr, daniel@zonque.org
Subject: [PATCH 4/8] drm/rcar: stop using 'imply' for dependencies
Date: Fri, 17 Apr 2020 15:55:49 +0000 [thread overview]
Message-ID: <20200417155553.675905-5-arnd@arndb.de> (raw)
In-Reply-To: <20200417155553.675905-1-arnd@arndb.de>
The meaning of the 'imply' keyword has changed recently, and neither the
old meaning (select the symbol if its dependencies are met) nor the new
meaning (enable it by default, but let the user set any other setting)
is what we want here.
Work around this by adding two more Kconfig options that lead to
the correct behavior: if DRM_RCAR_USE_CMM and DRM_RCAR_USE_LVDS
are enabled, that portion of the driver becomes usable, and no
configuration results in a link error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/rcar-du/Kconfig | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 0919f1f159a4..d2fcec807dfa 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -4,8 +4,6 @@ config DRM_RCAR_DU
depends on DRM && OF
depends on ARM || ARM64
depends on ARCH_RENESAS || COMPILE_TEST
- imply DRM_RCAR_CMM
- imply DRM_RCAR_LVDS
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
select DRM_GEM_CMA_HELPER
@@ -14,13 +12,17 @@ config DRM_RCAR_DU
Choose this option if you have an R-Car chipset.
If M is selected the module will be called rcar-du-drm.
-config DRM_RCAR_CMM
- tristate "R-Car DU Color Management Module (CMM) Support"
- depends on DRM && OF
+config DRM_RCAR_USE_CMM
+ bool "R-Car DU Color Management Module (CMM) Support"
depends on DRM_RCAR_DU
+ default DRM_RCAR_DU
help
Enable support for R-Car Color Management Module (CMM).
+config DRM_RCAR_CMM
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_CMM
+
config DRM_RCAR_DW_HDMI
tristate "R-Car DU Gen3 HDMI Encoder Support"
depends on DRM && OF
@@ -28,15 +30,20 @@ config DRM_RCAR_DW_HDMI
help
Enable support for R-Car Gen3 internal HDMI encoder.
-config DRM_RCAR_LVDS
- tristate "R-Car DU LVDS Encoder Support"
- depends on DRM && DRM_BRIDGE && OF
+config DRM_RCAR_USE_LVDS
+ bool "R-Car DU LVDS Encoder Support"
+ depends on DRM_BRIDGE && OF
+ default DRM_RCAR_DU
select DRM_PANEL
select OF_FLATTREE
select OF_OVERLAY
help
Enable support for the R-Car Display Unit embedded LVDS encoders.
+config DRM_RCAR_LVDS
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_LVDS
+
config DRM_RCAR_VSP
bool "R-Car DU VSP Compositor Support" if ARM
default y if ARM64
--
2.26.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: dri-devel@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
linux-fbdev@vger.kernel.org
Cc: marex@denx.de, dsd@laptop.org, Arnd Bergmann <arnd@arndb.de>,
Andrzej Hajda <a.hajda@samsung.com>,
airlied@linux.ie, masahiroy@kernel.org,
Nicolas Pitre <nico@fluxnic.net>,
Saeed Mahameed <saeedm@mellanox.com>,
thellstrom@vmware.com, haojian.zhuang@gmail.com,
geert@linux-m68k.org, linux-renesas-soc@vger.kernel.org,
Jason Gunthorpe <jgg@ziepe.ca>,
kieran.bingham+renesas@ideasonboard.com,
linux-graphics-maintainer@vmware.com,
Laurent.pinchart@ideasonboard.com, jfrederich@gmail.com,
robert.jarzmik@free.fr, daniel@zonque.org
Subject: [PATCH 4/8] drm/rcar: stop using 'imply' for dependencies
Date: Fri, 17 Apr 2020 17:55:49 +0200 [thread overview]
Message-ID: <20200417155553.675905-5-arnd@arndb.de> (raw)
In-Reply-To: <20200417155553.675905-1-arnd@arndb.de>
The meaning of the 'imply' keyword has changed recently, and neither the
old meaning (select the symbol if its dependencies are met) nor the new
meaning (enable it by default, but let the user set any other setting)
is what we want here.
Work around this by adding two more Kconfig options that lead to
the correct behavior: if DRM_RCAR_USE_CMM and DRM_RCAR_USE_LVDS
are enabled, that portion of the driver becomes usable, and no
configuration results in a link error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/rcar-du/Kconfig | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 0919f1f159a4..d2fcec807dfa 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -4,8 +4,6 @@ config DRM_RCAR_DU
depends on DRM && OF
depends on ARM || ARM64
depends on ARCH_RENESAS || COMPILE_TEST
- imply DRM_RCAR_CMM
- imply DRM_RCAR_LVDS
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
select DRM_GEM_CMA_HELPER
@@ -14,13 +12,17 @@ config DRM_RCAR_DU
Choose this option if you have an R-Car chipset.
If M is selected the module will be called rcar-du-drm.
-config DRM_RCAR_CMM
- tristate "R-Car DU Color Management Module (CMM) Support"
- depends on DRM && OF
+config DRM_RCAR_USE_CMM
+ bool "R-Car DU Color Management Module (CMM) Support"
depends on DRM_RCAR_DU
+ default DRM_RCAR_DU
help
Enable support for R-Car Color Management Module (CMM).
+config DRM_RCAR_CMM
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_CMM
+
config DRM_RCAR_DW_HDMI
tristate "R-Car DU Gen3 HDMI Encoder Support"
depends on DRM && OF
@@ -28,15 +30,20 @@ config DRM_RCAR_DW_HDMI
help
Enable support for R-Car Gen3 internal HDMI encoder.
-config DRM_RCAR_LVDS
- tristate "R-Car DU LVDS Encoder Support"
- depends on DRM && DRM_BRIDGE && OF
+config DRM_RCAR_USE_LVDS
+ bool "R-Car DU LVDS Encoder Support"
+ depends on DRM_BRIDGE && OF
+ default DRM_RCAR_DU
select DRM_PANEL
select OF_FLATTREE
select OF_OVERLAY
help
Enable support for the R-Car Display Unit embedded LVDS encoders.
+config DRM_RCAR_LVDS
+ def_tristate DRM_RCAR_DU
+ depends on DRM_RCAR_USE_LVDS
+
config DRM_RCAR_VSP
bool "R-Car DU VSP Compositor Support" if ARM
default y if ARM64
--
2.26.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-04-17 15:56 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-17 15:55 [PATCH 0/8] drm, fbdev: rework dependencies Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` [PATCH 1/8] fbdev: w100fb: clean up mach-pxa compile-time dependency Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-18 10:10 ` Robert Jarzmik
2020-04-18 10:10 ` Robert Jarzmik
2020-04-18 10:10 ` Robert Jarzmik
2020-04-18 10:14 ` Arnd Bergmann
2020-04-18 10:14 ` Arnd Bergmann
2020-04-18 10:14 ` Arnd Bergmann
2020-04-17 15:55 ` [PATCH 2/8] fbdev/ARM: pxa: avoid selecting CONFIG_FB Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-18 10:18 ` Robert Jarzmik
2020-04-18 10:18 ` Robert Jarzmik
2020-04-18 10:18 ` Robert Jarzmik
2020-04-17 15:55 ` [PATCH 3/8] fbdev: rework FB_DDC dependencies Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann [this message]
2020-04-17 15:55 ` [PATCH 4/8] drm/rcar: stop using 'imply' for dependencies Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` [PATCH 5/8] drm/vmwgfx: make framebuffer support optional Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-20 12:07 ` Thomas Zimmermann
2020-04-20 12:07 ` Thomas Zimmermann
2020-04-20 12:07 ` Thomas Zimmermann
2020-04-17 15:55 ` [PATCH 6/8] drm: decouple from CONFIG_FB Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 16:50 ` Sam Ravnborg
2020-04-17 16:50 ` Sam Ravnborg
2020-04-17 16:50 ` Sam Ravnborg
2020-04-17 20:03 ` Arnd Bergmann
2020-04-17 20:03 ` Arnd Bergmann
2020-04-17 20:03 ` Arnd Bergmann
2020-04-17 20:29 ` Sam Ravnborg
2020-04-17 20:29 ` Sam Ravnborg
2020-04-17 20:29 ` Sam Ravnborg
2020-04-17 15:55 ` [PATCH 7/8] fbdev: rework backlight dependencies Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 17:04 ` Sam Ravnborg
2020-04-17 17:04 ` Sam Ravnborg
2020-04-17 17:04 ` Sam Ravnborg
2020-04-17 19:55 ` Arnd Bergmann
2020-04-17 19:55 ` Arnd Bergmann
2020-04-17 19:55 ` Arnd Bergmann
2020-04-20 8:02 ` Jani Nikula
2020-04-20 8:02 ` Jani Nikula
2020-04-20 8:02 ` Jani Nikula
2020-04-17 15:55 ` [PATCH 8/8] drm/bridge/sii8620: fix extcon dependency Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 15:55 ` Arnd Bergmann
2020-04-17 16:52 ` Andrzej Hajda
2020-04-17 16:52 ` Andrzej Hajda
2020-04-17 16:52 ` Andrzej Hajda
2020-04-17 17:14 ` [PATCH 0/8] drm, fbdev: rework dependencies Daniel Vetter
2020-04-17 17:14 ` Daniel Vetter
2020-04-17 17:14 ` Daniel Vetter
2020-04-17 19:08 ` Jason Gunthorpe
2020-04-17 19:08 ` Jason Gunthorpe
2020-04-17 19:08 ` Jason Gunthorpe
2020-04-20 8:14 ` Jani Nikula
2020-04-20 8:14 ` Jani Nikula
2020-04-20 8:14 ` Jani Nikula
2020-04-20 14:03 ` Arnd Bergmann
2020-04-20 14:03 ` Arnd Bergmann
2020-04-20 14:03 ` Arnd Bergmann
2020-04-21 12:27 ` Daniel Vetter
2020-04-21 12:27 ` Daniel Vetter
2020-04-21 12:27 ` Daniel Vetter
2020-04-21 12:58 ` Jani Nikula
2020-04-21 12:58 ` Jani Nikula
2020-04-21 12:58 ` Jani Nikula
2020-04-21 13:05 ` Geert Uytterhoeven
2020-04-21 13:05 ` Geert Uytterhoeven
2020-04-21 13:05 ` Geert Uytterhoeven
2020-04-21 13:10 ` Daniel Vetter
2020-04-21 13:10 ` Daniel Vetter
2020-04-21 13:10 ` Daniel Vetter
2020-04-21 13:25 ` Jani Nikula
2020-04-21 13:25 ` Jani Nikula
2020-04-21 13:25 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200417155553.675905-5-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=daniel@zonque.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=dsd@laptop.org \
--cc=geert@linux-m68k.org \
--cc=haojian.zhuang@gmail.com \
--cc=jani.nikula@linux.intel.com \
--cc=jfrederich@gmail.com \
--cc=jgg@ziepe.ca \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=marex@denx.de \
--cc=masahiroy@kernel.org \
--cc=nico@fluxnic.net \
--cc=robert.jarzmik@free.fr \
--cc=saeedm@mellanox.com \
--cc=stefan@agner.ch \
--cc=thellstrom@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.