Merge remote-tracking branch 'upstream/master' into lca2016

mithro · mithro · commit ebbfdc53bd4d · 2016-02-01T19:15:05.000+11:00
diff --git a/firmware/lm32/edid.c b/firmware/lm32/edid.c
@@ -218,7 +218,7 @@ void generate_edid(void *out,
 	e->video_input = 0x80; /* digital */
 	e->h_image_size = timing->h_active/64;
 	e->v_image_size = timing->v_active/64;
-	e->gamma = 0xff;
+	e->gamma = 0x78;
 	e->feature_support = 0x06;
 
 	e->cc_rg_l = 0;
diff --git a/firmware/lm32/processor.c b/firmware/lm32/processor.c
@@ -47,7 +47,7 @@
 
                             (1|a)    (2)    (3)  (4)
  ModeLine "640x480"    31.5  640    664    704  832    480  489  491  520
-                              |\-(c)-/\-(b)-/    |
+                              |\-(c)-/\-(d)-/    |
                               |   24    40       |
                               |                  |
                               \--------(b)-------/
@@ -281,7 +281,23 @@ static const struct video_timing video_modes[PROCESSOR_MODE_COUNT] = {
 		.v_sync_offset = 1,
 		.v_sync_width = 3,
 		.comment = "(HV20/HV30 in NTSC mode)"
+	},
+	// 720x576 @ 50.00 Hz    Modeline 720x576" 32.67 720 744 816 912 576 577 580 597 -HSync +Vsyncc
+	{
+		.pixel_clock = 3267,
+
+		.h_active = 720,
+		.h_blanking = 192,
+		.h_sync_offset = 24,
+		.h_sync_width = 72,
+
+		.v_active = 576,
+		.v_blanking = 21,
+		.v_sync_offset = 1,
+		.v_sync_width = 3,
+		.comment = "(HV20/HV30 in PAL mode)"
 	}
+
 };
 
 void processor_list_modes(char *mode_descriptors)
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 13
+#define PROCESSOR_MODE_COUNT 14
 #define PROCESSOR_MODE_DESCLEN 64
 
 enum {
