big udelay's in fb drivers (2.4.0-prerelease)
PATCH 1/1 big udelay's in fb drivers (2.4.0-prerelease)
I hope these are right fixes...
Signature · 40 lines
marko
diff -urNX /home/marko/misc/diff-exclude linux-2.4.0-prerelease/drivers/video/atyfb.c linux/drivers/video/atyfb.c
--- linux-2.4.0-prerelease/drivers/video/atyfb.c Wed Jan 3 19:55:56 2001
+++ linux/drivers/video/atyfb.c Wed Jan 3 22:42:32 2001
@@ -1722,7 +1722,7 @@
aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp | (CRTC_EXT_DISP_EN >> 24),
info);
- udelay(15000); /* delay for 50 (15) ms */
+ mdelay(15); /* delay for 50 (15) ms */
program_bits = pll->program_bits;
locationAddr = pll->locationAddr;
@@ -1754,7 +1754,7 @@
aty_st_8(CLOCK_CNTL + info->clk_wr_offset, old_clock_cntl | CLOCK_STROBE,
info);
- udelay(50000); /* delay for 50 (15) ms */
+ mdelay(50); /* delay for 50 (15) ms */
aty_st_8(CLOCK_CNTL + info->clk_wr_offset,
((pll->locationAddr & 0x0F) | CLOCK_STROBE), info);
diff -urNX /home/marko/misc/diff-exclude linux-2.4.0-prerelease/drivers/video/clgenfb.c linux/drivers/video/clgenfb.c
--- linux-2.4.0-prerelease/drivers/video/clgenfb.c Mon Dec 4 20:44:57 2000
+++ linux/drivers/video/clgenfb.c Wed Jan 3 22:42:56 2001
@@ -1899,7 +1899,7 @@
break;
case BT_PICASSO4:
vga_wcrt (fb_info->regs, CL_CRT51, 0x00); /* disable flickerfixer */
- udelay (100000);
+ mdelay (100);
vga_wgfx (fb_info->regs, CL_GR2F, 0x00); /* from Klaus' NetBSD driver: */
vga_wgfx (fb_info->regs, CL_GR33, 0x00); /* put blitter into 542x compat */
vga_wgfx (fb_info->regs, CL_GR31, 0x00); /* mode */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/Review
Quoted 2 lines · Marko Kreen
(quoted diff) +1
-1- udelay(15000); /* delay for 50 (15) ms */ + mdelay(15); /* delay for 50 (15) ms */
Per Mark Hahn suggestion here is a patch that fixes the weird comments too. This is cumulative to the previous patch.
Signature · 28 lines
marko
--- linux/drivers/video/atyfb.c.orig Thu Jan 4 00:08:24 2001
+++ linux/drivers/video/atyfb.c Thu Jan 4 00:09:11 2001
@@ -1722,7 +1722,7 @@
aty_st_8(CRTC_GEN_CNTL + 3, old_crtc_ext_disp | (CRTC_EXT_DISP_EN >> 24),
info);
- mdelay(15); /* delay for 50 (15) ms */
+ mdelay(15); /* delay for 15 ms */
program_bits = pll->program_bits;
locationAddr = pll->locationAddr;
@@ -1754,7 +1754,7 @@
aty_st_8(CLOCK_CNTL + info->clk_wr_offset, old_clock_cntl | CLOCK_STROBE,
info);
- mdelay(50); /* delay for 50 (15) ms */
+ mdelay(50); /* delay for 50 ms */
aty_st_8(CLOCK_CNTL + info->clk_wr_offset,
((pll->locationAddr & 0x0F) | CLOCK_STROBE), info);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/Quoted 6 lines · Marko Kreen
Review
Quoted 2 lines · Marko Kreen
(quoted diff) +1
-1- udelay(15000); /* delay for 50 (15) ms */ + mdelay(15); /* delay for 50 (15) ms */Per Mark Hahn suggestion here is a patch that fixes the weird comments too. This is cumulative to the previous patch.
Once the comments are unweirded, they become completely superfluous. At which point its best not to have them - when someone next comes along and changes the delay, it might end up disagreeing with the comment and causing confusion.
Signature · 6 lines
"Love the dolphins," she advised him. "Write by W.A.S.T.E.." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] Please read the FAQ at http://www.tux.org/lkml/
Quoted 4 lines
Once the comments are unweirded, they become completely superfluous. At which point its best not to have them - when someone next comes along and changes the delay, it might end up disagreeing with the comment and causing confusion.
Before you remove the comments check with the author and the manuals. -
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Quoted 6 lines · Alan Cox
Quoted 4 lines
Once the comments are unweirded, they become completely superfluous. At which point its best not to have them - when someone next comes along and changes the delay, it might end up disagreeing with the comment and causing confusion.
Before you remove the comments check with the author and the manuals.
Huh? Granted that's generally a good idea, but if you've got code that says
udelay(15000); /* delay 15ms */
the comment is just extra baggage. No sense touching it generally, but if you're gonna change it to mdelay..
Signature · 6 lines
"Love the dolphins," she advised him. "Write by W.A.S.T.E.." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] Please read the FAQ at http://www.tux.org/lkml/
Quoted 4 lines
udelay(15000); /* delay 15ms */
the comment is just extra baggage. No sense touching it generally, but if you're gonna change it to mdelay..
The comments are 15 (50) implying someone swapped them around for a reason and noted it
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/