Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

videomixer: clear framebuffers

Browse source
This commit is contained in:
Sebastien Bourdeauducq 2013-11-15 11:25:58 +01:00
parent 6cb18f5ce3
commit d225bdf362
3 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
software/videomixer/dvisamplerX.c
View file

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <irq.h> #include <irq.h>
#include <uart.h> #include <uart.h>
@ -26,6 +27,15 @@ void dvisamplerX_isr(void)
int expected_length; int expected_length;
unsigned int address_min, address_max; 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) if((dvisamplerX_resdetection_hres_read() != dvisamplerX_hres)
|| (dvisamplerX_resdetection_vres_read() != dvisamplerX_vres)) { || (dvisamplerX_resdetection_vres_read() != dvisamplerX_vres)) {
/* Dump frames until we get the expected resolution */ /* Dump frames until we get the expected resolution */
@ -40,15 +50,6 @@ void dvisamplerX_isr(void)
return; 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; expected_length = dvisamplerX_hres*dvisamplerX_vres*4;
if(dvisamplerX_dma_slot0_status_read() == DVISAMPLER_SLOT_PENDING) { 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); 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_connected = dvisamplerX_locked = 0;
dvisamplerX_hres = hres; dvisamplerX_vres = vres; 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_dma_frame_size_write(hres*vres*4);
dvisamplerX_fb_slot_indexes[0] = 0; dvisamplerX_fb_slot_indexes[0] = 0;
dvisamplerX_dma_slot0_address_write((unsigned int)dvisamplerX_framebuffers[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_pending_write(dvisamplerX_dma_ev_pending_read());
dvisamplerX_dma_ev_enable_write(0x3); dvisamplerX_dma_ev_enable_write(0x3);
mask = irq_getmask();
mask |= 1 << DVISAMPLERX_INTERRUPT; mask |= 1 << DVISAMPLERX_INTERRUPT;
irq_setmask(mask); irq_setmask(mask);
fb_dmaX_base_write((unsigned int)dvisamplerX_framebuffers[3]); 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; static int dvisamplerX_d0, dvisamplerX_d1, dvisamplerX_d2;
void dvisamplerX_print_status(void) void dvisamplerX_print_status(void)
@ -310,6 +323,7 @@ void dvisamplerX_service(void)
dvisamplerX_connected = 0; dvisamplerX_connected = 0;
dvisamplerX_locked = 0; dvisamplerX_locked = 0;
dvisamplerX_clocking_pll_reset_write(1); dvisamplerX_clocking_pll_reset_write(1);
dvisamplerX_clear_framebuffers();
} else { } else {
if(dvisamplerX_locked) { if(dvisamplerX_locked) {
if(dvisamplerX_clocking_locked_filtered()) { if(dvisamplerX_clocking_locked_filtered()) {
@ -322,6 +336,7 @@ void dvisamplerX_service(void)
if(dvisamplerX_debug) if(dvisamplerX_debug)
printf("dvisamplerX: lost PLL lock\n"); printf("dvisamplerX: lost PLL lock\n");
dvisamplerX_locked = 0; dvisamplerX_locked = 0;
dvisamplerX_clear_framebuffers();
} }
} else { } else {
if(dvisamplerX_clocking_locked_filtered()) { if(dvisamplerX_clocking_locked_filtered()) {

2
software/videomixer/dvisamplerX.h
View file

@ -5,6 +5,8 @@ extern int dvisamplerX_debug;
void dvisamplerX_isr(void); void dvisamplerX_isr(void);
void dvisamplerX_init_video(int hres, int vres); void dvisamplerX_init_video(int hres, int vres);
void dvisamplerX_disable(void);
void dvisamplerX_clear_framebuffers(void);
void dvisamplerX_print_status(void); void dvisamplerX_print_status(void);
int dvisamplerX_calibrate_delays(void); int dvisamplerX_calibrate_delays(void);
int dvisamplerX_adjust_phase(void); int dvisamplerX_adjust_phase(void);

5
software/videomixer/processor.c
View file

@ -172,6 +172,11 @@ void processor_start(int mode)
dvisampler0_edid_hpd_en_write(0); dvisampler0_edid_hpd_en_write(0);
dvisampler1_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); fb_set_mode(m);
edid_set_mode(m); edid_set_mode(m);
dvisampler0_init_video(m->h_active, m->v_active); dvisampler0_init_video(m->h_active, m->v_active);