From 86ed170a2c1d2af6d1cd88f72bc6ca3097b3d24a Mon Sep 17 00:00:00 2001 From: sorgelig Date: Fri, 6 Nov 2020 17:51:53 +0800 Subject: [PATCH] Force enable VGA scaler. --- Archie.sv | 2 ++ sys/sys_top.sdc | 6 ++++++ sys/sys_top.v | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Archie.sv b/Archie.sv index 3068087..c1c3474 100644 --- a/Archie.sv +++ b/Archie.sv @@ -50,6 +50,7 @@ module emu output VGA_DE, // = ~(VBlank | HBlank) output VGA_F1, output [1:0] VGA_SL, + output VGA_SCALER, // Force VGA scaler output LED_USER, // 1 - ON, 0 - OFF. @@ -416,6 +417,7 @@ assign CLK_VIDEO = clk_sys; assign CE_PIXEL = cepix; assign VGA_F1 = 0; assign VGA_SL = 0; +assign VGA_SCALER = 1; gamma_fast gamma ( diff --git a/sys/sys_top.sdc b/sys/sys_top.sdc index 90dc24d..6e8fd80 100644 --- a/sys/sys_top.sdc +++ b/sys/sys_top.sdc @@ -52,3 +52,9 @@ set_false_path -from {FB_BASE[*] FB_BASE[*] FB_WIDTH[*] FB_HEIGHT[*] LFB_HMIN[*] set_false_path -to {vol_att[*] scaler_flt[*] led_overtake[*] led_state[*]} set_false_path -from {vol_att[*] scaler_flt[*] led_overtake[*] led_state[*]} set_false_path -from {aflt_* acx* acy* areset*} + +set_false_path -from {ascal|o_ihsize*} +set_false_path -from {ascal|o_ivsize*} +set_false_path -from {ascal|o_format*} +set_false_path -from {ascal|o_hdown} +set_false_path -from {ascal|o_vdown} diff --git a/sys/sys_top.v b/sys/sys_top.v index 8eb3a37..f4d0029 100644 --- a/sys/sys_top.v +++ b/sys/sys_top.v @@ -287,7 +287,7 @@ cyclonev_hps_interface_mpu_general_purpose h2f_gp reg [15:0] cfg; reg cfg_set = 0; -wire vga_fb = cfg[12]; +wire vga_fb = cfg[12] | vga_force_scaler; wire [1:0] hdmi_limited = {cfg[11],cfg[8]}; `ifdef DEBUG_NOHDMI @@ -303,7 +303,7 @@ wire ypbpr_en = cfg[5]; wire io_osd_vga = io_ss1 & ~io_ss2; `ifndef DUAL_SDRAM wire sog = cfg[9]; - wire vga_scaler = cfg[2]; + wire vga_scaler = cfg[2] | vga_force_scaler; `endif reg cfg_custom_t = 0; @@ -1371,6 +1371,7 @@ wire [7:0] r_out, g_out, b_out, hr_out, hg_out, hb_out; wire vs_fix, hs_fix, de_emu, vs_emu, hs_emu, f1; wire hvs_fix, hhs_fix, hde_emu; wire clk_vid, ce_pix, clk_ihdmi, ce_hpix; +wire vga_force_scaler; `ifdef USE_DDRAM wire ram_clk; @@ -1458,6 +1459,7 @@ emu emu .VGA_VS(vs_emu), .VGA_DE(de_emu), .VGA_F1(f1), + .VGA_SCALER(vga_force_scaler), .CLK_VIDEO(clk_vid), .CE_PIXEL(ce_pix),