|
@@ -1913,9 +1913,6 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
|
|
|
u8 chip_rev;
|
|
|
u32 dac;
|
|
|
|
|
|
- if (!par->vram_size) /* may have already been probed */
|
|
|
- par->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
|
|
|
-
|
|
|
/* Get the chip revision */
|
|
|
chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
|
|
|
|
|
@@ -2028,9 +2025,6 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
|
|
|
|
|
|
aty128_init_engine(par);
|
|
|
|
|
|
- if (register_framebuffer(info) < 0)
|
|
|
- return 0;
|
|
|
-
|
|
|
par->pm_reg = pci_find_capability(pdev, PCI_CAP_ID_PM);
|
|
|
par->pdev = pdev;
|
|
|
par->asleep = 0;
|
|
@@ -2040,6 +2034,9 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
|
|
|
aty128_bl_init(par);
|
|
|
#endif
|
|
|
|
|
|
+ if (register_framebuffer(info) < 0)
|
|
|
+ return 0;
|
|
|
+
|
|
|
printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",
|
|
|
info->node, info->fix.id, video_card);
|
|
|
|
|
@@ -2089,7 +2086,6 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
|
|
|
par = info->par;
|
|
|
|
|
|
info->pseudo_palette = par->pseudo_palette;
|
|
|
- info->fix = aty128fb_fix;
|
|
|
|
|
|
/* Virtualize mmio region */
|
|
|
info->fix.mmio_start = reg_addr;
|