X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_pollux.c;h=61c1e7424d0e3bb6439ede984088c116cb0b6bfb;hp=d710e8f740512d111dd6ca89542edd5d702ddf6f;hb=b3254af90fafc88bd1b40566de65a0471771c8d5;hpb=55b0eeea6028e00741e620d28ab3211c49b8515f

diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c
index d710e8f7..61c1e742 100644
--- a/frontend/plat_pollux.c
+++ b/frontend/plat_pollux.c
@@ -24,6 +24,7 @@
 #include "main.h"
 #include "menu.h"
 #include "plat.h"
+#include "pcnt.h"
 
 static int fbdev = -1, memdev = -1, battdev = -1;
 static volatile unsigned short *memregs;
@@ -32,11 +33,13 @@ static void *fb_vaddrs[2];
 static unsigned int fb_paddrs[2];
 static int fb_work_buf;
 static int cpu_clock_allowed;
+static unsigned int saved_video_regs[2][6];
+#define FB_VRAM_SIZE (320*240*2*2*2) // 2 buffers with space for 24bpp mode
 
 static unsigned short *psx_vram;
 static unsigned int psx_vram_padds[512];
 static int psx_offset, psx_step, psx_width, psx_height, psx_bpp;
-static int fb_offset;
+static int fb_offset_x, fb_offset_y;
 
 // TODO: get rid of this
 struct vout_fbdev;
@@ -50,8 +53,9 @@ int omap_enable_layer(int enabled)
 
 static void *fb_flip(void)
 {
-	memregl[0x406C>>2] = fb_paddrs[fb_work_buf];
+	memregl[0x406C>>2] = memregl[0x446C>>2] = fb_paddrs[fb_work_buf];
 	memregl[0x4058>>2] |= 0x10;
+	memregl[0x4458>>2] |= 0x10;
 	fb_work_buf ^= 1;
 	return fb_vaddrs[fb_work_buf];
 }
@@ -85,12 +89,17 @@ static void pollux_changemode(int bpp, int is_bgr)
 			return;
 	}
 
-	memregl[0x405c>>2] = bytes;
-	memregl[0x4060>>2] = 320 * bytes;
+	// program both MLCs so that TV-out works
+	memregl[0x405c>>2] = memregl[0x445c>>2] = bytes;
+	memregl[0x4060>>2] = memregl[0x4460>>2] = 320 * bytes;
 
 	r = memregl[0x4058>>2];
 	r = (r & 0xffff) | (code << 16) | 0x10;
 	memregl[0x4058>>2] = r;
+
+	r = memregl[0x4458>>2];
+	r = (r & 0xffff) | (code << 16) | 0x10;
+	memregl[0x4458>>2] = r;
 }
 
 /* note: both PLLs are programmed the same way,
@@ -217,7 +226,6 @@ void plat_video_menu_end(void)
 
 void plat_video_menu_leave(void)
 {
-	pollux_changemode(psx_bpp, 1);
 	if (psx_vram == NULL) {
 		fprintf(stderr, "GPU plugin did not provide vram\n");
 		exit(1);
@@ -225,6 +233,12 @@ void plat_video_menu_leave(void)
 
 	in_set_config_int(in_name_to_id("evdev:pollux-analog"),
 			IN_CFG_ABS_DEAD_ZONE, analog_deadzone);
+
+	memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
+	g_menuscreen_ptr = fb_flip();
+	memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
+
+	pollux_changemode(psx_bpp, 1);
 }
 
 static void pl_vout_set_raw_vram(void *vram)
@@ -248,7 +262,6 @@ static void pl_vout_set_raw_vram(void *vram)
 static void *pl_vout_set_mode(int w, int h, int bpp)
 {
 	static int old_w, old_h, old_bpp;
-	int fboff_w, fboff_h;
 	int poff_w, poff_h;
 
 	if (!w || !h || !bpp || (w == old_w && h == old_h && bpp == old_bpp))
@@ -271,14 +284,20 @@ static void *pl_vout_set_mode(int w, int h, int bpp)
 		poff_h = h / 2 - 240/2;
 		h = 240;
 	}
-	fboff_w = 320/2 - w / 2;
-	fboff_h = 240/2 - h / 2;
+	fb_offset_x = 320/2 - w / 2;
+	fb_offset_y = 240/2 - h / 2;
 
 	psx_offset = poff_h * 1024 + poff_w;
 	psx_width = w;
 	psx_height = h;
 	psx_bpp = bpp;
-	fb_offset = fboff_h * 320 + fboff_w;
+
+	if (fb_offset_x || fb_offset_y) {
+		// not fullscreen, must clear borders
+		memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
+		g_menuscreen_ptr = fb_flip();
+		memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
+	}
 
 	pollux_changemode(bpp, 1);
 
@@ -300,7 +319,8 @@ static void spend_cycles(int loops)
 /* this takes ~1.5ms, while ldm/stm ~1.95ms */
 static void raw_flip_dma(int x, int y)
 {
-	unsigned int dst = fb_paddrs[fb_work_buf] + fb_offset * psx_bpp / 8;
+	unsigned int dst = fb_paddrs[fb_work_buf] +
+			(fb_offset_y * 320 + fb_offset_x) * psx_bpp / 8;
 	int spsx_line = y + (psx_offset >> 10);
 	int spsx_offset = (x + psx_offset) & 0x3f8;
 	int dst_stride = 320 * psx_bpp / 8;
@@ -309,6 +329,7 @@ static void raw_flip_dma(int x, int y)
 	int i;
 
 	warm_cache_op_all(WOP_D_CLEAN);
+	pcnt_start(PCNT_BLIT);
 
 	dst &= ~7;
 	len &= ~7;
@@ -338,17 +359,20 @@ static void raw_flip_dma(int x, int y)
 
 	if (psx_bpp == 16) {
 		pl_vout_buf = g_menuscreen_ptr;
-		pl_print_hud(psx_width, psx_height);
+		pl_print_hud(320, fb_offset_y + psx_height, fb_offset_x);
 	}
 
 	g_menuscreen_ptr = fb_flip();
 	pl_flip_cnt++;
+
+	pcnt_end(PCNT_BLIT);
 }
 
 static void raw_flip_soft(int x, int y)
 {
 	unsigned short *src = psx_vram + y * 1024 + x + psx_offset;
-	unsigned char *dst = (unsigned char *)g_menuscreen_ptr + fb_offset * psx_bpp / 8;
+	unsigned char *dst = (unsigned char *)g_menuscreen_ptr +
+			(fb_offset_y * 320 + fb_offset_x) * psx_bpp / 8;
 	int dst_stride = 320 * psx_bpp / 8;
 	int len = psx_width * psx_bpp / 8;
 	//unsigned int st = timer_get();
@@ -361,13 +385,36 @@ static void raw_flip_soft(int x, int y)
 
 	if (psx_bpp == 16) {
 		pl_vout_buf = g_menuscreen_ptr;
-		pl_print_hud(psx_width, psx_height);
+		pl_print_hud(320, fb_offset_y + psx_height, fb_offset_x);
 	}
 
 	g_menuscreen_ptr = fb_flip();
 	pl_flip_cnt++;
 }
 
