Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

display: Restore VI active check based on set color depth mode #414

Merged
merged 1 commit into from
Aug 19, 2023
Merged

display: Restore VI active check based on set color depth mode #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,20 @@ static void __wait_for_vblank()
while( reg_base[4] != 2 ) { }
}

/** @brief Return true if VI is active (H_VIDEO != 0) */
/** @brief Return true if VI is sending a video signal (16-bit or 32-bit color set) */
static inline bool __is_vi_active()
{
volatile uint32_t *reg_base = (uint32_t *)REGISTER_BASE;

return (reg_base[9] != 0);
return (reg_base[0] & 0x03) >= 2;
}

/** @brief Set active image width to 0, which keeps VI signal active but only sending a blank image */
static inline void __set_vi_blank_image()
{
volatile uint32_t *reg_base = (uint32_t *)REGISTER_BASE;

reg_base[9] = 0;
}

/**
Expand Down Expand Up @@ -353,11 +361,12 @@ void display_close()
__width = 0;
__height = 0;

// If display is active, wait for vblank before touching the registers
/* If display is active, wait for vblank before touching the registers */
if( __is_vi_active() ) { __wait_for_vblank(); }

volatile uint32_t *reg_base = (uint32_t *)REGISTER_BASE;
reg_base[9] = 0;
/* Set blank VI image mode before clearing framebuffer address register
so that garbage will not be shown on screen */
__set_vi_blank_image();
__write_dram_register( 0 );

if( surfaces )
Expand Down