From: Archit Taneja <architt@codeaurora.org>
To: daniel.vetter@ffwll.ch, robdclark@gmail.com, airlied@linux.ie,
treding@nvidia.com, p.zabel@pengutronix.de,
benjamin.gaignard@linaro.org
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: [RFC 6/6] drm/sti: Remove local fbdev emulation Kconfig option
Date: Tue, 10 Mar 2015 15:11:33 +0530 [thread overview]
Message-ID: <1425980493-27533-7-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1425980493-27533-1-git-send-email-architt@codeaurora.org>
DRM_STI_FBDEV config is currently used to enable/disable fbdev emulation for
the sti kms driver.
Remove this local config option and use the top level DRM_FBDEV_EMULATION config
option instead where applicable.
We replace the #ifdef in sti_drm_load with CONFIG_DRM_FBDEV_EMULATION. It's
probably okay to get remove the #ifdef itself, but just left it here for now to
be safe. It can be removed after some testing.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/sti/Kconfig | 6 ------
drivers/gpu/drm/sti/sti_drm_drv.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index fbccc10..e3aa5af 100644
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -9,9 +9,3 @@ config DRM_STI
select FW_LOADER_USER_HELPER_FALLBACK
help
Choose this option to enable DRM on STM stiH41x chipset
-
-config DRM_STI_FBDEV
- bool "DRM frame buffer device for STMicroelectronics SoC stiH41x Serie"
- depends on DRM_STI
- help
- Choose this option to enable FBDEV on top of DRM for STM stiH41x chipset
diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c b/drivers/gpu/drm/sti/sti_drm_drv.c
index 5239fa1..90f121d 100644
--- a/drivers/gpu/drm/sti/sti_drm_drv.c
+++ b/drivers/gpu/drm/sti/sti_drm_drv.c
@@ -76,7 +76,7 @@ static int sti_drm_load(struct drm_device *dev, unsigned long flags)
drm_helper_disable_unused_functions(dev);
-#ifdef CONFIG_DRM_STI_FBDEV
+#ifdef CONFIG_DRM_FBDEV_EMULATION
drm_fbdev_cma_init(dev, 32,
dev->mode_config.num_crtc,
dev->mode_config.num_connector);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-03-10 9:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 9:41 [RFC 0/6] drm: Add DRM_FBDEV_EMULATION Kconfig option Archit Taneja
2015-03-10 9:41 ` [RFC 1/6] drm: Add top level Kconfig option for DRM fbdev emulation Archit Taneja
2015-03-10 9:46 ` Daniel Vetter
2015-03-10 9:54 ` Archit Taneja
2015-03-10 9:47 ` Daniel Vetter
2015-03-10 9:52 ` Archit Taneja
2015-03-10 10:05 ` Daniel Vetter
2015-03-10 10:22 ` Archit Taneja
2015-03-10 12:17 ` Daniel Vetter
2015-03-11 8:21 ` Archit Taneja
2015-03-11 15:17 ` Daniel Vetter
2015-03-13 6:25 ` Archit Taneja
2015-03-13 9:06 ` Daniel Vetter
2015-03-13 9:46 ` Jani Nikula
2015-03-13 11:00 ` Archit Taneja
2015-03-25 8:17 ` Archit Taneja
2015-03-25 9:21 ` Daniel Vetter
2015-06-30 7:10 ` Daniel Vetter
2015-06-30 7:56 ` Archit Taneja
2015-06-30 8:31 ` Benjamin Gaignard
2015-06-30 9:04 ` Daniel Vetter
2015-07-03 12:32 ` Thierry Reding
2015-07-03 13:33 ` Rob Clark
2015-06-30 9:06 ` Archit Taneja
2015-03-10 15:33 ` Jani Nikula
2015-03-11 4:57 ` Archit Taneja
2015-03-10 9:41 ` [RFC 2/6] drm/msm: Remove local fbdev emulation Kconfig option Archit Taneja
2015-03-10 9:41 ` [RFC 3/6] drm/i915: " Archit Taneja
2015-03-10 10:01 ` Daniel Vetter
2015-03-10 10:10 ` Archit Taneja
2015-03-10 9:41 ` [RFC 4/6] drm/tegra: " Archit Taneja
2015-03-10 9:41 ` [RFC 5/6] drm/imx: " Archit Taneja
2015-03-10 10:54 ` Philipp Zabel
2015-03-11 4:53 ` Archit Taneja
2015-03-10 9:41 ` Archit Taneja [this message]
2015-03-11 14:12 ` [RFC 6/6] drm/sti: " Benjamin Gaignard
2015-07-13 6:42 ` [RFC v2 0/6] drm: fb emulation: Step 2: Create a fbdev emulation config option Archit Taneja
2015-07-13 7:15 ` Daniel Vetter
2015-08-05 6:58 ` [PATCH v3] drm: Add top level Kconfig option for DRM fbdev emulation Archit Taneja
2015-07-13 6:42 ` [RFC v2 1/6] " Archit Taneja
2015-07-13 6:59 ` Daniel Vetter
2015-07-13 6:42 ` [RFC v2 2/6] drm/msm: Remove local fbdev emulation Kconfig option Archit Taneja
2015-07-13 6:42 ` [RFC v2 3/6] drm/tegra: " Archit Taneja
2015-07-13 6:42 ` [RFC v2 4/6] drm/imx: " Archit Taneja
2015-07-13 6:42 ` [RFC v2 5/6] drm/sti: " Archit Taneja
2015-07-13 6:42 ` [RFC v2 6/6] drm/i915: " Archit Taneja
2015-07-13 7:10 ` Daniel Vetter
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=1425980493-27533-7-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=airlied@linux.ie \
--cc=benjamin.gaignard@linaro.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=robdclark@gmail.com \
--cc=treding@nvidia.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).