From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH RFC 9/9] drm/omap: make omapdrm select OMAP2_DSS Date: Thu, 10 Dec 2015 14:25:35 +0000 [thread overview] Message-ID: <1449757535-5674-10-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com> Now that omapdss is only for omapdrm, we can change omapdrm to select OMAP2_DSS to enable omapdss if omapdrm is enabled, instead of omapdrm depending on omapdss. We can also change omapdss and the display drivers to depend on DRM_OMAP, so that they are only visible under omapdrm in menuconfig. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/Kconfig | 7 +++++-- drivers/gpu/drm/omapdrm/displays/Kconfig | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig index 49b5b7df6ba4..336ad4de9981 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 depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM - depends on OMAP2_DSS + select OMAP2_DSS select DRM_KMS_HELPER select DRM_KMS_FB_HELPER select FB_SYS_FILLRECT @@ -13,15 +13,18 @@ config DRM_OMAP help DRM display driver for OMAP2/3/4 based boards. +if DRM_OMAP + config DRM_OMAP_NUM_CRTCS int "Number of CRTCs" range 1 10 default 1 if ARCH_OMAP2 || ARCH_OMAP3 default 2 if ARCH_OMAP4 - depends on DRM_OMAP help Select the number of video overlays which can be used as framebuffers. The remaining overlays are reserved for video. source "drivers/gpu/drm/omapdrm/dss/Kconfig" source "drivers/gpu/drm/omapdrm/displays/Kconfig" + +endif diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig index 574710141a61..2a618afe0f53 100644 --- a/drivers/gpu/drm/omapdrm/displays/Kconfig +++ b/drivers/gpu/drm/omapdrm/displays/Kconfig @@ -1,5 +1,4 @@ -menu "OMAP Display Device Drivers (new device model)" - depends on OMAP2_DSS +menu "OMAPDRM External Display Device Drivers" config DISPLAY_ENCODER_OPA362 tristate "OPA362 external analog amplifier" -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH RFC 9/9] drm/omap: make omapdrm select OMAP2_DSS Date: Thu, 10 Dec 2015 16:25:35 +0200 [thread overview] Message-ID: <1449757535-5674-10-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com> Now that omapdss is only for omapdrm, we can change omapdrm to select OMAP2_DSS to enable omapdss if omapdrm is enabled, instead of omapdrm depending on omapdss. We can also change omapdss and the display drivers to depend on DRM_OMAP, so that they are only visible under omapdrm in menuconfig. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/Kconfig | 7 +++++-- drivers/gpu/drm/omapdrm/displays/Kconfig | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig index 49b5b7df6ba4..336ad4de9981 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 depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM - depends on OMAP2_DSS + select OMAP2_DSS select DRM_KMS_HELPER select DRM_KMS_FB_HELPER select FB_SYS_FILLRECT @@ -13,15 +13,18 @@ config DRM_OMAP help DRM display driver for OMAP2/3/4 based boards. +if DRM_OMAP + config DRM_OMAP_NUM_CRTCS int "Number of CRTCs" range 1 10 default 1 if ARCH_OMAP2 || ARCH_OMAP3 default 2 if ARCH_OMAP4 - depends on DRM_OMAP help Select the number of video overlays which can be used as framebuffers. The remaining overlays are reserved for video. source "drivers/gpu/drm/omapdrm/dss/Kconfig" source "drivers/gpu/drm/omapdrm/displays/Kconfig" + +endif diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig index 574710141a61..2a618afe0f53 100644 --- a/drivers/gpu/drm/omapdrm/displays/Kconfig +++ b/drivers/gpu/drm/omapdrm/displays/Kconfig @@ -1,5 +1,4 @@ -menu "OMAP Display Device Drivers (new device model)" - depends on OMAP2_DSS +menu "OMAPDRM External Display Device Drivers" config DISPLAY_ENCODER_OPA362 tristate "OPA362 external analog amplifier" -- 2.5.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-12-10 14:25 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-10 14:25 [PATCH RFC 0/9] omapdrm/omapfb/omapdss split Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 1/9] omapfb: allow compilation only if DRM_OMAP is disabled Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 2/9] omapfb: copy omapdss & displays for omapfb Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 3/9] omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 4/9] omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP* Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 5/9] omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_* Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 6/9] omapfb: take omapfb's prive omapdss into use Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 7/9] omapfb: move vrfb into omapfb Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-13 19:13 ` Laurent Pinchart 2015-12-13 19:13 ` Laurent Pinchart 2015-12-14 7:14 ` Tomi Valkeinen 2015-12-14 7:14 ` Tomi Valkeinen 2015-12-10 14:25 ` [PATCH RFC 8/9] drm/omap: move omapdss & displays under omapdrm Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen 2015-12-13 19:08 ` Laurent Pinchart 2015-12-13 19:08 ` Laurent Pinchart 2015-12-14 7:12 ` Tomi Valkeinen 2015-12-14 7:12 ` Tomi Valkeinen 2015-12-10 14:25 ` Tomi Valkeinen [this message] 2015-12-10 14:25 ` [PATCH RFC 9/9] drm/omap: make omapdrm select OMAP2_DSS Tomi Valkeinen 2015-12-10 14:53 ` [PATCH RFC 0/9] omapdrm/omapfb/omapdss split Rob Clark 2015-12-10 14:53 ` Rob Clark 2015-12-10 14:58 ` Tomi Valkeinen 2015-12-10 14:58 ` Tomi Valkeinen 2015-12-10 17:00 ` Emil Velikov 2015-12-10 17:00 ` Emil Velikov 2015-12-10 17:15 ` Tomi Valkeinen 2015-12-10 17:15 ` Tomi Valkeinen 2015-12-11 6:14 ` Archit Taneja 2015-12-11 6:26 ` Archit Taneja 2015-12-11 7:57 ` Tomi Valkeinen 2015-12-11 7:57 ` Tomi Valkeinen 2015-12-11 11:32 ` Archit Taneja 2015-12-11 11:44 ` Archit Taneja 2015-12-16 15:52 ` Tomi Valkeinen 2015-12-16 15:52 ` Tomi Valkeinen 2015-12-16 22:11 ` Rob Clark 2015-12-16 22:11 ` Rob Clark 2015-12-17 0:22 ` Dave Airlie 2015-12-17 0:22 ` Dave Airlie
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=1449757535-5674-10-git-send-email-tomi.valkeinen@ti.com \ --to=tomi.valkeinen@ti.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-fbdev@vger.kernel.org \ /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: linkBe 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.