From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [RFC 2/6] drm/msm: Remove local fbdev emulation Kconfig option Date: Tue, 10 Mar 2015 15:11:29 +0530 Message-ID: <1425980493-27533-3-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 RFJNX01TTV9GQkRFViBjb25maWcgaXMgdXNlZCB0byBlbmFibGUvZGlzYWJsZSBmYmRldiBlbXVs YXRpb24gZm9yIHRoZSBtc20ga21zCmRyaXZlci4KClJlcGxhY2UgdGhpcyB3aXRoIHRoZSB0b3Ag bGV2ZWwgRFJNX0ZCREVWX0VNVUxBVElPTiBjb25maWcgb3B0aW9uIHdoZXJlCmFwcGxpY2FibGUu IFRoaXMgYWxzbyBwcmV2ZW50cyBidWlsZCBicmVha3MgY2F1c2VkIGJ5IHVuZGVmaW5lZCBkcm1f ZmJfaGVscGVyXyoKZnVuY3Rpb25zIHdoZW4gbGVnYWN5IGZiZGV2IHN1cHBvcnQgd2FzIGRpc2Fi bGVkLgoKU2lnbmVkLW9mZi1ieTogQXJjaGl0IFRhbmVqYSA8YXJjaGl0dEBjb2RlYXVyb3JhLm9y Zz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL0tjb25maWcgICB8IDE0IC0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vbXNtL01ha2VmaWxlICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9kcnYuYyB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCsp LCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL0tjb25m aWcgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL0tjb25maWcKaW5kZXggYmFjYmJiNy4uZDZmM2E0ZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9LY29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9tc20vS2NvbmZpZwpAQCAtMTMsMjAgKzEzLDYgQEAgY29uZmlnIERSTV9NU00KIAloZWxw CiAJICBEUk0vS01TIGRyaXZlciBmb3IgTVNNL3NuYXBkcmFnb24uCiAKLWNvbmZpZyBEUk1fTVNN X0ZCREVWCi0JYm9vbCAiRW5hYmxlIGxlZ2FjeSBmYmRldiBzdXBwb3J0IGZvciBNU00gbW9kZXNl dHRpbmcgZHJpdmVyIgotCWRlcGVuZHMgb24gRFJNX01TTQotCXNlbGVjdCBEUk1fS01TX0ZCX0hF TFBFUgotCXNlbGVjdCBGQl9TWVNfRklMTFJFQ1QKLQlzZWxlY3QgRkJfU1lTX0NPUFlBUkVBCi0J c2VsZWN0IEZCX1NZU19JTUFHRUJMSVQKLQlzZWxlY3QgRkJfU1lTX0ZPUFMKLQlkZWZhdWx0IHkK LQloZWxwCi0JICBDaG9vc2UgdGhpcyBvcHRpb24gaWYgeW91IGhhdmUgYSBuZWVkIGZvciB0aGUg bGVnYWN5IGZiZGV2Ci0JICBzdXBwb3J0LiBOb3RlIHRoYXQgdGhpcyBzdXBwb3J0IGFsc28gcHJv dmlkZSB0aGUgbGludXggY29uc29sZQotCSAgc3VwcG9ydCBvbiB0b3Agb2YgdGhlIE1TTSBtb2Rl c2V0dGluZyBkcml2ZXIuCi0KIGNvbmZpZyBEUk1fTVNNX1JFR0lTVEVSX0xPR0dJTkcKIAlib29s ICJNU00gRFJNIHJlZ2lzdGVyIGxvZ2dpbmciCiAJZGVwZW5kcyBvbiBEUk1fTVNNCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL21zbS9N YWtlZmlsZQppbmRleCA2NzRhMTMyLi40MDcyNmFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vbXNtL01ha2VmaWxlCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vTWFrZWZpbGUKQEAgLTQ4 LDcgKzQ4LDcgQEAgbXNtLXkgOj0gXAogCW1zbV9yZC5vIFwKIAltc21fcmluZ2J1ZmZlci5vCiAK LW1zbS0kKENPTkZJR19EUk1fTVNNX0ZCREVWKSArPSBtc21fZmJkZXYubworbXNtLSQoQ09ORklH X0RSTV9GQkRFVl9FTVVMQVRJT04pICs9IG1zbV9mYmRldi5vCiBtc20tJChDT05GSUdfQ09NTU9O X0NMSykgKz0gbWRwL21kcDQvbWRwNF9sdmRzX3BsbC5vCiAKIG9iai0kKENPTkZJR19EUk1fTVNN KQkrPSBtc20ubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYwppbmRleCBhNDI2OTExLi5kM2U4MTZhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vbXNtL21zbV9kcnYuYwpAQCAtNTQsNyArNTQsNyBAQCBtb2R1bGVfcGFyYW0ocmVnbG9nLCBi b29sLCAwNjAwKTsKICNkZWZpbmUgcmVnbG9nIDAKICNlbmRpZgogCi0jaWZkZWYgQ09ORklHX0RS TV9NU01fRkJERVYKKyNpZmRlZiBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElPTgogc3RhdGljIGJv b2wgZmJkZXYgPSB0cnVlOwogTU9EVUxFX1BBUk1fREVTQyhmYmRldiwgIkVuYWJsZSBmYmRldiBj b21wYXQgbGF5ZXIiKTsKIG1vZHVsZV9wYXJhbShmYmRldiwgYm9vbCwgMDYwMCk7CkBAIC0zMDUs NyArMzA1LDcgQEAgc3RhdGljIGludCBtc21fbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 bnNpZ25lZCBsb25nIGZsYWdzKQogCiAJZHJtX21vZGVfY29uZmlnX3Jlc2V0KGRldik7CiAKLSNp ZmRlZiBDT05GSUdfRFJNX01TTV9GQkRFVgorI2lmZGVmIENPTkZJR19EUk1fRkJERVZfRU1VTEFU SU9OCiAJaWYgKGZiZGV2KQogCQlwcml2LT5mYmRldiA9IG1zbV9mYmRldl9pbml0KGRldik7CiAj ZW5kaWYKLS0gClRoZSBRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwgSW5jLiBpcyBhIG1lbWJl ciBvZiB0aGUgQ29kZSBBdXJvcmEgRm9ydW0sCmhvc3RlZCBieSBUaGUgTGludXggRm91bmRhdGlv bgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752742AbbCJJnb (ORCPT ); Tue, 10 Mar 2015 05:43:31 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59205 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbbCJJls (ORCPT ); Tue, 10 Mar 2015 05:41:48 -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 2/6] drm/msm: Remove local fbdev emulation Kconfig option Date: Tue, 10 Mar 2015 15:11:29 +0530 Message-Id: <1425980493-27533-3-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_MSM_FBDEV config is used to enable/disable fbdev emulation for the msm kms driver. Replace this with the top level DRM_FBDEV_EMULATION config option where applicable. This also prevents build breaks caused by undefined drm_fb_helper_* functions when legacy fbdev support was disabled. Signed-off-by: Archit Taneja --- drivers/gpu/drm/msm/Kconfig | 14 -------------- drivers/gpu/drm/msm/Makefile | 2 +- drivers/gpu/drm/msm/msm_drv.c | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index bacbbb7..d6f3a4f 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -13,20 +13,6 @@ config DRM_MSM help DRM/KMS driver for MSM/snapdragon. -config DRM_MSM_FBDEV - bool "Enable legacy fbdev support for MSM modesetting driver" - depends on DRM_MSM - select DRM_KMS_FB_HELPER - select FB_SYS_FILLRECT - select FB_SYS_COPYAREA - select FB_SYS_IMAGEBLIT - select FB_SYS_FOPS - default y - help - Choose this option if you have a need for the legacy fbdev - support. Note that this support also provide the linux console - support on top of the MSM modesetting driver. - config DRM_MSM_REGISTER_LOGGING bool "MSM DRM register logging" depends on DRM_MSM diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 674a132..40726ad 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -48,7 +48,7 @@ msm-y := \ msm_rd.o \ msm_ringbuffer.o -msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o +msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o obj-$(CONFIG_DRM_MSM) += msm.o diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index a426911..d3e816a 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -54,7 +54,7 @@ module_param(reglog, bool, 0600); #define reglog 0 #endif -#ifdef CONFIG_DRM_MSM_FBDEV +#ifdef CONFIG_DRM_FBDEV_EMULATION static bool fbdev = true; MODULE_PARM_DESC(fbdev, "Enable fbdev compat layer"); module_param(fbdev, bool, 0600); @@ -305,7 +305,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags) drm_mode_config_reset(dev); -#ifdef CONFIG_DRM_MSM_FBDEV +#ifdef CONFIG_DRM_FBDEV_EMULATION if (fbdev) priv->fbdev = msm_fbdev_init(dev); #endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation