hw/pl110: Model the PL111 CLCD controller
Model the PL111 CLCD controller. This is a minor variation on the PL110; the major programmer visible differences are support for hardware cursor (unimplemented) and two new pixel formats. Since syborg_fb.c borrows the pl11x pixel drawing routines, we also update it to cope with the new slightly larger array of function pointers. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
parent
8b2a04eeb9
commit
4fbf55568b
94
hw/pl110.c
94
hw/pl110.c
|
|
@ -24,15 +24,25 @@ enum pl110_bppmode
|
|||
BPP_4,
|
||||
BPP_8,
|
||||
BPP_16,
|
||||
BPP_32
|
||||
BPP_32,
|
||||
BPP_16_565, /* PL111 only */
|
||||
BPP_12 /* PL111 only */
|
||||
};
|
||||
|
||||
|
||||
/* The Versatile/PB uses a slightly modified PL110 controller. */
|
||||
enum pl110_version
|
||||
{
|
||||
PL110,
|
||||
PL110_VERSATILE,
|
||||
PL111
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
SysBusDevice busdev;
|
||||
DisplayState *ds;
|
||||
|
||||
/* The Versatile/PB uses a slightly modified PL110 controller. */
|
||||
int versatile;
|
||||
int version;
|
||||
uint32_t timing[4];
|
||||
uint32_t cr;
|
||||
uint32_t upbase;
|
||||
|
|
@ -53,7 +63,7 @@ static const VMStateDescription vmstate_pl110 = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_INT32(versatile, pl110_state),
|
||||
VMSTATE_INT32(version, pl110_state),
|
||||
VMSTATE_UINT32_ARRAY(timing, pl110_state, 4),
|
||||
VMSTATE_UINT32(cr, pl110_state),
|
||||
VMSTATE_UINT32(upbase, pl110_state),
|
||||
|
|
@ -82,6 +92,17 @@ static const unsigned char pl110_versatile_id[] =
|
|||
#define pl110_versatile_id pl110_id
|
||||
#endif
|
||||
|
||||
static const unsigned char pl111_id[] = {
|
||||
0x11, 0x11, 0x24, 0x00, 0x0d, 0xf0, 0x05, 0xb1
|
||||
};
|
||||
|
||||
/* Indexed by pl110_version */
|
||||
static const unsigned char *idregs[] = {
|
||||
pl110_id,
|
||||
pl110_versatile_id,
|
||||
pl111_id
|
||||
};
|
||||
|
||||
#include "pixel_ops.h"
|
||||
|
||||
#define BITS 8
|
||||
|
|
@ -144,12 +165,30 @@ static void pl110_update_display(void *opaque)
|
|||
if (s->cr & PL110_CR_BGR)
|
||||
bpp_offset = 0;
|
||||
else
|
||||
bpp_offset = 18;
|
||||
bpp_offset = 24;
|
||||
|
||||
if ((s->version != PL111) && (s->bpp == BPP_16)) {
|
||||
/* The PL110's native 16 bit mode is 5551; however
|
||||
* most boards with a PL110 implement an external
|
||||
* mux which allows bits to be reshuffled to give
|
||||
* 565 format. The mux is typically controlled by
|
||||
* an external system register.
|
||||
* This should be controlled by a GPIO input pin
|
||||
* so boards can wire it up to their register.
|
||||
* For now, force 16 bit to be 565, to match
|
||||
* previous QEMU PL110 model behaviour.
|
||||
*
|
||||
* The PL111 straightforwardly implements both
|
||||
* 5551 and 565 under control of the bpp field
|
||||
* in the LCDControl register.
|
||||
*/
|
||||
bpp_offset += (BPP_16_565 - BPP_16);
|
||||
}
|
||||
|
||||
if (s->cr & PL110_CR_BEBO)
|
||||
fn = fntable[s->bpp + 6 + bpp_offset];
|
||||
fn = fntable[s->bpp + 8 + bpp_offset];
|
||||
else if (s->cr & PL110_CR_BEPO)
|
||||
fn = fntable[s->bpp + 12 + bpp_offset];
|
||||
fn = fntable[s->bpp + 16 + bpp_offset];
|
||||
else
|
||||
fn = fntable[s->bpp + bpp_offset];
|
||||
|
||||
|
|
@ -167,6 +206,8 @@ static void pl110_update_display(void *opaque)
|
|||
case BPP_8:
|
||||
break;
|
||||
case BPP_16:
|
||||
case BPP_16_565:
|
||||
case BPP_12:
|
||||
src_width <<= 1;
|
||||
break;
|
||||
case BPP_32:
|
||||
|
|
@ -253,10 +294,7 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t offset)
|
|||
pl110_state *s = (pl110_state *)opaque;
|
||||
|
||||
if (offset >= 0xfe0 && offset < 0x1000) {
|
||||
if (s->versatile)
|
||||
return pl110_versatile_id[(offset - 0xfe0) >> 2];
|
||||
else
|
||||
return pl110_id[(offset - 0xfe0) >> 2];
|
||||
return idregs[s->version][(offset - 0xfe0) >> 2];
|
||||
}
|
||||
if (offset >= 0x200 && offset < 0x400) {
|
||||
return s->raw_pallette[(offset - 0x200) >> 2];
|
||||
|
|
@ -275,12 +313,14 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t offset)
|
|||
case 5: /* LCDLPBASE */
|
||||
return s->lpbase;
|
||||
case 6: /* LCDIMSC */
|
||||
if (s->versatile)
|
||||
return s->cr;
|
||||
if (s->version != PL110) {
|
||||
return s->cr;
|
||||
}
|
||||
return s->int_mask;
|
||||
case 7: /* LCDControl */
|
||||
if (s->versatile)
|
||||
return s->int_mask;
|
||||
if (s->version != PL110) {
|
||||
return s->int_mask;
|
||||
}
|
||||
return s->cr;
|
||||
case 8: /* LCDRIS */
|
||||
return s->int_status;
|
||||
|
|
@ -337,15 +377,17 @@ static void pl110_write(void *opaque, target_phys_addr_t offset,
|
|||
s->lpbase = val;
|
||||
break;
|
||||
case 6: /* LCDIMSC */
|
||||
if (s->versatile)
|
||||
if (s->version != PL110) {
|
||||
goto control;
|
||||
}
|
||||
imsc:
|
||||
s->int_mask = val;
|
||||
pl110_update(s);
|
||||
break;
|
||||
case 7: /* LCDControl */
|
||||
if (s->versatile)
|
||||
if (s->version != PL110) {
|
||||
goto imsc;
|
||||
}
|
||||
control:
|
||||
s->cr = val;
|
||||
s->bpp = (val >> 1) & 7;
|
||||
|
|
@ -393,7 +435,14 @@ static int pl110_init(SysBusDevice *dev)
|
|||
static int pl110_versatile_init(SysBusDevice *dev)
|
||||
{
|
||||
pl110_state *s = FROM_SYSBUS(pl110_state, dev);
|
||||
s->versatile = 1;
|
||||
s->version = PL110_VERSATILE;
|
||||
return pl110_init(dev);
|
||||
}
|
||||
|
||||
static int pl111_init(SysBusDevice *dev)
|
||||
{
|
||||
pl110_state *s = FROM_SYSBUS(pl110_state, dev);
|
||||
s->version = PL111;
|
||||
return pl110_init(dev);
|
||||
}
|
||||
|
||||
|
|
@ -413,10 +462,19 @@ static SysBusDeviceInfo pl110_versatile_info = {
|
|||
.qdev.no_user = 1,
|
||||
};
|
||||
|
||||
static SysBusDeviceInfo pl111_info = {
|
||||
.init = pl111_init,
|
||||
.qdev.name = "pl111",
|
||||
.qdev.size = sizeof(pl110_state),
|
||||
.qdev.vmsd = &vmstate_pl110,
|
||||
.qdev.no_user = 1,
|
||||
};
|
||||
|
||||
static void pl110_register_devices(void)
|
||||
{
|
||||
sysbus_register_withprop(&pl110_info);
|
||||
sysbus_register_withprop(&pl110_versatile_info);
|
||||
sysbus_register_withprop(&pl111_info);
|
||||
}
|
||||
|
||||
device_init(pl110_register_devices)
|
||||
|
|
|
|||
|
|
@ -43,49 +43,61 @@
|
|||
#include "pl110_template.h"
|
||||
#undef BORDER
|
||||
|
||||
static drawfn glue(pl110_draw_fn_,BITS)[36] =
|
||||
static drawfn glue(pl110_draw_fn_,BITS)[48] =
|
||||
{
|
||||
glue(pl110_draw_line1_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line2_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line4_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line8_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line16_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line16_555_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line32_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line16_lblp_bgr,BITS),
|
||||
glue(pl110_draw_line12_lblp_bgr,BITS),
|
||||
|
||||
glue(pl110_draw_line1_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line2_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line4_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line8_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_555_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line32_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_bbbp_bgr,BITS),
|
||||
glue(pl110_draw_line12_bbbp_bgr,BITS),
|
||||
|
||||
glue(pl110_draw_line1_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line2_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line4_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line8_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_555_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line32_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line16_lbbp_bgr,BITS),
|
||||
glue(pl110_draw_line12_lbbp_bgr,BITS),
|
||||
|
||||
glue(pl110_draw_line1_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line2_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line4_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line8_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line16_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line16_555_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line32_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line16_lblp_rgb,BITS),
|
||||
glue(pl110_draw_line12_lblp_rgb,BITS),
|
||||
|
||||
glue(pl110_draw_line1_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line2_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line4_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line8_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_555_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line32_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_bbbp_rgb,BITS),
|
||||
glue(pl110_draw_line12_bbbp_rgb,BITS),
|
||||
|
||||
glue(pl110_draw_line1_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line2_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line4_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line8_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_555_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line32_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line16_lbbp_rgb,BITS),
|
||||
glue(pl110_draw_line12_lbbp_rgb,BITS),
|
||||
};
|
||||
|
||||
#undef BITS
|
||||
|
|
@ -299,6 +311,82 @@ static void glue(pl110_draw_line32_,NAME)(void *opaque, uint8_t *d, const uint8_
|
|||
}
|
||||
}
|
||||
|
||||
static void glue(pl110_draw_line16_555_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
|
||||
{
|
||||
/* RGB 555 plus an intensity bit (which we ignore) */
|
||||
uint32_t data;
|
||||
unsigned int r, g, b;
|
||||
while (width > 0) {
|
||||
data = *(uint32_t *)src;
|
||||
#ifdef SWAP_WORDS
|
||||
data = bswap32(data);
|
||||
#endif
|
||||
#ifdef RGB
|
||||
#define LSB r
|
||||
#define MSB b
|
||||
#else
|
||||
#define LSB b
|
||||
#define MSB r
|
||||
#endif
|
||||
LSB = (data & 0x1f) << 3;
|
||||
data >>= 5;
|
||||
g = (data & 0x1f) << 3;
|
||||
data >>= 5;
|
||||
MSB = (data & 0x1f) << 3;
|
||||
data >>= 5;
|
||||
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
|
||||
LSB = (data & 0x1f) << 3;
|
||||
data >>= 5;
|
||||
g = (data & 0x1f) << 3;
|
||||
data >>= 5;
|
||||
MSB = (data & 0x1f) << 3;
|
||||
data >>= 6;
|
||||
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
|
||||
#undef MSB
|
||||
#undef LSB
|
||||
width -= 2;
|
||||
src += 4;
|
||||
}
|
||||
}
|
||||
|
||||
static void glue(pl110_draw_line12_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
|
||||
{
|
||||
/* RGB 444 with 4 bits of zeroes at the top of each halfword */
|
||||
uint32_t data;
|
||||
unsigned int r, g, b;
|
||||
while (width > 0) {
|
||||
data = *(uint32_t *)src;
|
||||
#ifdef SWAP_WORDS
|
||||
data = bswap32(data);
|
||||
#endif
|
||||
#ifdef RGB
|
||||
#define LSB r
|
||||
#define MSB b
|
||||
#else
|
||||
#define LSB b
|
||||
#define MSB r
|
||||
#endif
|
||||
LSB = (data & 0xf) << 4;
|
||||
data >>= 4;
|
||||
g = (data & 0xf) << 4;
|
||||
data >>= 4;
|
||||
MSB = (data & 0xf) << 4;
|
||||
data >>= 8;
|
||||
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
|
||||
LSB = (data & 0xf) << 4;
|
||||
data >>= 4;
|
||||
g = (data & 0xf) << 4;
|
||||
data >>= 4;
|
||||
MSB = (data & 0xf) << 4;
|
||||
data >>= 8;
|
||||
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
|
||||
#undef MSB
|
||||
#undef LSB
|
||||
width -= 2;
|
||||
src += 4;
|
||||
}
|
||||
}
|
||||
|
||||
#undef SWAP_PIXELS
|
||||
#undef NAME
|
||||
#undef SWAP_WORDS
|
||||
|
|
|
|||
|
|
@ -217,15 +217,24 @@ static void syborg_fb_update_display(void *opaque)
|
|||
}
|
||||
|
||||
if (s->rgb) {
|
||||
bpp_offset = 18;
|
||||
bpp_offset = 24;
|
||||
} else {
|
||||
bpp_offset = 0;
|
||||
}
|
||||
if (s->endian) {
|
||||
bpp_offset += 6;
|
||||
bpp_offset += 8;
|
||||
}
|
||||
|
||||
fn = fntable[s->bpp + bpp_offset];
|
||||
/* Our bpp constants mostly match the PL110/PL111 but
|
||||
* not for the 16 bit case
|
||||
*/
|
||||
switch (s->bpp) {
|
||||
case BPP_SRC_16:
|
||||
bpp_offset += 6;
|
||||
break;
|
||||
default:
|
||||
bpp_offset += s->bpp;
|
||||
}
|
||||
fn = fntable[bpp_offset];
|
||||
|
||||
if (s->pitch) {
|
||||
src_width = s->pitch;
|
||||
|
|
|
|||
Loading…
Reference in New Issue