* [patch] big udelay's in fb drivers (2.4.0-prerelease)
@ 2001-01-03 21:32 Marko Kreen
2001-01-03 22:34 ` Marko Kreen
0 siblings, 1 reply; 6+ messages in thread
From: Marko Kreen @ 2001-01-03 21:32 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, linux-fbdev
I hope these are right fixes...
--
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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch] big udelay's in fb drivers (2.4.0-prerelease)
2001-01-03 21:32 [patch] big udelay's in fb drivers (2.4.0-prerelease) Marko Kreen
@ 2001-01-03 22:34 ` Marko Kreen
2001-01-04 19:07 ` Oliver Xymoron
0 siblings, 1 reply; 6+ messages in thread
From: Marko Kreen @ 2001-01-03 22:34 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, linux-fbdev
On Wed, Jan 03, 2001 at 11:32:52PM +0200, Marko Kreen wrote:
> - 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.
--
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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch] big udelay's in fb drivers (2.4.0-prerelease)
2001-01-03 22:34 ` Marko Kreen
@ 2001-01-04 19:07 ` Oliver Xymoron
2001-01-05 0:02 ` Alan Cox
0 siblings, 1 reply; 6+ messages in thread
From: Oliver Xymoron @ 2001-01-04 19:07 UTC (permalink / raw)
To: Marko Kreen; +Cc: linux-kernel, Linus Torvalds, linux-fbdev
On Thu, 4 Jan 2001, Marko Kreen wrote:
> On Wed, Jan 03, 2001 at 11:32:52PM +0200, Marko Kreen wrote:
> > - 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.
--
"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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] big udelay's in fb drivers (2.4.0-prerelease)
2001-01-04 19:07 ` Oliver Xymoron
@ 2001-01-05 0:02 ` Alan Cox
2001-01-05 1:31 ` Oliver Xymoron
0 siblings, 1 reply; 6+ messages in thread
From: Alan Cox @ 2001-01-05 0:02 UTC (permalink / raw)
To: Oliver Xymoron; +Cc: Marko Kreen, linux-kernel, Linus Torvalds, linux-fbdev
> 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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] big udelay's in fb drivers (2.4.0-prerelease)
2001-01-05 0:02 ` Alan Cox
@ 2001-01-05 1:31 ` Oliver Xymoron
2001-01-05 2:22 ` Alan Cox
0 siblings, 1 reply; 6+ messages in thread
From: Oliver Xymoron @ 2001-01-05 1:31 UTC (permalink / raw)
To: Alan Cox; +Cc: Marko Kreen, linux-kernel, Linus Torvalds, linux-fbdev
On Fri, 5 Jan 2001, Alan Cox wrote:
> > 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..
--
"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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] big udelay's in fb drivers (2.4.0-prerelease)
2001-01-05 1:31 ` Oliver Xymoron
@ 2001-01-05 2:22 ` Alan Cox
0 siblings, 0 replies; 6+ messages in thread
From: Alan Cox @ 2001-01-05 2:22 UTC (permalink / raw)
To: Oliver Xymoron
Cc: Alan Cox, Marko Kreen, linux-kernel, Linus Torvalds, linux-fbdev
> 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 majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2001-01-05 2:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-01-03 21:32 [patch] big udelay's in fb drivers (2.4.0-prerelease) Marko Kreen
2001-01-03 22:34 ` Marko Kreen
2001-01-04 19:07 ` Oliver Xymoron
2001-01-05 0:02 ` Alan Cox
2001-01-05 1:31 ` Oliver Xymoron
2001-01-05 2:22 ` Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®