From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled Date: Thu, 07 May 2015 13:43:30 +0530 Message-ID: <554B1EAA.2010504@codeaurora.org> References: <1430918732-15895-1-git-send-email-sviau@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Rob Clark , Stephane Viau Cc: linux-arm-msm , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" List-Id: linux-arm-msm@vger.kernel.org SGksCgpPbiAwNS8wNi8yMDE1IDA3OjU4IFBNLCBSb2IgQ2xhcmsgd3JvdGU6Cj4gT24gV2VkLCBN YXkgNiwgMjAxNSBhdCA5OjI1IEFNLCBTdGVwaGFuZSBWaWF1IDxzdmlhdUBjb2RlYXVyb3JhLm9y Zz4gd3JvdGU6Cj4+IFdoZW4gQ09ORklHX0RSTV9NU01fRkJERVYgaXMgbm90IGRlZmluZWQsCj4+ IENPTkZJR19EUk1fS01TX0ZCX0hFTFBFUiBkb2VzIG5vdCBnZXQgc2VsZWN0ZWQgYW5kCj4+IGRy bV9mYl9oZWxwZXJfKigpIGhlbHBlciBmdW5jdGlvbnMgYXJlIHRodXMgbm90IGF2YWlsYWJsZS4K Pj4KPj4gVGhpcyBjaGFuZ2UgZml4ZXMgdGhlc2UgbGluayBpc3N1ZXMuCj4KPiBIbW0sIGRpZG4n dCBBcmNoaXQgc3RhcnQgb24gbWFraW5nIGZiZGV2IGNvbmZpZyBvcHRpb24gZ2xvYmFsIGFuZAo+ IGFkZGluZyBub3Atc3R1YnMgZm9yIHRoZSBjYXNlIHRoYXQgaXQgd2FzIGRpc2FibGVkPyAgSSBs b3N0IHRyYWNrIG9mCj4gd2hlcmUgdGhhdCB3YXMgZ29pbmcuLgoKRGFuaWVsIGFuZCBJIGhhZCB0 aG91Z2h0IG9mIGEgcG9zc2libGUgc29sdXRpb24uIEkgaGFkIHN0YXJ0ZWQgd29ya2luZwpvbiBp dCwgYnV0IGl0J3Mgc3RpbGwgd29yayBpbiBwcm9ncmVzcy4gSXQgcmVxdWlyZWQgbW9yZSB0aGlu Z3MgdG8gZG8KdGhhbiBvcmlnaW5hbGx5IHRob3VnaHQgb2YuCgpJIGRvbid0IGtub3cgaWYgdGhh dCB3b3JrIHdpbGwgbWFrZSBpdCBpbiB0aW1lIGZvciA0LjIuIE1heWJlIHdlIGNvdWxkCnB1bGwg dGhpcyBmb3IgdGhlIHRpbWUgYmVpbmc/CgpBcmNoaXQKCj4KPiBCUiwKPiAtUgo+Cj4+IFNpZ25l ZC1vZmYtYnk6IFN0ZXBoYW5lIFZpYXUgPHN2aWF1QGNvZGVhdXJvcmEub3JnPgo+PiAtLS0KPj4g ICBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYyB8IDQgKysrKwo+PiAgIDEgZmlsZSBjaGFu Z2VkLCA0IGluc2VydGlvbnMoKykKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9t c20vbXNtX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKPj4gaW5kZXggMmIx MjE4Yy4uMzUzODBlYyAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2 LmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKPj4gQEAgLTIxLDkgKzIx LDExIEBACj4+Cj4+ICAgc3RhdGljIHZvaWQgbXNtX2ZiX291dHB1dF9wb2xsX2NoYW5nZWQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKPj4gICB7Cj4+ICsjaWZkZWYgRFJNX01TTV9GQkRFVgo+PiAg ICAgICAgICBzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK Pj4gICAgICAgICAgaWYgKHByaXYtPmZiZGV2KQo+PiAgICAgICAgICAgICAgICAgIGRybV9mYl9o ZWxwZXJfaG90cGx1Z19ldmVudChwcml2LT5mYmRldik7Cj4+ICsjZW5kaWYKPj4gICB9Cj4+Cj4+ ICAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3MgbW9kZV9jb25maWdf ZnVuY3MgPSB7Cj4+IEBAIC00MTksOSArNDIxLDExIEBAIHN0YXRpYyB2b2lkIG1zbV9wcmVjbG9z ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCj4+Cj4+ICAg c3RhdGljIHZvaWQgbXNtX2xhc3RjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+PiAgIHsK Pj4gKyNpZmRlZiBEUk1fTVNNX0ZCREVWCj4+ICAgICAgICAgIHN0cnVjdCBtc21fZHJtX3ByaXZh dGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+PiAgICAgICAgICBpZiAocHJpdi0+ZmJkZXYp Cj4+ICAgICAgICAgICAgICAgICAgZHJtX2ZiX2hlbHBlcl9yZXN0b3JlX2ZiZGV2X21vZGVfdW5s b2NrZWQocHJpdi0+ZmJkZXYpOwo+PiArI2VuZGlmCj4+ICAgfQo+Pgo+PiAgIHN0YXRpYyBpcnFy ZXR1cm5fdCBtc21faXJxKGludCBpcnEsIHZvaWQgKmFyZykKPj4gLS0KPj4gUXVhbGNvbW0gSW5u b3ZhdGlvbiBDZW50ZXIsIEluYy4KPj4KPj4gVGhlIFF1YWxjb21tIElubm92YXRpb24gQ2VudGVy LCBJbmMuIGlzIGEgbWVtYmVyIG9mIHRoZSBDb2RlIEF1cm9yYSBGb3J1bSwgYSBMaW51eCBGb3Vu ZGF0aW9uIENvbGxhYm9yYXRpdmUgUHJvamVjdAo+Pgo+IC0tCj4gVG8gdW5zdWJzY3JpYmUgZnJv bSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWFybS1tc20iIGlu Cj4gdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKPiBN b3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1p bmZvLmh0bWwKPgoKLS0gClF1YWxjb21tIElubm92YXRpb24gQ2VudGVyLCBJbmMuIGlzIGEgbWVt YmVyIG9mIENvZGUgQXVyb3JhIEZvcnVtLAphIExpbnV4IEZvdW5kYXRpb24gQ29sbGFib3JhdGl2 ZSBQcm9qZWN0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751057AbbEGINm (ORCPT ); Thu, 7 May 2015 04:13:42 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42599 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbbEGINg (ORCPT ); Thu, 7 May 2015 04:13:36 -0400 Message-ID: <554B1EAA.2010504@codeaurora.org> Date: Thu, 07 May 2015 13:43:30 +0530 From: Archit Taneja User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Rob Clark , Stephane Viau CC: "dri-devel@lists.freedesktop.org" , linux-arm-msm , Linux Kernel Mailing List , daniel@ffwll.ch Subject: Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled References: <1430918732-15895-1-git-send-email-sviau@codeaurora.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 05/06/2015 07:58 PM, Rob Clark wrote: > On Wed, May 6, 2015 at 9:25 AM, Stephane Viau wrote: >> When CONFIG_DRM_MSM_FBDEV is not defined, >> CONFIG_DRM_KMS_FB_HELPER does not get selected and >> drm_fb_helper_*() helper functions are thus not available. >> >> This change fixes these link issues. > > Hmm, didn't Archit start on making fbdev config option global and > adding nop-stubs for the case that it was disabled? I lost track of > where that was going.. Daniel and I had thought of a possible solution. I had started working on it, but it's still work in progress. It required more things to do than originally thought of. I don't know if that work will make it in time for 4.2. Maybe we could pull this for the time being? Archit > > BR, > -R > >> Signed-off-by: Stephane Viau >> --- >> drivers/gpu/drm/msm/msm_drv.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c >> index 2b1218c..35380ec 100644 >> --- a/drivers/gpu/drm/msm/msm_drv.c >> +++ b/drivers/gpu/drm/msm/msm_drv.c >> @@ -21,9 +21,11 @@ >> >> static void msm_fb_output_poll_changed(struct drm_device *dev) >> { >> +#ifdef DRM_MSM_FBDEV >> struct msm_drm_private *priv = dev->dev_private; >> if (priv->fbdev) >> drm_fb_helper_hotplug_event(priv->fbdev); >> +#endif >> } >> >> static const struct drm_mode_config_funcs mode_config_funcs = { >> @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file) >> >> static void msm_lastclose(struct drm_device *dev) >> { >> +#ifdef DRM_MSM_FBDEV >> struct msm_drm_private *priv = dev->dev_private; >> if (priv->fbdev) >> drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev); >> +#endif >> } >> >> static irqreturn_t msm_irq(int irq, void *arg) >> -- >> Qualcomm Innovation Center, Inc. >> >> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project