mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcx: Implement hardware acceleration

Browse Source 
The S24/TCX framebuffer is a mildly accelerated video card with
blitter, stippler and hardware cursor.

* Solaris and NetBSD 6.x use all the hardware acceleration features
* The Xorg driver (used by Linux) can use the hardware cursor only

This patch implements hardware acceleration in both 8 bit and 24 bit
modes. It is based on the NetBSD driver sources and from tests with
Solaris.

Signed-off-by: Olivier Danet <odanet@caramail.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2014-09-13 10:44:07 +01:00
parent 769188d3bb
commit 55d7bfe229
2 changed files with 597 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

645
hw/display/tcx.c
View File

@ -34,9 +34,19 @@
#define MAXX 1024 #define MAXX 1024
#define MAXY 768 #define MAXY 768
#define TCX_DAC_NREGS 16 #define TCX_DAC_NREGS 16
#define TCX_THC_NREGS_8 0x081c #define TCX_THC_NREGS 0x1000
#define TCX_THC_NREGS_24 0x1000 #define TCX_DHC_NREGS 0x4000
#define TCX_TEC_NREGS 0x1000 #define TCX_TEC_NREGS 0x1000
#define TCX_ALT_NREGS 0x8000
#define TCX_STIP_NREGS 0x800000
#define TCX_BLIT_NREGS 0x800000
#define TCX_RSTIP_NREGS 0x800000
#define TCX_RBLIT_NREGS 0x800000
#define TCX_THC_MISC 0x818
#define TCX_THC_CURSXY 0x8fc
#define TCX_THC_CURSMASK 0x900
#define TCX_THC_CURSBITS 0x980
#define TYPE_TCX "SUNW,tcx" #define TYPE_TCX "SUNW,tcx"
#define TCX(obj) OBJECT_CHECK(TCXState, (obj), TYPE_TCX) #define TCX(obj) OBJECT_CHECK(TCXState, (obj), TYPE_TCX)
@ -45,6 +55,7 @@ typedef struct TCXState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
QemuConsole *con; QemuConsole *con;
qemu_irq irq;
uint8_t *vram; uint8_t *vram;
uint32_t *vram24, *cplane; uint32_t *vram24, *cplane;
hwaddr prom_addr; hwaddr prom_addr;
@ -52,17 +63,30 @@ typedef struct TCXState {
MemoryRegion vram_mem; MemoryRegion vram_mem;
MemoryRegion vram_8bit; MemoryRegion vram_8bit;
MemoryRegion vram_24bit; MemoryRegion vram_24bit;
MemoryRegion stip;
MemoryRegion blit;
MemoryRegion vram_cplane; MemoryRegion vram_cplane;
MemoryRegion dac; MemoryRegion rstip;
MemoryRegion rblit;
MemoryRegion tec; MemoryRegion tec;
MemoryRegion dac;
MemoryRegion thc;
MemoryRegion dhc;
MemoryRegion alt;
MemoryRegion thc24; MemoryRegion thc24;
MemoryRegion thc8;
ram_addr_t vram24_offset, cplane_offset; ram_addr_t vram24_offset, cplane_offset;
uint32_t tmpblit;
uint32_t vram_size; uint32_t vram_size;
uint32_t palette[256]; uint32_t palette[260];
uint8_t r[256], g[256], b[256]; uint8_t r[260], g[260], b[260];
uint16_t width, height, depth; uint16_t width, height, depth;
uint8_t dac_index, dac_state; uint8_t dac_index, dac_state;
uint32_t thcmisc;
uint32_t cursmask[32];
uint32_t cursbits[32];
uint16_t cursx;
uint16_t cursy;
} TCXState; } TCXState;
static void tcx_set_dirty(TCXState *s) static void tcx_set_dirty(TCXState *s)
@ -70,10 +94,36 @@ static void tcx_set_dirty(TCXState *s)
memory_region_set_dirty(&s->vram_mem, 0, MAXX * MAXY); memory_region_set_dirty(&s->vram_mem, 0, MAXX * MAXY);
} }
static void tcx24_set_dirty(TCXState *s) static inline int tcx24_check_dirty(TCXState *s, ram_addr_t page,
ram_addr_t page24, ram_addr_t cpage)
{ {
memory_region_set_dirty(&s->vram_mem, s->vram24_offset, MAXX * MAXY * 4); int ret;
memory_region_set_dirty(&s->vram_mem, s->cplane_offset, MAXX * MAXY * 4);
ret = memory_region_get_dirty(&s->vram_mem, page, TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
ret |= memory_region_get_dirty(&s->vram_mem, page24, TARGET_PAGE_SIZE * 4,
DIRTY_MEMORY_VGA);
ret |= memory_region_get_dirty(&s->vram_mem, cpage, TARGET_PAGE_SIZE * 4,
DIRTY_MEMORY_VGA);
return ret;
}
static inline void tcx24_reset_dirty(TCXState *ts, ram_addr_t page_min,
ram_addr_t page_max, ram_addr_t page24,
ram_addr_t cpage)
{
memory_region_reset_dirty(&ts->vram_mem,
page_min,
(page_max - page_min) + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
memory_region_reset_dirty(&ts->vram_mem,
page24 + page_min * 4,
(page_max - page_min) * 4 + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
memory_region_reset_dirty(&ts->vram_mem,
cpage + page_min * 4,
(page_max - page_min) * 4 + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
} }
static void update_palette_entries(TCXState *s, int start, int end) static void update_palette_entries(TCXState *s, int start, int end)
@ -102,11 +152,7 @@ static void update_palette_entries(TCXState *s, int start, int end)
break; break;
} }
} }
if (s->depth == 24) {
tcx24_set_dirty(s);
} else {
tcx_set_dirty(s); tcx_set_dirty(s);
}
} }
static void tcx_draw_line32(TCXState *s1, uint8_t *d, static void tcx_draw_line32(TCXState *s1, uint8_t *d,
@ -116,7 +162,7 @@ static void tcx_draw_line32(TCXState *s1, uint8_t *d,
uint8_t val; uint8_t val;
uint32_t *p = (uint32_t *)d; uint32_t *p = (uint32_t *)d;
for(x = 0; x < width; x++) { for (x = 0; x < width; x++) {
val = *s++; val = *s++;
*p++ = s1->palette[val]; *p++ = s1->palette[val];
} }
@ -129,7 +175,7 @@ static void tcx_draw_line16(TCXState *s1, uint8_t *d,
uint8_t val; uint8_t val;
uint16_t *p = (uint16_t *)d; uint16_t *p = (uint16_t *)d;
for(x = 0; x < width; x++) { for (x = 0; x < width; x++) {
val = *s++; val = *s++;
*p++ = s1->palette[val]; *p++ = s1->palette[val];
} }
@ -147,6 +193,83 @@ static void tcx_draw_line8(TCXState *s1, uint8_t *d,
} }
} }
static void tcx_draw_cursor32(TCXState *s1, uint8_t *d,
int y, int width)
{
int x, len;
uint32_t mask, bits;
uint32_t *p = (uint32_t *)d;
y = y - s1->cursy;
mask = s1->cursmask[y];
bits = s1->cursbits[y];
len = MIN(width - s1->cursx, 32);
p = &p[s1->cursx];
for (x = 0; x < len; x++) {
if (mask & 0x80000000) {
if (bits & 0x80000000) {
*p = s1->palette[259];
} else {
*p = s1->palette[258];
}
}
p++;
mask <<= 1;
bits <<= 1;
}
}
static void tcx_draw_cursor16(TCXState *s1, uint8_t *d,
int y, int width)
{
int x, len;
uint32_t mask, bits;
uint16_t *p = (uint16_t *)d;
y = y - s1->cursy;
mask = s1->cursmask[y];
bits = s1->cursbits[y];
len = MIN(width - s1->cursx, 32);
p = &p[s1->cursx];
for (x = 0; x < len; x++) {
if (mask & 0x80000000) {
if (bits & 0x80000000) {
*p = s1->palette[259];
} else {
*p = s1->palette[258];
}
}
p++;
mask <<= 1;
bits <<= 1;
}
}
static void tcx_draw_cursor8(TCXState *s1, uint8_t *d,
int y, int width)
{
int x, len;
uint32_t mask, bits;
y = y - s1->cursy;
mask = s1->cursmask[y];
bits = s1->cursbits[y];
len = MIN(width - s1->cursx, 32);
d = &d[s1->cursx];
for (x = 0; x < len; x++) {
if (mask & 0x80000000) {
if (bits & 0x80000000) {
*d = s1->palette[259];
} else {
*d = s1->palette[258];
}
}
d++;
mask <<= 1;
bits <<= 1;
}
}
/* /*
XXX Could be much more optimal: XXX Could be much more optimal:
* detect if line/page/whole screen is in 24 bit mode * detect if line/page/whole screen is in 24 bit mode
@ -162,11 +285,10 @@ static inline void tcx24_draw_line32(TCXState *s1, uint8_t *d,
uint8_t val, *p8; uint8_t val, *p8;
uint32_t *p = (uint32_t *)d; uint32_t *p = (uint32_t *)d;
uint32_t dval; uint32_t dval;
bgr = is_surface_bgr(surface); bgr = is_surface_bgr(surface);
for(x = 0; x < width; x++, s++, s24++) { for(x = 0; x < width; x++, s++, s24++) {
if ((be32_to_cpu(*cplane++) & 0xff000000) == 0x03000000) { if (be32_to_cpu(*cplane) & 0x03000000) {
// 24-bit direct, BGR order /* 24-bit direct, BGR order */
p8 = (uint8_t *)s24; p8 = (uint8_t *)s24;
p8++; p8++;
b = *p8++; b = *p8++;
@ -177,47 +299,18 @@ static inline void tcx24_draw_line32(TCXState *s1, uint8_t *d,
else else
dval = rgb_to_pixel32(r, g, b); dval = rgb_to_pixel32(r, g, b);
} else { } else {
/* 8-bit pseudocolor */
val = *s; val = *s;
dval = s1->palette[val]; dval = s1->palette[val];
} }
*p++ = dval; *p++ = dval;
cplane++;
} }
} }
static inline int check_dirty(TCXState *s, ram_addr_t page, ram_addr_t page24,
ram_addr_t cpage)
{
int ret;
ret = memory_region_get_dirty(&s->vram_mem, page, TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
ret |= memory_region_get_dirty(&s->vram_mem, page24, TARGET_PAGE_SIZE * 4,
DIRTY_MEMORY_VGA);
ret |= memory_region_get_dirty(&s->vram_mem, cpage, TARGET_PAGE_SIZE * 4,
DIRTY_MEMORY_VGA);
return ret;
}
static inline void reset_dirty(TCXState *ts, ram_addr_t page_min,
ram_addr_t page_max, ram_addr_t page24,
ram_addr_t cpage)
{
memory_region_reset_dirty(&ts->vram_mem,
page_min,
(page_max - page_min) + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
memory_region_reset_dirty(&ts->vram_mem,
page24 + page_min * 4,
(page_max - page_min) * 4 + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
memory_region_reset_dirty(&ts->vram_mem,
cpage + page_min * 4,
(page_max - page_min) * 4 + TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA);
}
/* Fixed line length 1024 allows us to do nice tricks not possible on /* Fixed line length 1024 allows us to do nice tricks not possible on
VGA... */ VGA... */
static void tcx_update_display(void *opaque) static void tcx_update_display(void *opaque)
{ {
TCXState *ts = opaque; TCXState *ts = opaque;
@ -226,6 +319,7 @@ static void tcx_update_display(void *opaque)
int y, y_start, dd, ds; int y, y_start, dd, ds;
uint8_t *d, *s; uint8_t *d, *s;
void (*f)(TCXState *s1, uint8_t *dst, const uint8_t *src, int width); void (*f)(TCXState *s1, uint8_t *dst, const uint8_t *src, int width);
void (*fc)(TCXState *s1, uint8_t *dst, int y, int width);
if (surface_bits_per_pixel(surface) == 0) { if (surface_bits_per_pixel(surface) == 0) {
return; return;
@ -243,20 +337,23 @@ static void tcx_update_display(void *opaque)
switch (surface_bits_per_pixel(surface)) { switch (surface_bits_per_pixel(surface)) {
case 32: case 32:
f = tcx_draw_line32; f = tcx_draw_line32;
fc = tcx_draw_cursor32;
break; break;
case 15: case 15:
case 16: case 16:
f = tcx_draw_line16; f = tcx_draw_line16;
fc = tcx_draw_cursor16;
break; break;
default: default:
case 8: case 8:
f = tcx_draw_line8; f = tcx_draw_line8;
fc = tcx_draw_cursor8;
break; break;
case 0: case 0:
return; return;
} }
for(y = 0; y < ts->height; y += 4, page += TARGET_PAGE_SIZE) { for (y = 0; y < ts->height; page += TARGET_PAGE_SIZE) {
if (memory_region_get_dirty(&ts->vram_mem, page, TARGET_PAGE_SIZE, if (memory_region_get_dirty(&ts->vram_mem, page, TARGET_PAGE_SIZE,
DIRTY_MEMORY_VGA)) { DIRTY_MEMORY_VGA)) {
if (y_start < 0) if (y_start < 0)
@ -265,18 +362,38 @@ static void tcx_update_display(void *opaque)
page_min = page; page_min = page;
if (page > page_max) if (page > page_max)
page_max = page; page_max = page;
f(ts, d, s, ts->width); f(ts, d, s, ts->width);
if (y >= ts->cursy && y < ts->cursy + 32 && ts->cursx < ts->width) {
fc(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
y++;
f(ts, d, s, ts->width); f(ts, d, s, ts->width);
if (y >= ts->cursy && y < ts->cursy + 32 && ts->cursx < ts->width) {
fc(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
y++;
f(ts, d, s, ts->width); f(ts, d, s, ts->width);
if (y >= ts->cursy && y < ts->cursy + 32 && ts->cursx < ts->width) {
fc(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
y++;
f(ts, d, s, ts->width); f(ts, d, s, ts->width);
if (y >= ts->cursy && y < ts->cursy + 32 && ts->cursx < ts->width) {
fc(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
y++;
} else { } else {
if (y_start >= 0) { if (y_start >= 0) {
/* flush to display */ /* flush to display */
@ -286,6 +403,7 @@ static void tcx_update_display(void *opaque)
} }
d += dd * 4; d += dd * 4;
s += ds * 4; s += ds * 4;
y += 4;
} }
} }
if (y_start >= 0) { if (y_start >= 0) {
@ -328,9 +446,9 @@ static void tcx24_update_display(void *opaque)
dd = surface_stride(surface); dd = surface_stride(surface);
ds = 1024; ds = 1024;
for(y = 0; y < ts->height; y += 4, page += TARGET_PAGE_SIZE, for (y = 0; y < ts->height; page += TARGET_PAGE_SIZE,
page24 += TARGET_PAGE_SIZE, cpage += TARGET_PAGE_SIZE) { page24 += TARGET_PAGE_SIZE, cpage += TARGET_PAGE_SIZE) {
if (check_dirty(ts, page, page24, cpage)) { if (tcx24_check_dirty(ts, page, page24, cpage)) {
if (y_start < 0) if (y_start < 0)
y_start = y; y_start = y;
if (page < page_min) if (page < page_min)
@ -338,25 +456,41 @@ static void tcx24_update_display(void *opaque)
if (page > page_max) if (page > page_max)
page_max = page; page_max = page;
tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); tcx24_draw_line32(ts, d, s, ts->width, cptr, s24);
if (y >= ts->cursy && y < ts->cursy+32 && ts->cursx < ts->width) {
tcx_draw_cursor32(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
cptr += ds; cptr += ds;
s24 += ds; s24 += ds;
y++;
tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); tcx24_draw_line32(ts, d, s, ts->width, cptr, s24);
if (y >= ts->cursy && y < ts->cursy+32 && ts->cursx < ts->width) {
tcx_draw_cursor32(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
cptr += ds; cptr += ds;
s24 += ds; s24 += ds;
y++;
tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); tcx24_draw_line32(ts, d, s, ts->width, cptr, s24);
if (y >= ts->cursy && y < ts->cursy+32 && ts->cursx < ts->width) {
tcx_draw_cursor32(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
cptr += ds; cptr += ds;
s24 += ds; s24 += ds;
y++;
tcx24_draw_line32(ts, d, s, ts->width, cptr, s24); tcx24_draw_line32(ts, d, s, ts->width, cptr, s24);
if (y >= ts->cursy && y < ts->cursy+32 && ts->cursx < ts->width) {
tcx_draw_cursor32(ts, d, y, ts->width);
}
d += dd; d += dd;
s += ds; s += ds;
cptr += ds; cptr += ds;
s24 += ds; s24 += ds;
y++;
} else { } else {
if (y_start >= 0) { if (y_start >= 0) {
/* flush to display */ /* flush to display */
@ -368,6 +502,7 @@ static void tcx24_update_display(void *opaque)
s += ds * 4; s += ds * 4;
cptr += ds * 4; cptr += ds * 4;
s24 += ds * 4; s24 += ds * 4;
y += 4;
} }
} }
if (y_start >= 0) { if (y_start >= 0) {
@ -377,7 +512,7 @@ static void tcx24_update_display(void *opaque)
} }
/* reset modified pages */ /* reset modified pages */
if (page_max >= page_min) { if (page_max >= page_min) {
reset_dirty(ts, page_min, page_max, page24, cpage); tcx24_reset_dirty(ts, page_min, page_max, page24, cpage);
} }
} }
@ -394,7 +529,6 @@ static void tcx24_invalidate_display(void *opaque)
TCXState *s = opaque; TCXState *s = opaque;
tcx_set_dirty(s); tcx_set_dirty(s);
tcx24_set_dirty(s);
qemu_console_resize(s->con, s->width, s->height); qemu_console_resize(s->con, s->width, s->height);
} }
@ -403,12 +537,7 @@ static int vmstate_tcx_post_load(void *opaque, int version_id)
TCXState *s = opaque; TCXState *s = opaque;
update_palette_entries(s, 0, 256); update_palette_entries(s, 0, 256);
if (s->depth == 24) {
tcx24_set_dirty(s);
} else {
tcx_set_dirty(s); tcx_set_dirty(s);
}
return 0; return 0;
} }
@ -435,56 +564,87 @@ static void tcx_reset(DeviceState *d)
TCXState *s = TCX(d); TCXState *s = TCX(d);
/* Initialize palette */ /* Initialize palette */
memset(s->r, 0, 256); memset(s->r, 0, 260);
memset(s->g, 0, 256); memset(s->g, 0, 260);
memset(s->b, 0, 256); memset(s->b, 0, 260);
s->r[255] = s->g[255] = s->b[255] = 255; s->r[255] = s->g[255] = s->b[255] = 255;
update_palette_entries(s, 0, 256); s->r[256] = s->g[256] = s->b[256] = 255;
s->r[258] = s->g[258] = s->b[258] = 255;
update_palette_entries(s, 0, 260);
memset(s->vram, 0, MAXX*MAXY); memset(s->vram, 0, MAXX*MAXY);
memory_region_reset_dirty(&s->vram_mem, 0, MAXX * MAXY * (1 + 4 + 4), memory_region_reset_dirty(&s->vram_mem, 0, MAXX * MAXY * (1 + 4 + 4),
DIRTY_MEMORY_VGA); DIRTY_MEMORY_VGA);
s->dac_index = 0; s->dac_index = 0;
s->dac_state = 0; s->dac_state = 0;
s->cursx = 0xf000; /* Put cursor off screen */
s->cursy = 0xf000;
} }
static uint64_t tcx_dac_readl(void *opaque, hwaddr addr, static uint64_t tcx_dac_readl(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
return 0; TCXState *s = opaque;
uint32_t val = 0;
switch (s->dac_state) {
case 0:
val = s->r[s->dac_index] << 24;
s->dac_state++;
break;
case 1:
val = s->g[s->dac_index] << 24;
s->dac_state++;
break;
case 2:
val = s->b[s->dac_index] << 24;
s->dac_index = (s->dac_index + 1) & 0xff; /* Index autoincrement */
default:
s->dac_state = 0;
break;
}
return val;
} }
static void tcx_dac_writel(void *opaque, hwaddr addr, uint64_t val, static void tcx_dac_writel(void *opaque, hwaddr addr, uint64_t val,
unsigned size) unsigned size)
{ {
TCXState *s = opaque; TCXState *s = opaque;
unsigned index;
switch (addr) { switch (addr) {
case 0: case 0: /* Address */
s->dac_index = val >> 24; s->dac_index = val >> 24;
s->dac_state = 0; s->dac_state = 0;
break; break;
case 4: case 4: /* Pixel colours */
case 12: /* Overlay (cursor) colours */
if (addr & 8) {
index = (s->dac_index & 3) + 256;
} else {
index = s->dac_index;
}
switch (s->dac_state) { switch (s->dac_state) {
case 0: case 0:
s->r[s->dac_index] = val >> 24; s->r[index] = val >> 24;
update_palette_entries(s, s->dac_index, s->dac_index + 1); update_palette_entries(s, index, index + 1);
s->dac_state++; s->dac_state++;
break; break;
case 1: case 1:
s->g[s->dac_index] = val >> 24; s->g[index] = val >> 24;
update_palette_entries(s, s->dac_index, s->dac_index + 1); update_palette_entries(s, index, index + 1);
s->dac_state++; s->dac_state++;
break; break;
case 2: case 2:
s->b[s->dac_index] = val >> 24; s->b[index] = val >> 24;
update_palette_entries(s, s->dac_index, s->dac_index + 1); update_palette_entries(s, index, index + 1);
s->dac_index = (s->dac_index + 1) & 255; // Index autoincrement s->dac_index = (s->dac_index + 1) & 0xff; /* Index autoincrement */
default: default:
s->dac_state = 0; s->dac_state = 0;
break; break;
} }
break; break;
default: default: /* Control registers */
break; break;
} }
} }
@ -499,20 +659,266 @@ static const MemoryRegionOps tcx_dac_ops = {
}, },
}; };
static uint64_t dummy_readl(void *opaque, hwaddr addr, static uint64_t tcx_stip_readl(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
return 0; return 0;
} }
static void dummy_writel(void *opaque, hwaddr addr, static void tcx_stip_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
TCXState *s = opaque;
int i;
uint32_t col;
if (!(addr & 4)) {
s->tmpblit = val;
} else {
addr = (addr >> 3) & 0xfffff;
col = cpu_to_be32(s->tmpblit);
if (s->depth == 24) {
for (i = 0; i < 32; i++) {
if (val & 0x80000000) {
s->vram[addr + i] = s->tmpblit;
s->vram24[addr + i] = col;
}
val <<= 1;
}
} else {
for (i = 0; i < 32; i++) {
if (val & 0x80000000) {
s->vram[addr + i] = s->tmpblit;
}
val <<= 1;
}
}
memory_region_set_dirty(&s->vram_mem, addr, 32);
}
} }
static const MemoryRegionOps dummy_ops = { static void tcx_rstip_writel(void *opaque, hwaddr addr,
.read = dummy_readl, uint64_t val, unsigned size)
.write = dummy_writel, {
TCXState *s = opaque;
int i;
uint32_t col;
if (!(addr & 4)) {
s->tmpblit = val;
} else {
addr = (addr >> 3) & 0xfffff;
col = cpu_to_be32(s->tmpblit);
if (s->depth == 24) {
for (i = 0; i < 32; i++) {
if (val & 0x80000000) {
s->vram[addr + i] = s->tmpblit;
s->vram24[addr + i] = col;
s->cplane[addr + i] = col;
}
val <<= 1;
}
} else {
for (i = 0; i < 32; i++) {
if (val & 0x80000000) {
s->vram[addr + i] = s->tmpblit;
}
val <<= 1;
}
}
memory_region_set_dirty(&s->vram_mem, addr, 32);
}
}
static const MemoryRegionOps tcx_stip_ops = {
.read = tcx_stip_readl,
.write = tcx_stip_writel,
.endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
.min_access_size = 4,
.max_access_size = 4,
},
};
static const MemoryRegionOps tcx_rstip_ops = {
.read = tcx_stip_readl,
.write = tcx_rstip_writel,
.endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
.min_access_size = 4,
.max_access_size = 4,
},
};
static uint64_t tcx_blit_readl(void *opaque, hwaddr addr,
unsigned size)
{
return 0;
}
static void tcx_blit_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
TCXState *s = opaque;
uint32_t adsr, len;
int i;
if (!(addr & 4)) {
s->tmpblit = val;
} else {
addr = (addr >> 3) & 0xfffff;
adsr = val & 0xffffff;
len = ((val >> 24) & 0x1f) + 1;
if (adsr == 0xffffff) {
memset(&s->vram[addr], s->tmpblit, len);
if (s->depth == 24) {
val = s->tmpblit & 0xffffff;
val = cpu_to_be32(val);
for (i = 0; i < len; i++) {
s->vram24[addr + i] = val;
}
}
} else {
memcpy(&s->vram[addr], &s->vram[adsr], len);
if (s->depth == 24) {
memcpy(&s->vram24[addr], &s->vram24[adsr], len * 4);
}
}
memory_region_set_dirty(&s->vram_mem, addr, len);
}
}
static void tcx_rblit_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
TCXState *s = opaque;
uint32_t adsr, len;
int i;
if (!(addr & 4)) {
s->tmpblit = val;
} else {
addr = (addr >> 3) & 0xfffff;
adsr = val & 0xffffff;
len = ((val >> 24) & 0x1f) + 1;
if (adsr == 0xffffff) {
memset(&s->vram[addr], s->tmpblit, len);
if (s->depth == 24) {
val = s->tmpblit & 0xffffff;
val = cpu_to_be32(val);
for (i = 0; i < len; i++) {
s->vram24[addr + i] = val;
s->cplane[addr + i] = val;
}
}
} else {
memcpy(&s->vram[addr], &s->vram[adsr], len);
if (s->depth == 24) {
memcpy(&s->vram24[addr], &s->vram24[adsr], len * 4);
memcpy(&s->cplane[addr], &s->cplane[adsr], len * 4);
}
}
memory_region_set_dirty(&s->vram_mem, addr, len);
}
}
static const MemoryRegionOps tcx_blit_ops = {
.read = tcx_blit_readl,
.write = tcx_blit_writel,
.endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
.min_access_size = 4,
.max_access_size = 4,
},
};
static const MemoryRegionOps tcx_rblit_ops = {
.read = tcx_blit_readl,
.write = tcx_rblit_writel,
.endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
.min_access_size = 4,
.max_access_size = 4,
},
};
static void tcx_invalidate_cursor_position(TCXState *s)
{
int ymin, ymax, start, end;
/* invalidate only near the cursor */
ymin = s->cursy;
if (ymin >= s->height) {
return;
}
ymax = MIN(s->height, ymin + 32);
start = ymin * 1024;
end = ymax * 1024;
memory_region_set_dirty(&s->vram_mem, start, end-start);
}
static uint64_t tcx_thc_readl(void *opaque, hwaddr addr,
unsigned size)
{
TCXState *s = opaque;
uint64_t val;
if (addr == TCX_THC_MISC) {
val = s->thcmisc | 0x02000000;
} else {
val = 0;
}
return val;
}
static void tcx_thc_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
TCXState *s = opaque;
if (addr == TCX_THC_CURSXY) {
tcx_invalidate_cursor_position(s);
s->cursx = val >> 16;
s->cursy = val;
tcx_invalidate_cursor_position(s);
} else if (addr >= TCX_THC_CURSMASK && addr < TCX_THC_CURSMASK + 128) {
s->cursmask[(addr - TCX_THC_CURSMASK) >> 2] = val;
tcx_invalidate_cursor_position(s);
} else if (addr >= TCX_THC_CURSBITS && addr < TCX_THC_CURSBITS + 128) {
s->cursbits[(addr - TCX_THC_CURSBITS) >> 2] = val;
tcx_invalidate_cursor_position(s);
} else if (addr == TCX_THC_MISC) {
s->thcmisc = val;
}
}
static const MemoryRegionOps tcx_thc_ops = {
.read = tcx_thc_readl,
.write = tcx_thc_writel,
.endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
.min_access_size = 4,
.max_access_size = 4,
},
};
static uint64_t tcx_dummy_readl(void *opaque, hwaddr addr,
unsigned size)
{
return 0;
}
static void tcx_dummy_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
return;
}
static const MemoryRegionOps tcx_dummy_ops = {
.read = tcx_dummy_readl,
.write = tcx_dummy_writel,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
.valid = { .valid = {
.min_access_size = 4, .min_access_size = 4,
@ -540,20 +946,50 @@ static void tcx_initfn(Object *obj)
memory_region_set_readonly(&s->rom, true); memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom); sysbus_init_mmio(sbd, &s->rom);
/* DAC */ /* 2/STIP : Stippler */
memory_region_init_io(&s->stip, OBJECT(s), &tcx_stip_ops, s, "tcx.stip",
TCX_STIP_NREGS);
sysbus_init_mmio(sbd, &s->stip);
/* 3/BLIT : Blitter */
memory_region_init_io(&s->blit, OBJECT(s), &tcx_blit_ops, s, "tcx.blit",
TCX_BLIT_NREGS);
sysbus_init_mmio(sbd, &s->blit);
/* 5/RSTIP : Raw Stippler */
memory_region_init_io(&s->rstip, OBJECT(s), &tcx_rstip_ops, s, "tcx.rstip",
TCX_RSTIP_NREGS);
sysbus_init_mmio(sbd, &s->rstip);
/* 6/RBLIT : Raw Blitter */
memory_region_init_io(&s->rblit, OBJECT(s), &tcx_rblit_ops, s, "tcx.rblit",
TCX_RBLIT_NREGS);
sysbus_init_mmio(sbd, &s->rblit);
/* 7/TEC : ??? */
memory_region_init_io(&s->tec, OBJECT(s), &tcx_dummy_ops, s,
"tcx.tec", TCX_TEC_NREGS);
sysbus_init_mmio(sbd, &s->tec);
/* 8/CMAP : DAC */
memory_region_init_io(&s->dac, OBJECT(s), &tcx_dac_ops, s, memory_region_init_io(&s->dac, OBJECT(s), &tcx_dac_ops, s,
"tcx.dac", TCX_DAC_NREGS); "tcx.dac", TCX_DAC_NREGS);
sysbus_init_mmio(sbd, &s->dac); sysbus_init_mmio(sbd, &s->dac);
/* TEC (dummy) */ /* 9/THC : Cursor */
memory_region_init_io(&s->tec, OBJECT(s), &dummy_ops, s, memory_region_init_io(&s->thc, OBJECT(s), &tcx_thc_ops, s, "tcx.thc",
"tcx.tec", TCX_TEC_NREGS); TCX_THC_NREGS);
sysbus_init_mmio(sbd, &s->tec); sysbus_init_mmio(sbd, &s->thc);
/* THC: NetBSD writes here even with 8-bit display: dummy */ /* 11/DHC : ??? */
memory_region_init_io(&s->thc24, OBJECT(s), &dummy_ops, s, "tcx.thc24", memory_region_init_io(&s->dhc, OBJECT(s), &tcx_dummy_ops, s, "tcx.dhc",
TCX_THC_NREGS_24); TCX_DHC_NREGS);
sysbus_init_mmio(sbd, &s->thc24); sysbus_init_mmio(sbd, &s->dhc);
/* 12/ALT : ??? */
memory_region_init_io(&s->alt, OBJECT(s), &tcx_dummy_ops, s, "tcx.alt",
TCX_ALT_NREGS);
sysbus_init_mmio(sbd, &s->alt);
return; return;
} }
@ -572,7 +1008,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
vmstate_register_ram_global(&s->vram_mem); vmstate_register_ram_global(&s->vram_mem);
vram_base = memory_region_get_ram_ptr(&s->vram_mem); vram_base = memory_region_get_ram_ptr(&s->vram_mem);
/* FCode ROM */ /* 10/ROM : FCode ROM */
vmstate_register_ram_global(&s->rom); vmstate_register_ram_global(&s->rom);
fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE); fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);
if (fcode_filename) { if (fcode_filename) {
@ -583,7 +1019,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
} }
} }
/* 8-bit plane */ /* 0/DFB8 : 8-bit plane */
s->vram = vram_base; s->vram = vram_base;
size = s->vram_size; size = s->vram_size;
memory_region_init_alias(&s->vram_8bit, OBJECT(s), "tcx.vram.8bit", memory_region_init_alias(&s->vram_8bit, OBJECT(s), "tcx.vram.8bit",
@ -592,8 +1028,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
vram_offset += size; vram_offset += size;
vram_base += size; vram_base += size;
if (s->depth == 24) { /* 1/DFB24 : 24bit plane */
/* 24-bit plane */
size = s->vram_size * 4; size = s->vram_size * 4;
s->vram24 = (uint32_t *)vram_base; s->vram24 = (uint32_t *)vram_base;
s->vram24_offset = vram_offset; s->vram24_offset = vram_offset;
@ -603,7 +1038,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
vram_offset += size; vram_offset += size;
vram_base += size; vram_base += size;
/* Control plane */ /* 4/RDFB32 : Raw Framebuffer */
size = s->vram_size * 4; size = s->vram_size * 4;
s->cplane = (uint32_t *)vram_base; s->cplane = (uint32_t *)vram_base;
s->cplane_offset = vram_offset; s->cplane_offset = vram_offset;
@ -611,16 +1046,22 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
&s->vram_mem, vram_offset, size); &s->vram_mem, vram_offset, size);
sysbus_init_mmio(sbd, &s->vram_cplane); sysbus_init_mmio(sbd, &s->vram_cplane);
s->con = graphic_console_init(DEVICE(dev), 0, &tcx24_ops, s); /* 9/THC24bits : NetBSD writes here even with 8-bit display: dummy */
} else { if (s->depth == 8) {
/* THC 8 bit (dummy) */ memory_region_init_io(&s->thc24, OBJECT(s), &tcx_dummy_ops, s,
memory_region_init_io(&s->thc8, OBJECT(s), &dummy_ops, s, "tcx.thc8", "tcx.thc24", TCX_THC_NREGS);
TCX_THC_NREGS_8); sysbus_init_mmio(sbd, &s->thc24);
sysbus_init_mmio(sbd, &s->thc8);
s->con = graphic_console_init(DEVICE(dev), 0, &tcx_ops, s);
} }
sysbus_init_irq(sbd, &s->irq);
if (s->depth == 8) {
s->con = graphic_console_init(DEVICE(dev), 0, &tcx_ops, s);
} else {
s->con = graphic_console_init(DEVICE(dev), 0, &tcx24_ops, s);
}
s->thcmisc = 0;
qemu_console_resize(s->con, s->width, s->height); qemu_console_resize(s->con, s->width, s->height);
} }

