From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Date: Thu, 13 Jul 2017 14:47:53 +0000 Subject: Re: [PATCH 1/4] fbcon: Make fbcon a built-time depency for fbdev Message-Id: <20170713144753.n344ilasywtsqfxi@art_vandelay> List-Id: References: <20170706125735.28299-1-daniel.vetter@ffwll.ch> <20170706125735.28299-2-daniel.vetter@ffwll.ch> In-Reply-To: <20170706125735.28299-2-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daniel Vetter Cc: linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Bartlomiej Zolnierkiewicz , Intel Graphics Development , Steven Rostedt , DRI Development , Daniel Vetter , Alan Cox On Thu, Jul 06, 2017 at 02:57:32PM +0200, Daniel Vetter wrote: > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Daniel Vetter Just 2 nits, code looks good. Reviewed-by: Sean Paul > --- > v2: Switch to building fbcon code into fb.ko right away because the > cheap trick leads to a module depency loop. > --- > drivers/video/console/Kconfig | 2 +- > drivers/video/console/Makefile | 8 -------- > drivers/video/fbdev/core/Makefile | 11 +++++++++++ > drivers/video/{console => fbdev/core}/bitblit.c | 4 ---- > drivers/video/{console => fbdev/core}/fbcon.c | 13 +++---------- > drivers/video/{console => fbdev/core}/fbcon.h | 0 > drivers/video/{console => fbdev/core}/fbcon_ccw.c | 4 ---- > drivers/video/{console => fbdev/core}/fbcon_cw.c | 4 ---- > drivers/video/{console => fbdev/core}/fbcon_rotate.c | 4 ---- > drivers/video/{console => fbdev/core}/fbcon_rotate.h | 0 > drivers/video/{console => fbdev/core}/fbcon_ud.c | 4 ---- > drivers/video/fbdev/core/fbmem.c | 6 ++++++ > drivers/video/{console => fbdev/core}/softcursor.c | 4 ---- > drivers/video/{console => fbdev/core}/tileblit.c | 5 ----- > include/linux/fbcon.h | 12 ++++++++++++ > 15 files changed, 33 insertions(+), 48 deletions(-) > rename drivers/video/{console => fbdev/core}/bitblit.c (98%) > rename drivers/video/{console => fbdev/core}/fbcon.c (99%) > rename drivers/video/{console => fbdev/core}/fbcon.h (100%) > rename drivers/video/{console => fbdev/core}/fbcon_ccw.c (98%) > rename drivers/video/{console => fbdev/core}/fbcon_cw.c (98%) > rename drivers/video/{console => fbdev/core}/fbcon_rotate.c (95%) > rename drivers/video/{console => fbdev/core}/fbcon_rotate.h (100%) > rename drivers/video/{console => fbdev/core}/fbcon_ud.c (98%) > rename drivers/video/{console => fbdev/core}/softcursor.c (93%) > rename drivers/video/{console => fbdev/core}/tileblit.c (96%) > create mode 100644 include/linux/fbcon.h > > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 2111d06f8c81..7f1f1fbcef9e 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -117,7 +117,7 @@ config DUMMY_CONSOLE_ROWS > Select 25 if you use a 640x480 resolution by default. > > config FRAMEBUFFER_CONSOLE > - tristate "Framebuffer Console support" > + bool "Framebuffer Console support" > depends on FB && !UML > select VT_HW_CONSOLE_BINDING > select CRC32 > diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile > index 43bfa485db96..eb2cbec52643 100644 > --- a/drivers/video/console/Makefile > +++ b/drivers/video/console/Makefile > @@ -7,13 +7,5 @@ obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o > obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o > obj-$(CONFIG_VGA_CONSOLE) += vgacon.o > obj-$(CONFIG_MDA_CONSOLE) += mdacon.o > -obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o softcursor.o > -ifeq ($(CONFIG_FB_TILEBLITTING),y) > -obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o > -endif > -ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y) > -obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \ > - fbcon_ccw.o > -endif > > obj-$(CONFIG_FB_STI) += sticore.o > diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile > index 9e3ddf225393..0214b863ac3f 100644 > --- a/drivers/video/fbdev/core/Makefile > +++ b/drivers/video/fbdev/core/Makefile > @@ -4,6 +4,17 @@ obj-$(CONFIG_FB) += fb.o > fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ > modedb.o fbcvt.o > fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o > + > +ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE),y) > +fb-y += fbcon.o bitblit.o softcursor.o fb-$(CONFIG_FRAMEBUFFER_CONSOLE) ? > +ifeq ($(CONFIG_FB_TILEBLITTING),y) > +fb-y += tileblit.o > +endif > +ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y) > +fb-y += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \ > + fbcon_ccw.o > +endif > +endif > fb-objs := $(fb-y) > > obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o > diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h > new file mode 100644 > index 000000000000..0fac6305d51c > --- /dev/null > +++ b/include/linux/fbcon.h IANAL, but it seems like you're missing some GPL legalese here? Sean > @@ -0,0 +1,12 @@ > +#ifndef _LINUX_FBCON_H > +#define _LINUX_FBCON_H > + > +#ifdef CONFIG_FRAMEBUFFER_CONSOLE > +void __init fb_console_init(void); > +void __exit fb_console_exit(void); > +#else > +static void fb_console_init(void) {} > +static void fb_console_exit(void) {} > +#endif > + > +#endif /* _LINUX_FBCON_H */ > -- > 2.13.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH 1/4] fbcon: Make fbcon a built-time depency for fbdev Date: Thu, 13 Jul 2017 10:47:53 -0400 Message-ID: <20170713144753.n344ilasywtsqfxi@art_vandelay> References: <20170706125735.28299-1-daniel.vetter@ffwll.ch> <20170706125735.28299-2-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170706125735.28299-2-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Bartlomiej Zolnierkiewicz , Intel Graphics Development , Steven Rostedt , DRI Development , Daniel Vetter , Alan Cox List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBKdWwgMDYsIDIwMTcgYXQgMDI6NTc6MzJQTSArMDIwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKCjxzbmlwPgoKPiBDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IFNp Z25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgoKSnVz dCAyIG5pdHMsIGNvZGUgbG9va3MgZ29vZC4KClJldmlld2VkLWJ5OiBTZWFuIFBhdWwgPHNlYW5w YXVsQGNocm9taXVtLm9yZz4KCj4gLS0tCj4gdjI6IFN3aXRjaCB0byBidWlsZGluZyBmYmNvbiBj b2RlIGludG8gZmIua28gcmlnaHQgYXdheSBiZWNhdXNlIHRoZQo+IGNoZWFwIHRyaWNrIGxlYWRz IHRvIGEgbW9kdWxlIGRlcGVuY3kgbG9vcC4KPiAtLS0KPiAgZHJpdmVycy92aWRlby9jb25zb2xl L0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgICB8ICAyICstCj4gIGRyaXZlcnMvdmlkZW8v Y29uc29sZS9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgICAgfCAgOCAtLS0tLS0tLQo+ICBk cml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvTWFrZWZpbGUgICAgICAgICAgICAgICAgICAgIHwgMTEg KysrKysrKysrKysKPiAgZHJpdmVycy92aWRlby97Y29uc29sZSA9PiBmYmRldi9jb3JlfS9iaXRi bGl0LmMgICAgICB8ICA0IC0tLS0KPiAgZHJpdmVycy92aWRlby97Y29uc29sZSA9PiBmYmRldi9j b3JlfS9mYmNvbi5jICAgICAgICB8IDEzICsrKy0tLS0tLS0tLS0KPiAgZHJpdmVycy92aWRlby97 Y29uc29sZSA9PiBmYmRldi9jb3JlfS9mYmNvbi5oICAgICAgICB8ICAwCj4gIGRyaXZlcnMvdmlk ZW8ve2NvbnNvbGUgPT4gZmJkZXYvY29yZX0vZmJjb25fY2N3LmMgICAgfCAgNCAtLS0tCj4gIGRy aXZlcnMvdmlkZW8ve2NvbnNvbGUgPT4gZmJkZXYvY29yZX0vZmJjb25fY3cuYyAgICAgfCAgNCAt LS0tCj4gIGRyaXZlcnMvdmlkZW8ve2NvbnNvbGUgPT4gZmJkZXYvY29yZX0vZmJjb25fcm90YXRl LmMgfCAgNCAtLS0tCj4gIGRyaXZlcnMvdmlkZW8ve2NvbnNvbGUgPT4gZmJkZXYvY29yZX0vZmJj b25fcm90YXRlLmggfCAgMAo+ICBkcml2ZXJzL3ZpZGVvL3tjb25zb2xlID0+IGZiZGV2L2NvcmV9 L2ZiY29uX3VkLmMgICAgIHwgIDQgLS0tLQo+ICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJt ZW0uYyAgICAgICAgICAgICAgICAgICAgIHwgIDYgKysrKysrCj4gIGRyaXZlcnMvdmlkZW8ve2Nv bnNvbGUgPT4gZmJkZXYvY29yZX0vc29mdGN1cnNvci5jICAgfCAgNCAtLS0tCj4gIGRyaXZlcnMv dmlkZW8ve2NvbnNvbGUgPT4gZmJkZXYvY29yZX0vdGlsZWJsaXQuYyAgICAgfCAgNSAtLS0tLQo+ ICBpbmNsdWRlL2xpbnV4L2ZiY29uLmggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg MTIgKysrKysrKysrKysrCj4gIDE1IGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDQ4 IGRlbGV0aW9ucygtKQo+ICByZW5hbWUgZHJpdmVycy92aWRlby97Y29uc29sZSA9PiBmYmRldi9j b3JlfS9iaXRibGl0LmMgKDk4JSkKPiAgcmVuYW1lIGRyaXZlcnMvdmlkZW8ve2NvbnNvbGUgPT4g ZmJkZXYvY29yZX0vZmJjb24uYyAoOTklKQo+ICByZW5hbWUgZHJpdmVycy92aWRlby97Y29uc29s ZSA9PiBmYmRldi9jb3JlfS9mYmNvbi5oICgxMDAlKQo+ICByZW5hbWUgZHJpdmVycy92aWRlby97 Y29uc29sZSA9PiBmYmRldi9jb3JlfS9mYmNvbl9jY3cuYyAoOTglKQo+ICByZW5hbWUgZHJpdmVy cy92aWRlby97Y29uc29sZSA9PiBmYmRldi9jb3JlfS9mYmNvbl9jdy5jICg5OCUpCj4gIHJlbmFt ZSBkcml2ZXJzL3ZpZGVvL3tjb25zb2xlID0+IGZiZGV2L2NvcmV9L2ZiY29uX3JvdGF0ZS5jICg5 NSUpCj4gIHJlbmFtZSBkcml2ZXJzL3ZpZGVvL3tjb25zb2xlID0+IGZiZGV2L2NvcmV9L2ZiY29u X3JvdGF0ZS5oICgxMDAlKQo+ICByZW5hbWUgZHJpdmVycy92aWRlby97Y29uc29sZSA9PiBmYmRl di9jb3JlfS9mYmNvbl91ZC5jICg5OCUpCj4gIHJlbmFtZSBkcml2ZXJzL3ZpZGVvL3tjb25zb2xl ID0+IGZiZGV2L2NvcmV9L3NvZnRjdXJzb3IuYyAoOTMlKQo+ICByZW5hbWUgZHJpdmVycy92aWRl by97Y29uc29sZSA9PiBmYmRldi9jb3JlfS90aWxlYmxpdC5jICg5NiUpCj4gIGNyZWF0ZSBtb2Rl IDEwMDY0NCBpbmNsdWRlL2xpbnV4L2ZiY29uLmgKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92 aWRlby9jb25zb2xlL0tjb25maWcgYi9kcml2ZXJzL3ZpZGVvL2NvbnNvbGUvS2NvbmZpZwo+IGlu ZGV4IDIxMTFkMDZmOGM4MS4uN2YxZjFmYmNlZjllIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmlk ZW8vY29uc29sZS9LY29uZmlnCj4gKysrIGIvZHJpdmVycy92aWRlby9jb25zb2xlL0tjb25maWcK PiBAQCAtMTE3LDcgKzExNyw3IEBAIGNvbmZpZyBEVU1NWV9DT05TT0xFX1JPV1MKPiAgICAgICAg ICAgIFNlbGVjdCAyNSBpZiB5b3UgdXNlIGEgNjQweDQ4MCByZXNvbHV0aW9uIGJ5IGRlZmF1bHQu Cj4gIAo+ICBjb25maWcgRlJBTUVCVUZGRVJfQ09OU09MRQo+IC0JdHJpc3RhdGUgIkZyYW1lYnVm ZmVyIENvbnNvbGUgc3VwcG9ydCIKPiArCWJvb2wgIkZyYW1lYnVmZmVyIENvbnNvbGUgc3VwcG9y dCIKPiAgCWRlcGVuZHMgb24gRkIgJiYgIVVNTAo+ICAJc2VsZWN0IFZUX0hXX0NPTlNPTEVfQklO RElORwo+ICAJc2VsZWN0IENSQzMyCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vY29uc29s ZS9NYWtlZmlsZSBiL2RyaXZlcnMvdmlkZW8vY29uc29sZS9NYWtlZmlsZQo+IGluZGV4IDQzYmZh NDg1ZGI5Ni4uZWIyY2JlYzUyNjQzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vY29uc29s ZS9NYWtlZmlsZQo+ICsrKyBiL2RyaXZlcnMvdmlkZW8vY29uc29sZS9NYWtlZmlsZQo+IEBAIC03 LDEzICs3LDUgQEAgb2JqLSQoQ09ORklHX1NHSV9ORVdQT1JUX0NPTlNPTEUpICs9IG5ld3BvcnRf Y29uLm8KPiAgb2JqLSQoQ09ORklHX1NUSV9DT05TT0xFKSAgICAgICAgICs9IHN0aWNvbi5vIHN0 aWNvcmUubwo+ICBvYmotJChDT05GSUdfVkdBX0NPTlNPTEUpICAgICAgICAgKz0gdmdhY29uLm8K PiAgb2JqLSQoQ09ORklHX01EQV9DT05TT0xFKSAgICAgICAgICs9IG1kYWNvbi5vCj4gLW9iai0k KENPTkZJR19GUkFNRUJVRkZFUl9DT05TT0xFKSArPSBmYmNvbi5vIGJpdGJsaXQubyBzb2Z0Y3Vy c29yLm8KPiAtaWZlcSAoJChDT05GSUdfRkJfVElMRUJMSVRUSU5HKSx5KQo+IC1vYmotJChDT05G SUdfRlJBTUVCVUZGRVJfQ09OU09MRSkgICAgICs9IHRpbGVibGl0Lm8KPiAtZW5kaWYKPiAtaWZl cSAoJChDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRV9ST1RBVElPTikseSkKPiAtb2JqLSQoQ09O RklHX0ZSQU1FQlVGRkVSX0NPTlNPTEUpICAgICArPSBmYmNvbl9yb3RhdGUubyBmYmNvbl9jdy5v IGZiY29uX3VkLm8gXAo+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGZiY29uX2Njdy5vCj4gLWVuZGlmCj4gIAo+ICBvYmotJChDT05GSUdfRkJfU1RJKSAgICAgICAg ICAgICAgKz0gc3RpY29yZS5vCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29y ZS9NYWtlZmlsZSBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9NYWtlZmlsZQo+IGluZGV4IDll M2RkZjIyNTM5My4uMDIxNGI4NjNhYzNmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vZmJk ZXYvY29yZS9NYWtlZmlsZQo+ICsrKyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9NYWtlZmls ZQo+IEBAIC00LDYgKzQsMTcgQEAgb2JqLSQoQ09ORklHX0ZCKSAgICAgICAgICAgICAgICAgICs9 IGZiLm8KPiAgZmIteSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDo9IGZibWVtLm8gZmJt b24ubyBmYmNtYXAubyBmYnN5c2ZzLm8gXAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbW9kZWRiLm8gZmJjdnQubwo+ICBmYi0kKENPTkZJR19GQl9ERUZFUlJFRF9JTykg ICAgICAgKz0gZmJfZGVmaW8ubwo+ICsKPiAraWZlcSAoJChDT05GSUdfRlJBTUVCVUZGRVJfQ09O U09MRSkseSkKPiArZmIteQkJCQkgICs9IGZiY29uLm8gYml0YmxpdC5vIHNvZnRjdXJzb3IubwoK ZmItJChDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRSkgPwoKPiAraWZlcSAoJChDT05GSUdfRkJf VElMRUJMSVRUSU5HKSx5KQo+ICtmYi15CQkJCSAgKz0gdGlsZWJsaXQubwo+ICtlbmRpZgo+ICtp ZmVxICgkKENPTkZJR19GUkFNRUJVRkZFUl9DT05TT0xFX1JPVEFUSU9OKSx5KQo+ICtmYi15CQkJ CSAgKz0gZmJjb25fcm90YXRlLm8gZmJjb25fY3cubyBmYmNvbl91ZC5vIFwKPiArCQkJCSAgICAg ZmJjb25fY2N3Lm8KPiArZW5kaWYKPiArZW5kaWYKPiAgZmItb2JqcyAgICAgICAgICAgICAgICAg ICAgICAgICAgIDo9ICQoZmIteSkKPiAgCj4gIG9iai0kKENPTkZJR19GQl9DRkJfRklMTFJFQ1Qp ICArPSBjZmJmaWxscmVjdC5vCgo8c25pcD4KCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgv ZmJjb24uaCBiL2luY2x1ZGUvbGludXgvZmJjb24uaAo+IG5ldyBmaWxlIG1vZGUgMTAwNjQ0Cj4g aW5kZXggMDAwMDAwMDAwMDAwLi4wZmFjNjMwNWQ1MWMKPiAtLS0gL2Rldi9udWxsCj4gKysrIGIv aW5jbHVkZS9saW51eC9mYmNvbi5oCgpJQU5BTCwgYnV0IGl0IHNlZW1zIGxpa2UgeW91J3JlIG1p c3Npbmcgc29tZSBHUEwgbGVnYWxlc2UgaGVyZT8KClNlYW4KCj4gQEAgLTAsMCArMSwxMiBAQAo+ ICsjaWZuZGVmIF9MSU5VWF9GQkNPTl9ICj4gKyNkZWZpbmUgX0xJTlVYX0ZCQ09OX0gKPiArCj4g KyNpZmRlZiBDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRQo+ICt2b2lkIF9faW5pdCBmYl9jb25z b2xlX2luaXQodm9pZCk7Cj4gK3ZvaWQgX19leGl0IGZiX2NvbnNvbGVfZXhpdCh2b2lkKTsKPiAr I2Vsc2UKPiArc3RhdGljIHZvaWQgZmJfY29uc29sZV9pbml0KHZvaWQpIHt9Cj4gK3N0YXRpYyB2 b2lkIGZiX2NvbnNvbGVfZXhpdCh2b2lkKSB7fQo+ICsjZW5kaWYKPiArCj4gKyNlbmRpZiAvKiBf TElOVVhfRkJDT05fSCAqLwo+IC0tIAo+IDIuMTMuMgo+IAo+IF9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUg RW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=