2004-09-15 21:39:59

by Andreas Henriksson

[permalink] [raw]
Subject: [PATCH] fbdev: Remove i810fb explicit agp initialization hack.


When Antonino A. Daplas posted his "fbdev: Initialize i810fb after agpgart"
patch he said that the ugly agp initialization hack for intel agp shouldn't be
needed but that he couldn't test it.

I have tested the framebuffer updates and additionally removed the
initialization hack and it does indeed work.

Signed-off-by: Andreas Henriksson <[email protected]>

--- linux-2.6.9-rc1-mm5/drivers/char/agp/intel-agp.c.old 2004-09-15 23:13:05.000000000 +0200
+++ linux-2.6.9-rc1-mm5/drivers/char/agp/intel-agp.c 2004-09-15 23:13:23.000000000 +0200
@@ -1781,16 +1781,8 @@ static struct pci_driver agp_intel_pci_d
.resume = agp_intel_resume,
};

-/* intel_agp_init() must not be declared static for explicit
- early initialization to work (ie i810fb) */
-int __init agp_intel_init(void)
+static int __init agp_intel_init(void)
{
- static int agp_initialised=0;
-
- if (agp_initialised == 1)
- return 0;
- agp_initialised=1;
-
return pci_module_init(&agp_intel_pci_driver);
}