summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-02-17 19:24:31 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-02-17 19:24:31 +0000
commit84ff32f063c0b9c55749e54bb17f98168db9a81e (patch)
treef0129d8024a85037856448cb05d49161a87393b5
parente902d237e944c67774240487c0e507fc56f2b46d (diff)
Setup ri_bits before invoking rasops_init(), in case we want to use RI_CLEAR
in ri_flg someday.
-rw-r--r--sys/arch/arm/xscale/pxa2x0_lcd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.c b/sys/arch/arm/xscale/pxa2x0_lcd.c
index 67e6ccfa1dd..e7c5fc1ee56 100644
--- a/sys/arch/arm/xscale/pxa2x0_lcd.c
+++ b/sys/arch/arm/xscale/pxa2x0_lcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_lcd.c,v 1.12 2005/01/31 06:41:25 miod Exp $ */
+/* $OpenBSD: pxa2x0_lcd.c,v 1.13 2005/02/17 19:24:30 miod Exp $ */
/* $NetBSD: pxa2x0_lcd.c,v 1.8 2003/10/03 07:24:05 bsh Exp $ */
/*
@@ -624,9 +624,9 @@ pxa2x0_lcd_cnattach(struct pxa2x0_wsscreen_descr *descr,
return (error);
ri = &pxa2x0_lcd_console.scr.rinfo;
- pxa2x0_lcd_setup_rasops(ri, descr, pxa2x0_lcd_console.geometry);
ri->ri_hw = (void *)&pxa2x0_lcd_console.scr;
ri->ri_bits = pxa2x0_lcd_console.scr.buf_va;
+ pxa2x0_lcd_setup_rasops(ri, descr, pxa2x0_lcd_console.geometry);
/* assumes 16 bpp */
ri->ri_ops.alloc_attr(ri, 0, 0, 0, &defattr);
@@ -711,9 +711,9 @@ pxa2x0_lcd_alloc_screen(void *v, const struct wsscreen_descr *_type,
* initialize raster operation for this screen.
*/
ri = &scr->rinfo;
- pxa2x0_lcd_setup_rasops(ri, type, sc->geometry);
ri->ri_hw = (void *)scr;
ri->ri_bits = scr->buf_va;
+ pxa2x0_lcd_setup_rasops(ri, type, sc->geometry);
/* assumes 16 bpp */
ri->ri_ops.alloc_attr(ri, 0, 0, 0, attrp);