From 34db533f8afe7b83ffd26c5146d70f8ed222b09c Mon Sep 17 00:00:00 2001 From: IanSB Date: Tue, 11 Aug 2020 02:52:47 +0100 Subject: [PATCH] Only allow interlace detection when video type is interlaced or bbc mode7 detection enabled --- src/rgb_to_fb.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/rgb_to_fb.S b/src/rgb_to_fb.S index 94afabd3..fe496ec0 100644 --- a/src/rgb_to_fb.S +++ b/src/rgb_to_fb.S @@ -421,15 +421,21 @@ skip_switch_test: beq do_interlace_test tst r3, #BIT_INHIBIT_MODE_DETECT - bne do_interlace_test + bne force_interlace_test tst r3, #BIT_MODE7 moveq r5, #0 // Modes 0-6 movne r5, #1 // Mode 7 cmp r5, r0 // Check if we have changed mode bne exit // If so, then bail, as the frame buffer needs to be resized + b force_interlace_test do_interlace_test: + ldr r9, param_video_type + cmp r9, #1 //VIDEO_INTERLACE + bne skip_interlace_test +force_interlace_test: + // only test for interlace if video type set to interlaced or if BBC auto detect enabled tst r3, #BIT_FIELD_TYPE1_VALID beq detect_interlace // we haven't yet seen two fields, so skip the test