mister-devel/PSX_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/PSX_MiSTer.git synced 2026-05-24 03:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Video: generate Hblank timer from video out statemachine, but instead of hblank for video/scaler also during vblank

Browse Source 
- Timer: reset TMR0 on falling HBlank instead of rising HBlank (fulfills HW test and improves Justifier in Area51)
This commit is contained in:
Robert Peip
2022-11-24 10:29:03 +01:00
parent 74baad65b6
commit ee819edee0
2 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
rtl/gpu_videoout_async.vhd
View File

@@ -117,6 +117,8 @@ architecture arch of gpu_videoout_async is
(
WAITNEWLINE,
WAITHBLANKEND,
WAITHBLANKENDVSYNC,
WAITINVSYNC,
DRAW
);
signal state : tState := WAITNEWLINE;
@@ -285,8 +287,6 @@ begin
end if;
newLineTrigger <= '0';
if (nextHCount < 210) then videoout_reports.hblank_tmr <= '1'; else videoout_reports.hblank_tmr <= '0'; end if; -- todo: correct hblank timer tick position to be found
if (reset = '1') then
@@ -638,15 +638,17 @@ begin
if (reset = '1') then
state <= WAITNEWLINE;
clkCnt <= 0;
videoout_out.hblank <= '1';
videoout_out.vsync <= '0';
videoout_request.lineDisp <= (others => '0');
readstate <= IDLE;
state <= WAITNEWLINE;
clkCnt <= 0;
videoout_out.hblank <= '1';
videoout_out.vsync <= '0';
videoout_request.lineDisp <= (others => '0');
readstate <= IDLE;
InterlaceFieldN <= videoout_ss_in.GPUSTAT_InterlaceField;
InterlaceFieldN <= videoout_ss_in.GPUSTAT_InterlaceField;
videoout_reports.hblank_tmr <= '0';
else
@@ -666,7 +668,8 @@ begin
case (state) is
when WAITNEWLINE =>
videoout_out.hblank <= '1';
videoout_out.hblank <= '1';
videoout_reports.hblank_tmr <= '1';
nextLineCalc := to_unsigned((lineMax - 1), 9) - lineIn;
@@ -706,21 +709,43 @@ begin
hCropPixels <= (others => '0');
noDraw <= '1';
elsif (newLineTrigger = '1') then
state <= WAITHBLANKENDVSYNC;
hCropCount <= (others => '0');
hCropPixels <= (others => '0');
end if;
when WAITHBLANKEND =>
when WAITHBLANKEND | WAITHBLANKENDVSYNC =>
if (clkCnt >= (clkDiv - 1)) then
if (hCropCount >= videoout_settings.hDisplayRange(11 downto 0)) then
state <= DRAW;
if (state = WAITHBLANKENDVSYNC) then
state <= WAITINVSYNC;
else
state <= DRAW;
end if;
readstate <= IDLE;
readstate24 <= READ24_0;
end if;
end if;
when WAITINVSYNC =>
if (clkCnt >= (clkDiv - 1)) then
videoout_reports.hblank_tmr <= '0';
hCropPixels <= hCropPixels + 1;
if (((hCropCount + 1) >= videoout_settings.hDisplayRange(23 downto 12))) then
if ((hCropPixels + 1) = 0) then
state <= WAITNEWLINE;
end if;
end if;
end if;
when DRAW =>
if (clkCnt >= (clkDiv - 1)) then
videoout_out.hblank <= '0';
videoout_out.hblank <= '0';
videoout_reports.hblank_tmr <= '0';
if (videoout_settings.fixedVBlank = '1' and vblankFixed = '1') then
videoout_out.r <= (others => '0');
videoout_out.g <= (others => '0');

4
rtl/timer.vhd
View File

@@ -257,12 +257,12 @@ begin
-- apply resets
if (timerArray(0).T_MODE(0) = '1') then
if (timerArray(0).T_MODE(2 downto 1) = "01" or timerArray(0).T_MODE(2 downto 1) = "10") then
if (hblank_1 = '0' and hblank = '1') then
if (hblank_1 = '1' and hblank = '0') then
timerArray(0).T_CURRENT <= (others => '0');
end if;
end if;
if (timerArray(0).T_MODE(2 downto 1) = "11") then
if (hblank_1 = '0' and hblank = '1') then
if (hblank_1 = '1' and hblank = '0') then
timerArray(0).T_MODE(0) <= '0';
end if;
end if;