iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] atyfb: Improve atyfb_atari_probe()

Browse Source 
Improve atyfb_atari_probe():
* Call correct_chipset() so that more par members, par->features in
  particular, get initialized.
* If probe fails iounmap() the mapped regions and continue probing for more
  adapters.

Only verified to cross-compile due to lack of hardware.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ville Syrjala 2006-12-08 02:40:44 -08:00 committed by Linus Torvalds
parent cab5901e93
commit 4ec3fd71e4
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/video/aty/atyfb_base.c
View File

@ -3629,6 +3629,7 @@ static int __init atyfb_atari_probe(void)
struct fb_info *info; struct fb_info *info;
int m64_num; int m64_num;
u32 clock_r; u32 clock_r;
int num_found = 0;
for (m64_num = 0; m64_num < mach64_count; m64_num++) { for (m64_num = 0; m64_num < mach64_count; m64_num++) {
if (!phys_vmembase[m64_num] || !phys_size[m64_num] || if (!phys_vmembase[m64_num] || !phys_size[m64_num] ||
@ -3676,16 +3677,28 @@ static int __init atyfb_atari_probe(void)
break; break;
} }
if (aty_init(info)) { /* Fake pci_id for correct_chipset() */
if (info->screen_base) switch (aty_ld_le32(CONFIG_CHIP_ID, par) & CFG_CHIP_TYPE) {
iounmap(info->screen_base); case 0x00d7:
if (par->ati_regbase) par->pci_id = PCI_CHIP_MACH64GX;
iounmap(par->ati_regbase); break;
case 0x0057:
par->pci_id = PCI_CHIP_MACH64CX;
break;
default:
break;
}
if (correct_chipset(par) || aty_init(info)) {
iounmap(info->screen_base);
iounmap(par->ati_regbase);
framebuffer_release(info); framebuffer_release(info);
/* This is insufficient! kernel_map has added two large chunks!! */ } else {
return -ENXIO; num_found++;
} }
} }
return num_found ? 0 : -ENXIO;
} }
#endif /* CONFIG_ATARI */ #endif /* CONFIG_ATARI */