From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Alexander Kern <alex.kern@gmx.de>
Cc: Linux Fbdev development list
<linux-fbdev-devel@lists.sourceforge.net>,
James Simmons <jsimmons@infradead.org>
Subject: Re: atyfb expert needed
Date: Tue, 17 Feb 2004 17:41:12 +1100 [thread overview]
Message-ID: <1077000071.1056.171.camel@gaston> (raw)
In-Reply-To: <1076997609.1046.168.camel@gaston>
Ok, that patch makes it back working for me based on the version
in James fbdev tree.
I don't know _WHY_, but I couldn't get it to not lockup without
adding the to wait_for_idle after the fillrect & copyarea.
James, please apply.
Ben.
===== drivers/video/aty/mach64_accel.c 1.12 vs edited =====
--- 1.12/drivers/video/aty/mach64_accel.c Mon Feb 9 18:10:12 2004
+++ edited/drivers/video/aty/mach64_accel.c Tue Feb 17 17:38:29 2004
@@ -186,7 +186,7 @@
wait_for_fifo(2, par);
aty_st_le32(DST_Y_X, (x << 16) | y, par);
aty_st_le32(DST_HEIGHT_WIDTH, (width << 16) | height, par);
- par->blitter_may_be_busy = 1;
+ par->blitter_may_be_busy = 1;
}
void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
@@ -236,6 +236,8 @@
aty_st_le32(SRC_HEIGHT1_WIDTH1, (width << 16) | area->height, par);
aty_st_le32(DST_CNTL, direction | rotation, par);
draw_rect(dx, dy, width, area->height, par);
+
+ wait_for_idle(par);
}
void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
@@ -274,6 +276,8 @@
DST_LAST_PEL | DST_Y_TOP_TO_BOTTOM |
DST_X_LEFT_TO_RIGHT | rotation, par);
draw_rect(dx, rect->dy, width, rect->height, par);
+
+ wait_for_idle(par);
}
void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)
@@ -419,9 +423,9 @@
}
} else {
u32 *pbitmap;
- for(pbitmap = (u32*)(image->data); dwords; dwords--, pbitmap++) {
+ for (pbitmap = (u32*)(image->data); dwords; dwords--, pbitmap++) {
wait_for_fifo(1, par);
- aty_st_le32(HOST_DATA0, *pbitmap, par);
+ aty_st_le32(HOST_DATA0, le32_to_cpup(pbitmap), par);
}
}
@@ -430,4 +434,6 @@
/* restore pix_width */
wait_for_fifo(1, par);
aty_st_le32(DP_PIX_WIDTH, pix_width_save, par);
+
+ wait_for_idle(par);
}
===== drivers/video/aty/atyfb_base.c 1.39 vs edited =====
--- 1.39/drivers/video/aty/atyfb_base.c Mon Feb 9 18:10:12 2004
+++ edited/drivers/video/aty/atyfb_base.c Tue Feb 17 15:21:05 2004
@@ -343,7 +343,7 @@
/* Mach64 LT */
{ 0x4c54, 0x4c54, 0x00, 0x00, m64n_lt, 135, 63, 63, M64F_GT | M64F_INTEGRATED | M64F_GTB_DSP },
- { 0x4c47, 0x4c47, 0x00, 0x00, m64n_ltg, 230, 63, 63, M64F_GT | M64F_INTEGRATED | M64F_GTB_DSP | M64F_SDRAM_MAGIC_PLL | M64F_EXTRA_BRIGHT | M64F_LT_SLEEP | M64F_G3_PB_1024x768 },
+ { 0x4c47, 0x4c47, 0x00, 0x00, m64n_ltg, 230, 63, 63, M64F_GT | M64F_INTEGRATED | M64F_GTB_DSP | M64F_SDRAM_MAGIC_PLL | M64F_FIFO_24 | M64F_EXTRA_BRIGHT | M64F_LT_SLEEP | M64F_G3_PB_1024x768 },
/* Mach64 GTC (3D RAGE PRO) */
{ 0x4742, 0x4742, 0x00, 0x00, m64n_gtc_ba, 230, 100, 100, M64F_GT | M64F_INTEGRATED | M64F_RESET_3D | M64F_GTB_DSP | M64F_SDRAM_MAGIC_PLL | M64F_EXTRA_BRIGHT },
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
prev parent reply other threads:[~2004-02-17 6:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-11 22:10 atyfb expert needed Benjamin Herrenschmidt
2004-02-11 22:29 ` James Simmons
2004-02-12 9:29 ` Geert Uytterhoeven
2004-02-12 9:45 ` Daniël Mantione
2004-02-12 9:55 ` Geert Uytterhoeven
2004-02-13 15:41 ` Alexander Kern
2004-02-13 23:20 ` Benjamin Herrenschmidt
2004-02-14 15:26 ` Alexander Kern
2004-02-17 6:00 ` Benjamin Herrenschmidt
2004-02-17 6:41 ` Benjamin Herrenschmidt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1077000071.1056.171.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=alex.kern@gmx.de \
--cc=jsimmons@infradead.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).