From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Fri, 15 Nov 2013 10:25:58 +0000 (+0100)
Subject: videomixer: clear framebuffers
X-Git-Tag: 24jan2021_ls180~2804
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d225bdf362cf72c2d90bc7bd7a3f0c9555cde500;p=litex.git

videomixer: clear framebuffers
---

diff --git a/software/videomixer/dvisamplerX.c b/software/videomixer/dvisamplerX.c
index 36dc669e..49c71b1c 100644
--- a/software/videomixer/dvisamplerX.c
+++ b/software/videomixer/dvisamplerX.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <irq.h>
 #include <uart.h>
@@ -26,6 +27,15 @@ void dvisamplerX_isr(void)
 	int expected_length;
 	unsigned int address_min, address_max;
 
+	address_min = (unsigned int)dvisamplerX_framebuffers & 0x0fffffff;
+	address_max = address_min + sizeof(dvisamplerX_framebuffers);
+	if((dvisamplerX_dma_slot0_status_read() == DVISAMPLER_SLOT_PENDING)
+		&& ((dvisamplerX_dma_slot0_address_read() < address_min) || (dvisamplerX_dma_slot0_address_read() >= address_max)))
+		printf("dvisamplerX: slot0: stray DMA\n");
+	if((dvisamplerX_dma_slot1_status_read() == DVISAMPLER_SLOT_PENDING)
+		&& ((dvisamplerX_dma_slot1_address_read() < address_min) || (dvisamplerX_dma_slot1_address_read() >= address_max)))
+		printf("dvisamplerX: slot1: stray DMA\n");
+
 	if((dvisamplerX_resdetection_hres_read() != dvisamplerX_hres)
 	  || (dvisamplerX_resdetection_vres_read() != dvisamplerX_vres)) {
 		/* Dump frames until we get the expected resolution */
@@ -40,15 +50,6 @@ void dvisamplerX_isr(void)
 		return;
 	}
 
-	address_min = (unsigned int)dvisamplerX_framebuffers & 0x0fffffff;
-	address_max = address_min + sizeof(dvisamplerX_framebuffers);
-	if((dvisamplerX_dma_slot0_status_read() == DVISAMPLER_SLOT_PENDING)
-		&& ((dvisamplerX_dma_slot0_address_read() < address_min) || (dvisamplerX_dma_slot0_address_read() >= address_max)))
-		printf("dvisamplerX: stray DMA on slot 0\n");
-	if((dvisamplerX_dma_slot1_status_read() == DVISAMPLER_SLOT_PENDING)
-		&& ((dvisamplerX_dma_slot1_address_read() < address_min) || (dvisamplerX_dma_slot1_address_read() >= address_max)))
-		printf("dvisamplerX: stray DMA on slot 1\n");
-
 	expected_length = dvisamplerX_hres*dvisamplerX_vres*4;
 	if(dvisamplerX_dma_slot0_status_read() == DVISAMPLER_SLOT_PENDING) {
 		length = dvisamplerX_dma_slot0_address_read() - ((unsigned int)dvisamplerX_framebuffers[dvisamplerX_fb_slot_indexes[0]] & 0x0fffffff);
@@ -88,13 +89,6 @@ void dvisamplerX_init_video(int hres, int vres)
 	dvisamplerX_connected = dvisamplerX_locked = 0;
 	dvisamplerX_hres = hres; dvisamplerX_vres = vres;
 
-	mask = irq_getmask();
-	mask &= ~(1 << DVISAMPLERX_INTERRUPT);
-	irq_setmask(mask);
-
-	dvisamplerX_dma_slot0_status_write(DVISAMPLER_SLOT_EMPTY);
-	dvisamplerX_dma_slot1_status_write(DVISAMPLER_SLOT_EMPTY);
-
 	dvisamplerX_dma_frame_size_write(hres*vres*4);
 	dvisamplerX_fb_slot_indexes[0] = 0;
 	dvisamplerX_dma_slot0_address_write((unsigned int)dvisamplerX_framebuffers[0]);
@@ -106,12 +100,31 @@ void dvisamplerX_init_video(int hres, int vres)
 
 	dvisamplerX_dma_ev_pending_write(dvisamplerX_dma_ev_pending_read());
 	dvisamplerX_dma_ev_enable_write(0x3);
+	mask = irq_getmask();
 	mask |= 1 << DVISAMPLERX_INTERRUPT;
 	irq_setmask(mask);
 
 	fb_dmaX_base_write((unsigned int)dvisamplerX_framebuffers[3]);
 }
 
+void dvisamplerX_disable(void)
+{
+	unsigned int mask;
+
+	mask = irq_getmask();
+	mask &= ~(1 << DVISAMPLERX_INTERRUPT);
+	irq_setmask(mask);
+
+	dvisamplerX_dma_slot0_status_write(DVISAMPLER_SLOT_EMPTY);
+	dvisamplerX_dma_slot1_status_write(DVISAMPLER_SLOT_EMPTY);
+}
+
+void dvisamplerX_clear_framebuffers(void)
+{
+	memset(&dvisamplerX_framebuffers, 0, sizeof(dvisamplerX_framebuffers));
+	// TODO: empty bridge cache
+}
+
 static int dvisamplerX_d0, dvisamplerX_d1, dvisamplerX_d2;
 
 void dvisamplerX_print_status(void)
@@ -310,6 +323,7 @@ void dvisamplerX_service(void)
 			dvisamplerX_connected = 0;
 			dvisamplerX_locked = 0;
 			dvisamplerX_clocking_pll_reset_write(1);
+			dvisamplerX_clear_framebuffers();
 		} else {
 			if(dvisamplerX_locked) {
 				if(dvisamplerX_clocking_locked_filtered()) {
@@ -322,6 +336,7 @@ void dvisamplerX_service(void)
 					if(dvisamplerX_debug)
 						printf("dvisamplerX: lost PLL lock\n");
 					dvisamplerX_locked = 0;
+					dvisamplerX_clear_framebuffers();
 				}
 			} else {
 				if(dvisamplerX_clocking_locked_filtered()) {
diff --git a/software/videomixer/dvisamplerX.h b/software/videomixer/dvisamplerX.h
index 258305bd..13422dce 100644
--- a/software/videomixer/dvisamplerX.h
+++ b/software/videomixer/dvisamplerX.h
@@ -5,6 +5,8 @@ extern int dvisamplerX_debug;
 
 void dvisamplerX_isr(void);
 void dvisamplerX_init_video(int hres, int vres);
+void dvisamplerX_disable(void);
+void dvisamplerX_clear_framebuffers(void);
 void dvisamplerX_print_status(void);
 int dvisamplerX_calibrate_delays(void);
 int dvisamplerX_adjust_phase(void);
diff --git a/software/videomixer/processor.c b/software/videomixer/processor.c
index 3378c902..972d22fe 100644
--- a/software/videomixer/processor.c
+++ b/software/videomixer/processor.c
@@ -172,6 +172,11 @@ void processor_start(int mode)
 	dvisampler0_edid_hpd_en_write(0);
 	dvisampler1_edid_hpd_en_write(0);
 
+	dvisampler0_disable();
+	dvisampler1_disable();
+	dvisampler0_clear_framebuffers();
+	dvisampler1_clear_framebuffers();
+
 	fb_set_mode(m);
 	edid_set_mode(m);
 	dvisampler0_init_video(m->h_active, m->v_active);