Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- finally fix tcx_clearscreen() and tcx_eraserows() to actually work, and

Browse Source 
not just by accident
- sprinkle volatile in order to force gcc 5.4 to emit ldd/std for 64bit
  accesses - BLIT and STIP spaces require those
This commit is contained in:
macallan 2016-09-23 17:45:25 +00:00
parent 268438cada
commit 768a2a4278
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/sbus/tcx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcx.c,v 1.56 2014/07/25 08:10:38 dholland Exp $ */ /* $NetBSD: tcx.c,v 1.57 2016/09/23 17:45:25 macallan Exp $ */
/* /*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.56 2014/07/25 08:10:38 dholland Exp $"); __KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.57 2016/09/23 17:45:25 macallan Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -87,8 +87,8 @@ struct tcx_softc {
bus_space_handle_t sc_bt; /* Brooktree registers */ bus_space_handle_t sc_bt; /* Brooktree registers */
bus_space_handle_t sc_thc; /* THC registers */ bus_space_handle_t sc_thc; /* THC registers */
uint8_t *sc_fbaddr; /* framebuffer */ uint8_t *sc_fbaddr; /* framebuffer */
uint64_t *sc_rblit; /* blitspace */ volatile uint64_t *sc_rblit; /* blitspace */
uint64_t *sc_rstip; /* stipple space */ volatile uint64_t *sc_rstip; /* stipple space */
short sc_8bit; /* true if 8-bit hardware */ short sc_8bit; /* true if 8-bit hardware */
short sc_blanked; /* true if blanked */ short sc_blanked; /* true if blanked */
@ -884,11 +884,11 @@ static void
tcx_clearscreen(struct tcx_softc *sc, int spc) tcx_clearscreen(struct tcx_softc *sc, int spc)
{ {
/* ROP in the upper 4bit is necessary, tcx actually uses it */ /* ROP in the upper 4bit is necessary, tcx actually uses it */
uint64_t bg = 0x30000000ffffffffLL; volatile uint64_t bg = 0x30000000ffffffffLL;
uint64_t spc64; volatile uint64_t spc64;
int i, len; int i, len;
spc64 = ((spc & 3) << 24) | sc->sc_bg; spc64 = ((spc & 3) << 24);
bg |= (spc64 << 32); bg |= (spc64 << 32);
len = sc->sc_fb.fb_type.fb_width * sc->sc_fb.fb_type.fb_height; len = sc->sc_fb.fb_type.fb_width * sc->sc_fb.fb_type.fb_height;
@ -947,7 +947,7 @@ tcx_eraserows(void *cookie, int start, int nrows, long attr)
struct rasops_info *ri = cookie; struct rasops_info *ri = cookie;
struct vcons_screen *scr = ri->ri_hw; struct vcons_screen *scr = ri->ri_hw;
struct tcx_softc *sc = scr->scr_cookie; struct tcx_softc *sc = scr->scr_cookie;
uint64_t temp; volatile uint64_t temp;
int i, last, first, len, leftover; int i, last, first, len, leftover;
i = ri->ri_width * ri->ri_font->fontheight * nrows; i = ri->ri_width * ri->ri_font->fontheight * nrows;
@ -957,14 +957,14 @@ tcx_eraserows(void *cookie, int start, int nrows, long attr)
(ri->ri_font->fontheight * start + ri->ri_yorigin); (ri->ri_font->fontheight * start + ri->ri_yorigin);
last = first + len; last = first + len;
temp = 0x30000000ffffffffLL | temp = 0x30000000ffffffffLL |
((uint64_t)ri->ri_devcmap[(attr >> 16) & 0xff] << 32); ((uint64_t)((ri->ri_devcmap[(attr >> 16) & 0xff]) & 0xff) << 32);
for (i = first; i <= last; i+= 32) for (i = first; i < last; i+= 32)
sc->sc_rblit[i] = temp; sc->sc_rstip[i] = temp;
if (leftover > 0) { if (leftover > 0) {
temp &= 0xffffffffffffffffLL << (32 - leftover); temp &= 0xffffffffffffffffLL << (32 - leftover);
sc->sc_rblit[i] = temp; sc->sc_rstip[i] = temp;
} }
} }
/* /*
@ -979,7 +979,7 @@ tcx_putchar(void *cookie, int row, int col, u_int c, long attr)
struct wsdisplay_font *font = PICK_FONT(ri, c); struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri->ri_hw; struct vcons_screen *scr = ri->ri_hw;
struct tcx_softc *sc = scr->scr_cookie; struct tcx_softc *sc = scr->scr_cookie;
uint64_t bg, fg, temp, mask; volatile uint64_t bg, fg, temp, mask;
int addr, i, uc, shift; int addr, i, uc, shift;
uint32_t fmask; uint32_t fmask;
uint8_t *cdata; uint8_t *cdata;
@ -1045,7 +1045,7 @@ tcx_putchar(void *cookie, int row, int col, u_int c, long attr)
} }
} else { } else {
/* and now the split case ( man this hardware is dumb ) */ /* and now the split case ( man this hardware is dumb ) */
uint64_t bgr, maskr, fgr; volatile uint64_t bgr, maskr, fgr;
uint32_t bork; uint32_t bork;
shift = addr & 0x1f; shift = addr & 0x1f;