From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Antonino A. Daplas" Subject: [PATCH 3/7] fbdev: Initialize i810fb after agpgart Date: Fri, 10 Sep 2004 05:34:41 +0800 Sender: linux-fbdev-devel-admin@lists.sourceforge.net Message-ID: <200409100534.41705.adaplas@hotpop.com> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1C5WYh-0000DQ-Kq for linux-fbdev-devel@lists.sourceforge.net; Thu, 09 Sep 2004 14:34:23 -0700 Received: from smtp-out.hotpop.com ([38.113.3.61]) by sc8-sf-mx1.sourceforge.net with esmtp (Exim 4.34) id 1C5WYd-0005gG-6x for linux-fbdev-devel@lists.sourceforge.net; Thu, 09 Sep 2004 14:34:21 -0700 Received: from hotpop.com (kubrick.hotpop.com [38.113.3.103]) by smtp-out.hotpop.com (Postfix) with SMTP id 2053879BAA1 for ; Thu, 9 Sep 2004 21:34:03 +0000 (UTC) Content-Disposition: inline Errors-To: linux-fbdev-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: List-Post: List-Help: List-Subscribe: , List-Archive: Content-Type: text/plain; charset="us-ascii" To: Andrew Morton Cc: Linux Fbdev development list , linux-kernel@vger.kernel.org, Dave Jones This patch places 'video/i810/' after 'char/' in drivers/Makefile. This order change makes it unnecessary for i810fb to explicitly call agp_intel_init(). This is untested, as I don't have any i810 hardware anymore, but I believe it will work. If it does, the ugly 'early initialization hack' in drivers/char/agp/intel-agp.c:agp_intel_init() can be removed (haven't done it yet). Signed-off-by: Antonino Daplas --- Makefile | 4 ++++ video/Makefile | 5 ++--- video/i810/i810_main.c | 5 ----- 3 files changed, 6 insertions(+), 8 deletions(-) diff -uprN linux-2.6.9-rc1-mm4-orig/drivers/Makefile linux-2.6.9-rc1-mm4/drivers/Makefile --- linux-2.6.9-rc1-mm4-orig/drivers/Makefile 2004-09-07 21:25:43.000000000 +0800 +++ linux-2.6.9-rc1-mm4/drivers/Makefile 2004-09-07 21:39:14.292973224 +0800 @@ -16,6 +16,10 @@ obj-$(CONFIG_PNP) += pnp/ # char/ comes before serial/ etc so that the VT console is the boot-time # default. obj-y += char/ + +# i810fb depends on char/agp/ +obj-$(CONFIG_FB_I810) += video/i810/ + # we also need input/serio early so serio bus is initialized by the time # serial drivers start registering their serio ports obj-$(CONFIG_SERIO) += input/serio/ diff -uprN linux-2.6.9-rc1-mm4-orig/drivers/video/i810/i810_main.c linux-2.6.9-rc1-mm4/drivers/video/i810/i810_main.c --- linux-2.6.9-rc1-mm4-orig/drivers/video/i810/i810_main.c 2004-09-07 21:18:34.000000000 +0800 +++ linux-2.6.9-rc1-mm4/drivers/video/i810/i810_main.c 2004-09-07 21:45:07.644255664 +0800 @@ -1991,11 +1991,6 @@ int __init i810fb_init(void) { i810fb_setup(fb_get_options("i810fb")); - if (agp_intel_init()) { - printk("i810fb_init: cannot initialize intel agpgart\n"); - return -ENODEV; - } - if (pci_register_driver(&i810fb_driver) > 0) return 0; pci_unregister_driver(&i810fb_driver); diff -uprN linux-2.6.9-rc1-mm4-orig/drivers/video/Makefile linux-2.6.9-rc1-mm4/drivers/video/Makefile --- linux-2.6.9-rc1-mm4-orig/drivers/video/Makefile 2004-09-07 21:18:34.000000000 +0800 +++ linux-2.6.9-rc1-mm4/drivers/video/Makefile 2004-09-07 21:39:11.383415544 +0800 @@ -62,9 +62,8 @@ obj-$(CONFIG_FB_SIS) += sis/ cfbcopya obj-$(CONFIG_FB_ATY) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_ATY128) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_RADEON) += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o -obj-$(CONFIG_FB_I810) += i810/ cfbfillrect.o cfbcopyarea.o \ - cfbimgblt.o vgastate.o - +obj-$(CONFIG_FB_I810) += cfbcopyarea.o cfbfillrect.o cfbimgblt.o \ + vgastate.o obj-$(CONFIG_FB_SUN3) += sun3fb.o obj-$(CONFIG_FB_HGA) += hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_SA1100) += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o ------------------------------------------------------- This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170 Project Admins to receive an Apple iPod Mini FREE for your judgement on who ports your project to Linux PPC the best. Sponsored by IBM. Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php