+static void *pl_vout_flip(void)
+{
+	return NULL;
+}
+
+static void save_multiple_regs(unsigned int *dest, int base, int count)
+{
+	const volatile unsigned int *regs = memregl + base / 4;
+	int i;
+
+	for (i = 0; i < count; i++)
+		dest[i] = regs[i];
+}
+
+static void restore_multiple_regs(int base, const unsigned int *src, int count)
+{
+	volatile unsigned int *regs = memregl + base / 4;
+	int i;
+
+	for (i = 0; i < count; i++)
+		regs[i] = src[i];
+}
+
 void plat_init(void)
 {
 	const char *main_fb_name = "/dev/fb0";
@@ -388,6 +435,10 @@ void plat_init(void)
 	}
 	memregl = (volatile void *)memregs;
 
+	// save video regs of both MLCs
+	save_multiple_regs(saved_video_regs[0], 0x4058, ARRAY_SIZE(saved_video_regs[0]));
+	save_multiple_regs(saved_video_regs[1], 0x4458, ARRAY_SIZE(saved_video_regs[1]));
+
 	fbdev = open(main_fb_name, O_RDWR);
 	if (fbdev == -1) {
 		fprintf(stderr, "%s: ", main_fb_name);
@@ -404,7 +455,7 @@ void plat_init(void)
 	fb_paddrs[0] = fbfix.smem_start;
 	fb_paddrs[1] = fb_paddrs[0] + 320*240*4; // leave space for 24bpp
 
-	fb_vaddrs[0] = mmap(0, 320*240*2*4, PROT_READ|PROT_WRITE,
+	fb_vaddrs[0] = mmap(0, FB_VRAM_SIZE, PROT_READ|PROT_WRITE,
 				MAP_SHARED, memdev, fb_paddrs[0]);
 	if (fb_vaddrs[0] == MAP_FAILED) {
 		perror("mmap(fb_vaddrs) failed");
@@ -474,6 +525,7 @@ void plat_init(void)
 	// hmh
 	plat_rescan_inputs();
 
+	pl_rearmed_cbs.pl_vout_flip = pl_vout_flip;
 	pl_rearmed_cbs.pl_vout_raw_flip = warm_ret == 0 ? raw_flip_dma : raw_flip_soft;
 	pl_rearmed_cbs.pl_vout_set_mode = pl_vout_set_mode;
 	pl_rearmed_cbs.pl_vout_set_raw_vram = pl_vout_set_raw_vram;
@@ -487,14 +539,17 @@ void plat_finish(void)
 {
 	warm_finish();
 	timer_cleanup();
-	pollux_changemode(16, 0);
-	fb_work_buf = 0;
-	fb_flip();
+
+	memset(fb_vaddrs[0], 0, FB_VRAM_SIZE);
+	restore_multiple_regs(0x4058, saved_video_regs[0], ARRAY_SIZE(saved_video_regs[0]));
+	restore_multiple_regs(0x4458, saved_video_regs[1], ARRAY_SIZE(saved_video_regs[1]));
+	memregl[0x4058>>2] |= 0x10;
+	memregl[0x4458>>2] |= 0x10;
+	munmap(fb_vaddrs[0], FB_VRAM_SIZE);
+	close(fbdev);
 
 	if (battdev >= 0)
 		close(battdev);
-	munmap(fb_vaddrs[0], 320*240*2*2);
-	close(fbdev);
 	munmap((void *)memregs, 0x20000);
 	close(memdev);
 }