From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [RFC 6/6] drm/sti: Remove local fbdev emulation Kconfig option Date: Tue, 10 Mar 2015 15:11:33 +0530 Message-ID: <1425980493-27533-7-git-send-email-architt@codeaurora.org> References: <1425980493-27533-1-git-send-email-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1425980493-27533-1-git-send-email-architt@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 List-Id: linux-arm-msm@vger.kernel.org RFJNX1NUSV9GQkRFViBjb25maWcgaXMgY3VycmVudGx5IHVzZWQgdG8gZW5hYmxlL2Rpc2FibGUg ZmJkZXYgZW11bGF0aW9uIGZvcgp0aGUgc3RpIGttcyBkcml2ZXIuCgpSZW1vdmUgdGhpcyBsb2Nh bCBjb25maWcgb3B0aW9uIGFuZCB1c2UgdGhlIHRvcCBsZXZlbCBEUk1fRkJERVZfRU1VTEFUSU9O IGNvbmZpZwpvcHRpb24gaW5zdGVhZCB3aGVyZSBhcHBsaWNhYmxlLgoKV2UgcmVwbGFjZSB0aGUg I2lmZGVmIGluIHN0aV9kcm1fbG9hZCB3aXRoIENPTkZJR19EUk1fRkJERVZfRU1VTEFUSU9OLiBJ dCdzCnByb2JhYmx5IG9rYXkgdG8gZ2V0IHJlbW92ZSB0aGUgI2lmZGVmIGl0c2VsZiwgYnV0IGp1 c3QgbGVmdCBpdCBoZXJlIGZvciBub3cgdG8KYmUgc2FmZS4gSXQgY2FuIGJlIHJlbW92ZWQgYWZ0 ZXIgc29tZSB0ZXN0aW5nLgoKU2lnbmVkLW9mZi1ieTogQXJjaGl0IFRhbmVqYSA8YXJjaGl0dEBj b2RlYXVyb3JhLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vc3RpL0tjb25maWcgICAgICAgfCA2 IC0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfZHJtX2Rydi5jIHwgMiArLQogMiBmaWxl cyBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vc3RpL0tjb25maWcgYi9kcml2ZXJzL2dwdS9kcm0vc3RpL0tjb25maWcK aW5kZXggZmJjY2MxMC4uZTNhYTVhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3N0aS9L Y29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvS2NvbmZpZwpAQCAtOSw5ICs5LDMgQEAg Y29uZmlnIERSTV9TVEkKIAlzZWxlY3QgRldfTE9BREVSX1VTRVJfSEVMUEVSX0ZBTExCQUNLCiAJ aGVscAogCSAgQ2hvb3NlIHRoaXMgb3B0aW9uIHRvIGVuYWJsZSBEUk0gb24gU1RNIHN0aUg0MXgg Y2hpcHNldAotCi1jb25maWcgRFJNX1NUSV9GQkRFVgotCWJvb2wgIkRSTSBmcmFtZSBidWZmZXIg ZGV2aWNlIGZvciBTVE1pY3JvZWxlY3Ryb25pY3MgU29DIHN0aUg0MXggU2VyaWUiCi0JZGVwZW5k cyBvbiBEUk1fU1RJCi0JaGVscAotCSAgQ2hvb3NlIHRoaXMgb3B0aW9uIHRvIGVuYWJsZSBGQkRF ViBvbiB0b3Agb2YgRFJNIGZvciBTVE0gc3RpSDQxeCBjaGlwc2V0CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vc3RpL3N0aV9kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vc3RpL3N0aV9k cm1fZHJ2LmMKaW5kZXggNTIzOWZhMS4uOTBmMTIxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3N0aS9zdGlfZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2RybV9k cnYuYwpAQCAtNzYsNyArNzYsNyBAQCBzdGF0aWMgaW50IHN0aV9kcm1fbG9hZChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCiAJZHJtX2hlbHBlcl9kaXNhYmxl X3VudXNlZF9mdW5jdGlvbnMoZGV2KTsKIAotI2lmZGVmIENPTkZJR19EUk1fU1RJX0ZCREVWCisj aWZkZWYgQ09ORklHX0RSTV9GQkRFVl9FTVVMQVRJT04KIAlkcm1fZmJkZXZfY21hX2luaXQoZGV2 LCAzMiwKIAkJICAgZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0YywKIAkJICAgZGV2LT5tb2RlX2Nv bmZpZy5udW1fY29ubmVjdG9yKTsKLS0gClRoZSBRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwg SW5jLiBpcyBhIG1lbWJlciBvZiB0aGUgQ29kZSBBdXJvcmEgRm9ydW0sCmhvc3RlZCBieSBUaGUg TGludXggRm91bmRhdGlvbgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631AbbCJJml (ORCPT ); Tue, 10 Mar 2015 05:42:41 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59276 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751988AbbCJJmG (ORCPT ); Tue, 10 Mar 2015 05:42:06 -0400 From: Archit Taneja To: daniel.vetter@ffwll.ch, robdclark@gmail.com, airlied@linux.ie, treding@nvidia.com, p.zabel@pengutronix.de, benjamin.gaignard@linaro.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Archit Taneja Subject: [RFC 6/6] drm/sti: Remove local fbdev emulation Kconfig option Date: Tue, 10 Mar 2015 15:11:33 +0530 Message-Id: <1425980493-27533-7-git-send-email-architt@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1425980493-27533-1-git-send-email-architt@codeaurora.org> References: <1425980493-27533-1-git-send-email-architt@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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