56
hw/sparc/sun4m.c
View File

@ -527,7 +527,7 @@ static void apc_init(hwaddr power_base, qemu_irq cpu_halt)
sysbus_connect_irq(s, 0, cpu_halt); sysbus_connect_irq(s, 0, cpu_halt);
} }
static void tcx_init(hwaddr addr, int vram_size, int width, static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
int height, int depth) int height, int depth)
{ {
DeviceState *dev; DeviceState *dev;
@ -541,25 +541,43 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
qdev_prop_set_uint64(dev, "prom_addr", addr); qdev_prop_set_uint64(dev, "prom_addr", addr);
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
/* FCode ROM */
/* 10/ROM : FCode ROM */
sysbus_mmio_map(s, 0, addr); sysbus_mmio_map(s, 0, addr);
/* DAC */ /* 2/STIP : Stipple */
sysbus_mmio_map(s, 1, addr + 0x00200000ULL); sysbus_mmio_map(s, 1, addr + 0x04000000ULL);
/* TEC (dummy) */ /* 3/BLIT : Blitter */
sysbus_mmio_map(s, 2, addr + 0x00700000ULL); sysbus_mmio_map(s, 2, addr + 0x06000000ULL);
/* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */ /* 5/RSTIP : Raw Stipple */
sysbus_mmio_map(s, 3, addr + 0x00301000ULL); sysbus_mmio_map(s, 3, addr + 0x0c000000ULL);
/* 8-bit plane */ /* 6/RBLIT : Raw Blitter */
sysbus_mmio_map(s, 4, addr + 0x00800000ULL); sysbus_mmio_map(s, 4, addr + 0x0e000000ULL);
if (depth == 24) { /* 7/TEC : Transform Engine */
/* 24-bit plane */ sysbus_mmio_map(s, 5, addr + 0x00700000ULL);
sysbus_mmio_map(s, 5, addr + 0x02000000ULL); /* 8/CMAP : DAC */
/* Control plane */ sysbus_mmio_map(s, 6, addr + 0x00200000ULL);
sysbus_mmio_map(s, 6, addr + 0x0a000000ULL); /* 9/THC : */
if (depth == 8) {
sysbus_mmio_map(s, 7, addr + 0x00300000ULL);
} else { } else {
/* THC 8 bit (dummy) */ sysbus_mmio_map(s, 7, addr + 0x00301000ULL);
sysbus_mmio_map(s, 5, addr + 0x00300000ULL);
} }
/* 11/DHC : */
sysbus_mmio_map(s, 8, addr + 0x00240000ULL);
/* 12/ALT : */
sysbus_mmio_map(s, 9, addr + 0x00280000ULL);
/* 0/DFB8 : 8-bit plane */
sysbus_mmio_map(s, 10, addr + 0x00800000ULL);
/* 1/DFB24 : 24bit plane */
sysbus_mmio_map(s, 11, addr + 0x02000000ULL);
/* 4/RDFB32: Raw framebuffer. Control plane */
sysbus_mmio_map(s, 12, addr + 0x0a000000ULL);
/* 9/THC24bits : NetBSD writes here even with 8-bit display: dummy */
if (depth == 8) {
sysbus_mmio_map(s, 13, addr + 0x00301000ULL);
}
sysbus_connect_irq(s, 0, irq);
} }
static void cg3_init(hwaddr addr, qemu_irq irq, int vram_size, int width, static void cg3_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
@ -976,8 +994,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
exit(1); exit(1);
} }
tcx_init(hwdef->tcx_base, 0x00100000, graphic_width, graphic_height, tcx_init(hwdef->tcx_base, slavio_irq[11], 0x00100000,
graphic_depth); graphic_width, graphic_height, graphic_depth);
} }
} }