Re: [Linux-fbdev-devel] radeonfb lockup in .28-rc (bisected)
From: Paul Collins
Date: Thu Nov 06 2008 - 01:00:59 EST
Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> writes:
> Heh, it would have been easier to do
>
> width = (image->width | 0x1f) + 1;
Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> writes:
> Oh and you also need to change the src_bytes calculation
With the slightly less embarrassing patch below applied and using the
default 8x16 font, the machine boots successfully with the expected
gibberish console display. I can then setfont one of the large fonts
and it does not lock up. The gibberish changes and if I do dmesg I even
get a few chunks of legible output: http://ondioline.org/~paul/corruption.png
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 8718f73..6dbd24a 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -176,6 +176,7 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
{
unsigned int src_bytes, dwords;
u32 *bits;
+ int width;
radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
rinfo->dp_gui_mc_base |
@@ -208,9 +209,11 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
* work ok for me without that and the doco doesn't seem to imply
* there is such a restriction.
*/
- OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height);
+ /* Let us pad. */
+ width = (image->width | 0x1f) + 1;
+ OUTREG(DST_WIDTH_HEIGHT, (width << 16) | image->height);
- src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
+ src_bytes = (((width * image->depth) + 7) / 8) * image->height;
dwords = (src_bytes + 3) / 4;
bits = (u32*)(image->data);
--
Paul Collins
Wellington, New Zealand
Dag vijandelijk luchtschip de huismeester is dood
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/