From: notaz Date: Fri, 16 Jul 2010 22:31:11 +0000 (+0300) Subject: wip, fb sync thread X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=commitdiff_plain;h=c1ffd5ba04171a30be808e2c485e0dd6e25fa48a wip, fb sync thread --- diff --git a/loader/Makefile b/loader/Makefile index 49cf11f..d50bcd5 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -3,7 +3,7 @@ CROSS_COMPILE ?= arm-linux- CC = $(CROSS_COMPILE)gcc AS = $(CROSS_COMPILE)as CFLAGS += -Wall -ggdb -LDFLAGS += -static -ggdb +LDFLAGS += -static -ggdb -lpthread -lrt ifndef DEBUG CFLAGS += -O2 -fno-strict-aliasing LDFLAGS += -s -O2 @@ -22,12 +22,13 @@ endif vpath %.c = ../common/ +TARGET = ginge_sloader OBJ += loader.o loader_$(ARCH).o patches.o emu.o host_fb.o host_pnd.o -ginge_sloader: LDFLAGS += -Wl,-T script_$(ARCH).lds +$(TARGET): LDFLAGS += -Wl,-T script_$(ARCH).lds -ginge_sloader: $(OBJ) +$(TARGET): $(OBJ) $(CC) -o $@ $^ $(LDFLAGS) clean: - $(RM) loader $(OBJ) + $(RM) $(TARGET) $(OBJ) diff --git a/loader/emu.c b/loader/emu.c index c890716..389103e 100644 --- a/loader/emu.c +++ b/loader/emu.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -10,12 +11,16 @@ #include #include #include +#include +#include +#include +#include #include "header.h" #include "sys_cacheflush.h" //#define LOG_IO -//#define LOG_IO_UNH +//#define LOG_IO_UNK //#define LOG_SEGV #ifdef LOG_IO @@ -24,7 +29,7 @@ #define iolog(...) #endif -#ifdef LOG_IO_UNH +#ifdef LOG_IO_UNK #define iolog_unh log_io #else #define iolog_unh(...) @@ -36,7 +41,7 @@ #define segvlog(...) #endif -#if defined(LOG_IO) || defined(LOG_IO_UNH) +#if defined(LOG_IO) || defined(LOG_IO_UNK) #include "mmsp2-regs.h" #endif @@ -44,6 +49,9 @@ typedef unsigned int u32; typedef unsigned short u16; typedef unsigned char u8; +static pthread_mutex_t fb_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t fb_cond = PTHREAD_COND_INITIALIZER; + struct uppermem_block { u32 addr; // physical u32 size; @@ -102,14 +110,14 @@ static u16 *host_screen; static int host_stride; -#if defined(LOG_IO) || defined(LOG_IO_UNH) +#if defined(LOG_IO) || defined(LOG_IO_UNK) static void log_io(const char *pfx, u32 a, u32 d, int size) { const char *fmt, *reg = ""; switch (size) { - case 8: fmt = "%s %08x %02x %s\n"; break; - case 32: fmt = "%s %08x %08x %s\n"; break; - default: fmt = "%s %08x %04x %s\n"; break; + case 8: fmt = "%s %08x %02x %s\n"; d &= 0xff; break; + case 32: fmt = "%s %08x %08x %s\n"; break; + default: fmt = "%s %08x %04x %s\n"; d &= 0xffff; break; } if ((a & ~0xffff) == 0x7f000000) @@ -176,19 +184,6 @@ static void *uppermem_lookup(u32 addr, u8 **mem_end) return NULL; } -static void *blitter_mem_lookup(u32 addr, u8 **mem_end, int *stride_override, int *to_screen) -{ - // maybe the screen? - if (mmsp2.mlc_stl_adr <= addr && addr < mmsp2.mlc_stl_adr + 320*240*2) { - *mem_end = (u8 *)host_screen + host_stride * 240; - *stride_override = host_stride; - *to_screen = 1; - return (u8 *)host_screen + addr - mmsp2.mlc_stl_adr; - } - - return uppermem_lookup(addr, mem_end); -} - static void blitter_do(void) { u8 *dst, *dste, *src = NULL, *srce = NULL; @@ -203,9 +198,12 @@ static void blitter_do(void) // XXX: need to confirm this.. addr = (blitter.dstaddr & ~3) | ((blitter.dstctrl & 0x1f) >> 3); - dst = blitter_mem_lookup(addr, &dste, &dstrd, &to_screen); - if (dst == NULL) - goto bad_blit; + + // maybe the screen? + if (w == 320 && h == 240 && mmsp2.mlc_stl_adr <= addr && addr < mmsp2.mlc_stl_adr + 320*240*2) + to_screen = 1; + + dst = uppermem_lookup(addr, &dste); // XXX: assume fill if no SRCENB, but it could be pattern blit.. if (blitter.srcctrl & SRCCTRL_SRCENB) { @@ -213,7 +211,7 @@ static void blitter_do(void) goto bad_blit; addr = (blitter.srcaddr & ~3) | ((blitter.srcctrl & 0x1f) >> 3); - src = blitter_mem_lookup(addr, &srce, &sstrd, &to_screen); + src = uppermem_lookup(addr, &srce); if (src == NULL) goto bad_blit; @@ -250,7 +248,7 @@ static void blitter_do(void) } if (to_screen) - host_screen = host_video_flip(); + pthread_cond_signal(&fb_cond); return; bad_blit: @@ -260,21 +258,12 @@ bad_blit: } // TODO: hw scaler stuff -static void mlc_flip(u32 addr) +static void mlc_flip(u8 *src, int bpp) { - int mode = (mmsp2.mlc_stl_cntl >> 9) & 3; - int bpp = mode ? mode * 8 : 4; u16 *dst = host_screen; u16 *hpal = mmsp2.host_pal; - u8 *src, *src_end; int i, u; - src = uppermem_lookup(addr, &src_end); - if (src == NULL || src + 320*240 * bpp / 8 > src_end) { - err("mlc_flip: %08x is out of range\n", addr); - return; - } - if (bpp <= 8 && mmsp2.dirty_pal) { u32 *srcp = mmsp2.mlc_stl_pallt_d32; u16 *dstp = hpal; @@ -320,6 +309,79 @@ static void mlc_flip(u32 addr) host_screen = host_video_flip(); } +#define ts_add_nsec(ts, ns) { \ + ts.tv_nsec += ns; \ + if (ts.tv_nsec >= 1000000000) { \ + ts.tv_sec++; \ + ts.tv_nsec -= 1000000000; \ + } \ +} + +static void *fb_sync_thread(void *arg) +{ + int invalid_fb_addr = 1; + int manual_refresh = 0; + struct timespec ts; + int ret, wait_ret; + + //ret = pthread_setschedprio(pthread_self(), -1); + //log("pthread_setschedprio %d\n", ret); + //ret = setpriority(PRIO_PROCESS, 0, -1); + //log("setpriority %d\n", ret); + + ret = clock_gettime(CLOCK_REALTIME, &ts); + if (ret != 0) { + perror(PFX "clock_gettime"); + exit(1); + } + + while (1) { + u8 *gp2x_fb, *gp2x_fb_end; + int mode, bpp; + + ret = pthread_mutex_lock(&fb_mutex); + wait_ret = pthread_cond_timedwait(&fb_cond, &fb_mutex, &ts); + ret |= pthread_mutex_unlock(&fb_mutex); + if (ret != 0) { + err("fb_thread: mutex error: %d\n", ret); + sleep(1); + continue; + } + if (wait_ret != 0 && wait_ret != ETIMEDOUT) { + err("fb_thread: cond error: %d\n", wait_ret); + sleep(1); + continue; + } + + if (wait_ret != ETIMEDOUT) { + clock_gettime(CLOCK_REALTIME, &ts); + ts_add_nsec(ts, 50000000); + manual_refresh++; + if (manual_refresh == 2) + log("fb_thread: switch to manual refresh\n"); + } else { + ts_add_nsec(ts, 16666667); + if (manual_refresh > 1) + log("fb_thread: switch to auto refresh\n"); + manual_refresh = 0; + } + + mode = (mmsp2.mlc_stl_cntl >> 9) & 3; + bpp = mode ? mode * 8 : 4; + + gp2x_fb = uppermem_lookup(mmsp2.mlc_stl_adr, &gp2x_fb_end); + if (gp2x_fb == NULL || gp2x_fb + 320*240 * bpp / 8 > gp2x_fb_end) { + if (!invalid_fb_addr) { + err("fb_thread: %08x is out of range\n", mmsp2.mlc_stl_adr); + invalid_fb_addr = 1; + } + continue; + } + + mlc_flip(gp2x_fb, bpp); + } +} + static u32 xread8(u32 a) { iolog("r8 ", a, 0, 8); @@ -360,9 +422,26 @@ static u32 xread16(u32 a) d = ~mmsp2.btn_state & 0xff; d |= 0x01aa; break; + case 0x1836: // reserved + d = 0x2330; + break; + case 0x2816: // DPC_X_MAX + d = 319; + break; + case 0x2818: // DPC_Y_MAX + d = 239; + break; case 0x28da: d = mmsp2.mlc_stl_cntl; break; + case 0x290e: + case 0x2912: + d = mmsp2.mlc_stl_adrl; + break; + case 0x2910: + case 0x2914: + d = mmsp2.mlc_stl_adrh; + break; case 0x2958: d = mmsp2.mlc_stl_pallt_a; break; @@ -431,7 +510,8 @@ static void xwrite16(u32 a, u32 d) case 0x2914: mmsp2.mlc_stl_adrh = d; if (mmsp2.mlc_stl_adr != mmsp2.old_mlc_stl_adr) - mlc_flip(mmsp2.mlc_stl_adr); + // ask for refresh + pthread_cond_signal(&fb_cond); mmsp2.old_mlc_stl_adr = mmsp2.mlc_stl_adr; return; case 0x2958: @@ -486,7 +566,6 @@ static struct linkpage *g_linkpage; static u32 *g_code_ptr; static int g_linkpage_count; -#define HANDLER_STACK_SIZE 4096 static void *g_handler_stack_end; #define BIT_SET(v, b) (v & (1 << (b))) @@ -662,6 +741,7 @@ static void segv_sigaction(int num, siginfo_t *info, void *ctx) err("segv %d %p @ %08x\n", info->si_code, info->si_addr, regs[15]); signal(num, SIG_DFL); raise(num); + return; } segvlog("segv %d %p @ %08x\n", info->si_code, info->si_addr, regs[15]); @@ -709,23 +789,14 @@ void emu_init(void *map_bottom) .sa_sigaction = segv_sigaction, .sa_flags = SA_SIGINFO, }; + pthread_t tid; void *pret; int ret; - sigemptyset(&segv_action.sa_mask); - sigaction(SIGSEGV, &segv_action, NULL); - - pret = mmap(NULL, HANDLER_STACK_SIZE + 4096, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0); - if (pret == MAP_FAILED) { - perror(PFX "mmap handler_stack"); - exit(1); - } - ret = mprotect((char *)pret + 4096, HANDLER_STACK_SIZE, PROT_READ | PROT_WRITE); - if (ret != 0) { - perror(PFX "mprotect handler_stack"); - exit(1); - } - g_handler_stack_end = (char *)pret + HANDLER_STACK_SIZE + 4096; + g_handler_stack_end = (void *)((long)alloca(1536 * 1024) & ~0xffff); + log("handler stack @ %p (current %p)\n", g_handler_stack_end, &ret); + // touch it now. If we crash now we'll know why + *((char *)g_handler_stack_end - 4096) = 1; g_linkpage = (void *)(((u32)map_bottom - LINKPAGE_ALLOC) & ~0xfff); pret = mmap(g_linkpage, LINKPAGE_ALLOC, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); @@ -733,7 +804,7 @@ void emu_init(void *map_bottom) perror(PFX "mmap linkpage"); exit(1); } - printf("linkpages @ %p\n", g_linkpage); + log("linkpages @ %p\n", g_linkpage); init_linkpage(); // host stuff @@ -743,6 +814,19 @@ void emu_init(void *map_bottom) exit(1); } host_screen = host_video_flip(); + + ret = pthread_create(&tid, NULL, fb_sync_thread, NULL); + if (ret != 0) { + err("failed to create fb_sync_thread: %d\n", ret); + exit(1); + } + pthread_detach(tid); + + // mmsp2 defaults + mmsp2.mlc_stl_adr = 0x03101000; // fb2 is at 0x03381000 + + sigemptyset(&segv_action.sa_mask); + sigaction(SIGSEGV, &segv_action, NULL); } int emu_read_gpiodev(void *buf, int count) @@ -779,11 +863,9 @@ void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset if ((offset & 0xfe000000) != 0x02000000) err("unexpected devmem mmap @ %08x\n", offset); - // return mmap(NULL, length, prot, flags, memdev, offset); - umem = calloc(1, sizeof(*umem)); if (umem == NULL) { - printf("OOM\n"); + err("OOM\n"); return MAP_FAILED; } @@ -793,7 +875,7 @@ void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset if (umem->mem != MAP_FAILED) goto done; - printf("upper mem @ %08x %d mmap fail, trying backing file\n", offset, length); + log("upper mem @ %08x %d mmap fail, trying backing file\n", offset, length); sprintf(name, "m%08x", offset); fd = open(name, O_CREAT|O_RDWR, 0644); lseek(fd, length - 1, SEEK_SET); @@ -809,7 +891,7 @@ void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset } done: - printf("upper mem @ %08x %d\n", offset, length); + log("upper mem @ %08x %d\n", offset, length); umem->next = upper_mem; upper_mem = umem; return umem->mem; diff --git a/loader/header.h b/loader/header.h index 2848dff..8197664 100644 --- a/loader/header.h +++ b/loader/header.h @@ -2,6 +2,7 @@ #define PFX "ginge: " #define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__) +#define log(f, ...) fprintf(stdout, PFX f, ##__VA_ARGS__) void do_entry(unsigned long entry, void *stack_frame, int stack_frame_cnt, void *exitf); diff --git a/loader/mmsp2-regs.h b/loader/mmsp2-regs.h index fbc8877..059484d 100644 --- a/loader/mmsp2-regs.h +++ b/loader/mmsp2-regs.h @@ -380,6 +380,8 @@ static const char * const regnames[0x10000] = { [0x2848] = "DPC_CLKCNTL", /* MLC */ +[0X2880] = "MLC_OVLAY_CNTR", +[0X2882] = "MLC_YUV_EFECT", [0X2884] = "MLC_YUV_CNTL", [0X2886] = "MLC_YUVA_TP_HSC", [0X2888] = "MLC_YUVA_BT_HSC", diff --git a/loader/patches.c b/loader/patches.c index ccbaadf..402de84 100644 --- a/loader/patches.c +++ b/loader/patches.c @@ -11,6 +11,7 @@ #include "sys_cacheflush.h" #define strace(...) +//#define strace printf static const unsigned int sig_open[] = { 0xe59cc000, 0xe33c0000, 0x1a000003, 0xef900005 @@ -29,17 +30,39 @@ static const unsigned int sig_read[] = { 0xe59fc080, 0xe59cc000, 0xe33c0000, 0x1a000003, 0xef900003 }; -#define FAKE_DEVMEM_DEVICE 10001 -#define FAKE_DEVGPIO_DEVICE 10002 +enum { + FAKEDEV_MEM = 10001, + FAKEDEV_GPIO, + FAKEDEV_FB0, + FAKEDEV_FB1, + FAKEDEV_MMUHACK, +}; + +static const struct { + const char *name; + int fd; +} takeover_devs[] = { + { "/dev/mem", FAKEDEV_MEM }, + { "/dev/GPIO", FAKEDEV_GPIO }, + { "/dev/fb0", FAKEDEV_FB0 }, + { "/dev/fb/0", FAKEDEV_FB0 }, + { "/dev/fb1", FAKEDEV_FB1 }, + { "/dev/fb/1", FAKEDEV_FB1 }, + { "/dev/mmuhack", FAKEDEV_MMUHACK }, +}; static int w_open(const char *pathname, int flags, mode_t mode) { - int ret; - if (strcmp(pathname, "/dev/mem") == 0) - ret = FAKE_DEVMEM_DEVICE; - else if (strcmp(pathname, "/dev/GPIO") == 0) - ret = FAKE_DEVGPIO_DEVICE; - else + int i, ret; + + for (i = 0; i < ARRAY_SIZE(takeover_devs); i++) { + if (strcmp(pathname, takeover_devs[i].name) == 0) { + ret = takeover_devs[i].fd; + break; + } + } + + if (i == ARRAY_SIZE(takeover_devs)) ret = open(pathname, flags, mode); strace("open(%s) = %d\n", pathname, ret); @@ -49,12 +72,15 @@ static int w_open(const char *pathname, int flags, mode_t mode) static void *w_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) { void *ret; - if (fd != FAKE_DEVMEM_DEVICE) + if (fd != FAKEDEV_MEM) ret = mmap(addr, length, prot, flags, fd, offset); else ret = emu_mmap_dev(length, prot, flags, offset); - strace("mmap(%p, %x, %x, %x, %d, %lx) = %p\n", addr, length, prot, flags, fd, (long)offset, ret); + // threads are using heap before they mmap their stack + // printf needs valid stack for pthtead/errno + if (((long)&ret & 0xf0000000) == 0xb0000000) + strace("mmap(%p, %x, %x, %x, %d, %lx) = %p\n", addr, length, prot, flags, fd, (long)offset, ret); return ret; } #define w_mmap_ w_mmap @@ -62,7 +88,7 @@ static void *w_mmap(void *addr, size_t length, int prot, int flags, int fd, off_ ssize_t w_read(int fd, void *buf, size_t count) { ssize_t ret; - if (fd != FAKE_DEVGPIO_DEVICE) + if (fd != FAKEDEV_GPIO) return read(fd, buf, count); ret = emu_read_gpiodev(buf, count);