NeoMagic FPU fix (2.4.18-pre9-ac3)
PATCH 1/1 NeoMagic FPU fix (2.4.18-pre9-ac3)
This version has a suitable fixed point type.
Should now be safe against high values.
---------------------------------
Hi,
here is a patch for my NeoMagic framebuffer driver that removes all floating stuff. I also added me to CREDITS as I forgot the last time. The driver version is 0.3.2 now.
It applies against Linux 2.4.18-pre9-ac3 which had version 0.3.0 of the driver while the last version was 0.3.1.
So this patch is not applyable to the 2.5 tree. I will do another one for 2.5 and 2.5-dj, too. So that all trees have the same version.
Signature · 9 lines
Best regards,
Denis Oliver Kropp
.------------------------------------------.
| DirectFB - Hardware accelerated graphics |
| http://www.directfb.org/ |
"------------------------------------------"
convergence integrated media GmbHCREDITS +7 -0
@@ -1656,6 +1656,13 @@ S: San Antonio, Texas 78269-1886 S: USA +N: Denis O. Kropp +E: [email protected] +D: NeoMagic framebuffer driver +S: Badensche Str. 46 +S: 10715 Berlin +S: Germany + N: Andrzej M. Krzysztofowicz E: [email protected] D: Some 8-bit XT disk driver and devfs hacking
drivers/video/neofb.c +23 -16
@@ -12,9 +12,15 @@* archive for more details. * * +* 0.3.2 +* - got rid of all floating point (dok) +* +* 0.3.1 +* - added module license (dok) +* * 0.3 -* - hardware accelerated clear and move for 2200 and above -* - maximum allowed dotclock is handled now +* - hardware accelerated clear and move for 2200 and above (dok) +* - maximum allowed dotclock is handled now (dok) * * 0.2.1 * - correct panning after X usage (dok)
@@ -29,10 +35,10 @@* - ioctl for internal/external switching * - blanking * - 32bit depth support, maybe impossible -* - disable automatic pan on sync, need specs +* - disable pan-on-sync, need specs * * BUGS -* - white margin on bootup (colormap problem?) +* - white margin on bootup like with tdfxfb (colormap problem?) * */
@@ -68,7 +74,7 @@#include "neofb.h" -#define NEOFB_VERSION "0.3" +#define NEOFB_VERSION "0.3.2"/* --------------------------------------------------------------------- */
@@ -81,7 +87,8 @@#ifdef MODULE -MODULE_AUTHOR ("(c) 2001 Denis Oliver Kropp <[email protected]>" ); +MODULE_AUTHOR ("(c) 2001-2002 Denis Oliver Kropp <[email protected]>" ); +MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("FBDev driver for NeoMagic PCI Chips" );MODULE_PARM (disabled,"i" );MODULE_PARM_DESC (disabled,"Disable this driver's initialization." );
@@ -861,13 +868,12 @@return err; } -#error "Floating point maths. This needs fixing before this driver is safe"/* * neoCalcVCLK -- * * Determine the closest clock frequency to the one requested. */ -#define REF_FREQ 14.31818 +#define REF_FREQ 0xe517/* 14.31818 in 20.12 fixed point */ #define MAX_N 127#define MAX_D 31#define MAX_F 1
@@ -875,17 +881,18 @@static void neoCalcVCLK (const struct neofb_info *info,struct neofb_par *par,long freq) {int n, d, f; -double f_out; -double f_diff;int n_best =0 , d_best =0 , f_best =0 ; -double f_best_diff =999999.0 ; -double f_target = freq/1000.0 ; +long f_best_diff = (0x7ffff <<12 );/* 20.12 */ +long f_target = (freq <<12 ) /1000 ;/* 20.12 */ for (f =0 ; f <=MAX_F ; f++)for (n =0 ; n <=MAX_N ; n++)for (d =0 ; d <=MAX_D ; d++) { - f_out = (n+1.0 )/((d+1.0 )*(1 <<f))*REF_FREQ ; +long f_out;/* 20.12 */ +long f_diff;/* 20.12 */ + + f_out = ((((n+1 ) <<12 ) / ((d+1 )*(1 <<f))) >>12 ) *REF_FREQ ; f_diff =abs (f_out-f_target);if (f_diff < f_best_diff) {
@@ -912,12 +919,12 @@ par->VCLK3Denominator = d_best;#ifdef NEOFB_DEBUG -printk ("neoVCLK: f:%f NumLow=%d NumHi=%d Den=%d Df=%f\n" , - f_target, +printk ("neoVCLK: f:%d NumLow=%d NumHi=%d Den=%d Df=%d\n" , + f_target >>12 , par->VCLK3NumeratorLow, par->VCLK3NumeratorHigh, par->VCLK3Denominator, - f_best_diff); + f_best_diff >>12 );#endif }