From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2 1/2] drm: move i915_kick_out_vgacon to drm_fb_helper Date: Thu, 21 Feb 2019 16:41:56 +0200 Message-ID: <877edttd8r.fsf@intel.com> References: <20190221113534.20764-1-kraxel@redhat.com> <20190221113534.20764-2-kraxel@redhat.com> <87ef81thk8.fsf@intel.com> <20190221132528.7cyobqegunh6uoh2@sirius.home.kraxel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190221132528.7cyobqegunh6uoh2@sirius.home.kraxel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gerd Hoffmann Cc: Maxime Ripard , "open list:INTEL DRM DRIVERS (excluding Poulsbo, Moorestow..." , open list , dri-devel@lists.freedesktop.org, David Airlie , Rodrigo Vivi , Sean Paul List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAyMSBGZWIgMjAxOSwgR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+IHdy b3RlOgo+IE9uIFRodSwgRmViIDIxLCAyMDE5IGF0IDAzOjA4OjM5UE0gKzAyMDAsIEphbmkgTmlr dWxhIHdyb3RlOgo+PiBPbiBUaHUsIDIxIEZlYiAyMDE5LCBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxA cmVkaGF0LmNvbT4gd3JvdGU6Cj4+ID4gSXQnbGwgYmUgdXNlZnVsIGZvciBvdGhlciBkcml2ZXJz IHRvbywgc28gbW92ZSBpdCB0byBkcm1fZmJfaGVscGVyLmMKPj4gPiAoYW5kIHJlbmFtZSBpdCBv ZiBjb3Vyc2UpLiAgQWxzbyBhZGQgZG9jcy4KPj4gPgo+PiA+IFNpZ25lZC1vZmYtYnk6IEdlcmQg SG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgo+PiA+IC0tLQo+PiA+ICBpbmNsdWRlL2RybS9k cm1fZmJfaGVscGVyLmggICAgIHwgIDIgKysKPj4gPiAgZHJpdmVycy9ncHUvZHJtL2RybV9mYl9o ZWxwZXIuYyB8IDM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+PiA+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMzUgKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KPj4gPiAgMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCsp LCAzNCBkZWxldGlvbnMoLSkKPj4gPgo+PiA+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1f ZmJfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVyLmgKPj4gPiBpbmRleCBiYjlh Y2VhNjEzLi5hNDAxYmE0N2FkIDEwMDY0NAo+PiA+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9mYl9o ZWxwZXIuaAo+PiA+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAo+PiA+IEBAIC02 NDksNCArNjQ5LDYgQEAgZHJtX2ZiX2hlbHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1l YnVmZmVycyhzdHJ1Y3QgcGNpX2RldiAqcGRldiwKPj4gPiAgI2VuZGlmCj4+ID4gIH0KPj4gPiAg Cj4+ID4gK2ludCBkcm1fZmJfaGVscGVyX2tpY2tfb3V0X3ZnYWNvbih2b2lkKTsKPj4gPiArCj4+ ID4gICNlbmRpZgo+PiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwo+PiA+IGluZGV4IDBlOTM0OWZm MmQuLmEyZDdlNWJjNTEgMTAwNjQ0Cj4+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9o ZWxwZXIuYwo+PiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPj4gPiBA QCAtMzUsNiArMzUsNyBAQAo+PiA+ICAjaW5jbHVkZSA8bGludXgvc3lzcnEuaD4KPj4gPiAgI2lu Y2x1ZGUgPGxpbnV4L3NsYWIuaD4KPj4gPiAgI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgo+PiA+ ICsjaW5jbHVkZSA8bGludXgvdnRfa2Vybi5oPgo+PiA+ICAjaW5jbHVkZSA8ZHJtL2RybVAuaD4K Pj4gPiAgI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5oPgo+PiA+ICAjaW5jbHVkZSA8ZHJtL2RybV9m Yl9oZWxwZXIuaD4KPj4gPiBAQCAtMzM1MywzICszMzU0LDQxIEBAIGludCBfX2luaXQgZHJtX2Zi X2hlbHBlcl9tb2Rpbml0KHZvaWQpCj4+ID4gIAlyZXR1cm4gMDsKPj4gPiAgfQo+PiA+ICBFWFBP UlRfU1lNQk9MKGRybV9mYl9oZWxwZXJfbW9kaW5pdCk7Cj4+ID4gKwo+PiA+ICsvKioKPj4gPiAr ICogZHJtX2ZiX2hlbHBlcl9raWNrX291dF92Z2Fjb24gLSBkZWFjdGl2YXRlIHZnYWNvbiBkcml2 ZXIuCj4+ID4gKyAqCj4+ID4gKyAqIERlYWN0aXZhdGUgdmdhY29uIGRyaXZlciBzbyBpdCBzdG9w cyBhY2Nlc3NpbmcgdmdhIGlvIHBvcnRzLgo+PiA+ICsgKiBTaG91bGQgYmUgY2FsbGVkIGFmdGVy Cj4+ID4gKyAqIGRybV9mYl9oZWxwZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZl cnMoKS4KPj4gPiArICoKPj4gPiArICogUmV0dXJuczoKPj4gPiArICogWmVybyBvbiBzdWNjZXNz IG9yIG5lZ2F0aXZlIGVycm9yIGNvZGUgb24gZmFpbHVyZS4KPj4gPiArICovCj4+ID4gK2ludCBk cm1fZmJfaGVscGVyX2tpY2tfb3V0X3ZnYWNvbih2b2lkKQo+PiA+ICt7Cj4+ID4gKyNpZiAhZGVm aW5lZChDT05GSUdfVkdBX0NPTlNPTEUpCj4+ID4gKyAgICAgICAgcmV0dXJuIDA7Cj4+ID4gKyNl bGlmICFkZWZpbmVkKENPTkZJR19EVU1NWV9DT05TT0xFKQo+PiA+ICsgICAgICAgIHJldHVybiAt RU5PREVWOwo+PiA+ICsjZWxzZQo+PiAKPj4gUGxlYXNlIHJldGFpbiB0aGUgb3JpZ2luYWwgd2F5 IG9mIGtlZXBpbmcgY29uZGl0aW9uYWwgY29tcGlsYXRpb24KPj4gb3V0c2lkZSBvZiBmdW5jdGlv bnMuCj4KPiBDYXJlIHRvIGV4cGxhaW4gd2h5IHRoYXQgaXMgYmV0dGVyPwoKUHJldmFsZW50IGFu ZCBkb2N1bWVudGVkIFsxXSBrZXJuZWwgY29kaW5nIHN0eWxlLiBJdCdzIGVhc2llciB0byBzZWUK d2hhdCBoYXBwZW5zIGluIGVhY2ggYnJhbmNoLCBhbmQgdGhlIGNvbXBpbGVyIHRocm93cyB0aGUg YWx0ZXJuYXRpdmVzCmF3YXkgYW55d2F5LgoKUGF0Y2hlcyB0aGF0IGRvIGNvZGUgbW92ZW1lbnQg c2hvdWxkIGZvY3VzIG9uIGNvZGUgbW92ZW1lbnQuIEFueQphZGRpdGlvbmFsIGNoYW5nZXMgc2hv dWxkIGJlIHNlcGFyYXRlLCBhbmQganVzdGlmaWVkIHNlcGFyYXRlbHkuIFRoZQpmdW5jdGlvbiBy ZW5hbWUgYW5kIGRvY3VtZW50YXRpb24gYXJlIG9mIGNvdXJzZSBva2F5LCBhbmQgdGhleSdyZQpt ZW50aW9uZWQgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIGFzIHRoZXkgc2hvdWxkLgoKQlIsCkphbmku CgoKWzFdIERvY3VtZW50YXRpb24vcHJvY2Vzcy9jb2Rpbmctc3R5bGUucnN0CgotLSAKSmFuaSBO aWt1bGEsIEludGVsIE9wZW4gU291cmNlIEdyYXBoaWNzIENlbnRlcgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7CBDC43381 for ; Thu, 21 Feb 2019 14:40:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAC712080D for ; Thu, 21 Feb 2019 14:40:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729050AbfBUOkE (ORCPT ); Thu, 21 Feb 2019 09:40:04 -0500 Received: from mga02.intel.com ([134.134.136.20]:40844 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728519AbfBUOjx (ORCPT ); Thu, 21 Feb 2019 09:39:53 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2019 06:39:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,395,1544515200"; d="scan'208";a="148703451" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.172]) by fmsmga001.fm.intel.com with ESMTP; 21 Feb 2019 06:39:48 -0800 From: Jani Nikula To: Gerd Hoffmann Cc: dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Joonas Lahtinen , Rodrigo Vivi , open list , "open list\:INTEL DRM DRIVERS \(excluding Poulsbo\, Moorestow..." Subject: Re: [PATCH v2 1/2] drm: move i915_kick_out_vgacon to drm_fb_helper In-Reply-To: <20190221132528.7cyobqegunh6uoh2@sirius.home.kraxel.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20190221113534.20764-1-kraxel@redhat.com> <20190221113534.20764-2-kraxel@redhat.com> <87ef81thk8.fsf@intel.com> <20190221132528.7cyobqegunh6uoh2@sirius.home.kraxel.org> Date: Thu, 21 Feb 2019 16:41:56 +0200 Message-ID: <877edttd8r.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 21 Feb 2019, Gerd Hoffmann wrote: > On Thu, Feb 21, 2019 at 03:08:39PM +0200, Jani Nikula wrote: >> On Thu, 21 Feb 2019, Gerd Hoffmann wrote: >> > It'll be useful for other drivers too, so move it to drm_fb_helper.c >> > (and rename it of course). Also add docs. >> > >> > Signed-off-by: Gerd Hoffmann >> > --- >> > include/drm/drm_fb_helper.h | 2 ++ >> > drivers/gpu/drm/drm_fb_helper.c | 39 +++++++++++++++++++++++++++++++++++++++ >> > drivers/gpu/drm/i915/i915_drv.c | 35 +---------------------------------- >> > 3 files changed, 42 insertions(+), 34 deletions(-) >> > >> > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h >> > index bb9acea613..a401ba47ad 100644 >> > --- a/include/drm/drm_fb_helper.h >> > +++ b/include/drm/drm_fb_helper.h >> > @@ -649,4 +649,6 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, >> > #endif >> > } >> > >> > +int drm_fb_helper_kick_out_vgacon(void); >> > + >> > #endif >> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c >> > index 0e9349ff2d..a2d7e5bc51 100644 >> > --- a/drivers/gpu/drm/drm_fb_helper.c >> > +++ b/drivers/gpu/drm/drm_fb_helper.c >> > @@ -35,6 +35,7 @@ >> > #include >> > #include >> > #include >> > +#include >> > #include >> > #include >> > #include >> > @@ -3353,3 +3354,41 @@ int __init drm_fb_helper_modinit(void) >> > return 0; >> > } >> > EXPORT_SYMBOL(drm_fb_helper_modinit); >> > + >> > +/** >> > + * drm_fb_helper_kick_out_vgacon - deactivate vgacon driver. >> > + * >> > + * Deactivate vgacon driver so it stops accessing vga io ports. >> > + * Should be called after >> > + * drm_fb_helper_remove_conflicting_pci_framebuffers(). >> > + * >> > + * Returns: >> > + * Zero on success or negative error code on failure. >> > + */ >> > +int drm_fb_helper_kick_out_vgacon(void) >> > +{ >> > +#if !defined(CONFIG_VGA_CONSOLE) >> > + return 0; >> > +#elif !defined(CONFIG_DUMMY_CONSOLE) >> > + return -ENODEV; >> > +#else >> >> Please retain the original way of keeping conditional compilation >> outside of functions. > > Care to explain why that is better? Prevalent and documented [1] kernel coding style. It's easier to see what happens in each branch, and the compiler throws the alternatives away anyway. Patches that do code movement should focus on code movement. Any additional changes should be separate, and justified separately. The function rename and documentation are of course okay, and they're mentioned in the commit message as they should. BR, Jani. [1] Documentation/process/coding-style.rst -- Jani Nikula, Intel Open Source Graphics Center