stifb bugfixes against 2.6.10-rc1-bk9
PATCH 1/1 stifb bugfixes against 2.6.10-rc1-bk9
- Fix "sti= parameter ignored by stifb" bug (Stuart Brady)
- Fix the STI crash with HCRX-24 in 32bpp mode (Helge Deller)
drivers/video/stifb.c +22 -1
@@ -112,6 +112,7 @@ struct stifb_info {ngle_rom_t ngle_rom;struct sti_struct *sti;int deviceSpecificConfig; +u32 pseudo_palette[16 ]; };static int __initdata bpp =8 ;/* parameter from modprobe */
@@ -1030,6 +1031,14 @@ stifb_setcolreg(u_int regno, u_int red,/* 0x100 is same as used in WRITE_IMAGE_COLOR() */ START_COLORMAPLOAD (fb, lutBltCtl.all);SETUP_FB (fb); + +/* info->var.bits_per_pixel == 32 */ +if (regno <16 ) + ((u32 *)(info->pseudo_palette))[regno] = + (red << info->var.red.offset) | + (green << info->var.green.offset) | + (blue << info->var.blue.offset); + }else {/* cleanup colormap hardware */ FINISH_IMAGE_COLORMAP_ACCESS (fb);
@@ -1327,6 +1336,7 @@ stifb_init_fb(struct sti_struct *sti, in info->screen_base = (void *)REGION_BASE (fb,1 ); info->flags =FBINFO_DEFAULT ; info->currcon =-1 ; + info->pseudo_palette = &fb->pseudo_palette;/* This has to been done !!! */ fb_alloc_cmap (&info->cmap,256 ,0 );
@@ -1383,6 +1393,7 @@ int __initstifb_init (void) {struct sti_struct *sti; +struct sti_struct *def_sti;int i;#ifndef MODULE
@@ -1397,9 +1408,19 @@ stifb_init(void)return -ENXIO ; } + def_sti =sti_get_rom (0 ); +if (def_sti) { +for (i =1 ; i <MAX_STI_ROMS ; i++) { + sti =sti_get_rom (i); +if (sti == def_sti && bpp >0 ) + stifb_force_bpp[i] = bpp; + } +stifb_init_fb (def_sti, stifb_force_bpp[i]); + } +for (i =1 ; i <MAX_STI_ROMS ; i++) { sti =sti_get_rom (i); -if (!sti) +if (!sti || sti==def_sti)break ;if (bpp >0 ) stifb_force_bpp[i] = bpp;
Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain