firmware/gateware: remove 1080p support (for now, BUF_FIFO of JPEG en…

…coder need to be refactored for that)
timvideos · Sep 14, 2015 · 5868565 · 5868565 · enjoy-digital · Sep 14, 2015
1 parent d0ea2c0
commit 5868565
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/firmware/lm32/hdmi_in0.c b/firmware/lm32/hdmi_in0.c
@@ -19,7 +19,7 @@ int hdmi_in0_fb_index;
 #define FRAMEBUFFER_MASK (FRAMEBUFFER_COUNT - 1)
 
 #define HDMI_IN0_FRAMEBUFFERS_BASE 0x00000000
-#define HDMI_IN0_FRAMEBUFFERS_SIZE 1920*1080*2
+#define HDMI_IN0_FRAMEBUFFERS_SIZE 1280*720*2
 
 unsigned int hdmi_in0_framebuffer_base(char n) {
 	return HDMI_IN0_FRAMEBUFFERS_BASE + n*HDMI_IN0_FRAMEBUFFERS_SIZE;

diff --git a/firmware/lm32/hdmi_in1.c b/firmware/lm32/hdmi_in1.c
@@ -19,7 +19,7 @@ int hdmi_in1_fb_index;
 #define FRAMEBUFFER_MASK (FRAMEBUFFER_COUNT - 1)
 
 #define HDMI_IN1_FRAMEBUFFERS_BASE 0x01000000
-#define HDMI_IN1_FRAMEBUFFERS_SIZE 1920*1080*2
+#define HDMI_IN1_FRAMEBUFFERS_SIZE 1280*720*2
 
 unsigned int hdmi_in1_framebuffer_base(char n) {
 	return HDMI_IN1_FRAMEBUFFERS_BASE + n*HDMI_IN1_FRAMEBUFFERS_SIZE;

diff --git a/firmware/lm32/processor.c b/firmware/lm32/processor.c
@@ -252,20 +252,6 @@ static const struct video_timing video_modes[PROCESSOR_MODE_COUNT] = {
 		.v_blanking = 30,
 		.v_sync_offset = 5,
 		.v_sync_width = 5
-	},
-	// 1920x1080 @ 30.00 Hz    ModeLine "1920x1080" 89.01 1920 2448 2492 2640 1080 1084 1089 1125 +HSync +VSync
-	{
-		.pixel_clock = 8901,
-
-		.h_active = 1920,
-		.h_blanking = 720,
-		.h_sync_offset = 528,
-		.h_sync_width = 44,
-
-		.v_active = 1080,
-		.v_blanking = 45,
-		.v_sync_offset = 4,
-		.v_sync_width = 5
 	}
 };
 

diff --git a/firmware/lm32/processor.h b/firmware/lm32/processor.h
@@ -1,7 +1,7 @@
 #ifndef __PROCESSOR_H
 #define __PROCESSOR_H
 
-#define PROCESSOR_MODE_COUNT 12
+#define PROCESSOR_MODE_COUNT 11
 #define PROCESSOR_MODE_DESCLEN 32
 
 enum {

diff --git a/hdl/encoder/vhdl/JPEG_PKG.vhd b/hdl/encoder/vhdl/JPEG_PKG.vhd
@@ -60,7 +60,7 @@ package JPEG_PKG is
   -- warning! this parameter heavily affects memory size required
   -- if expected image width is known change this parameter to match this
   -- otherwise some onchip RAM will be wasted and never used
-  constant C_MAX_LINE_WIDTH   : integer := 1920;
+  constant C_MAX_LINE_WIDTH   : integer := 1280;
 
   -- memory/performance tradeoff
   -- 8 extra lines highest performance