diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2023-01-09 21:15:23 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2023-01-12 04:56:06 -0500 |
commit | 541960a11061213f682d67bb036f861b2605f9d3 (patch) | |
tree | 89d598988165b202be4ccebd2cf9bc7d6a0a81d2 | |
parent | 746fd7f2db241653ac4244f22962a493978e4fbf (diff) | |
download | rockbox-541960a11061213f682d67bb036f861b2605f9d3.tar.gz rockbox-541960a11061213f682d67bb036f861b2605f9d3.zip |
rbcodec/dsp: restore configure loop in dsp_init() (FS#13386)
It seems removing this causes a crash on the Clip+ when playing
any file. Appears to be a timing-related issue as replacing the
loop with an mdelay() also fixes it. Needs further investigation
to identify the real cause of the problem, see FS#13386.
Change-Id: Ia93a2887a79b376de50563d6bb3bbc79cee11a1c
-rw-r--r-- | lib/rbcodec/dsp/dsp_core.c | 10 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_core.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/rbcodec/dsp/dsp_core.c b/lib/rbcodec/dsp/dsp_core.c index 5108c9ef47..c15e4342ae 100644 --- a/lib/rbcodec/dsp/dsp_core.c +++ b/lib/rbcodec/dsp/dsp_core.c | |||
@@ -535,6 +535,16 @@ void dsp_init(void) | |||
535 | for (unsigned int j = 0; j < ARRAYLEN(dsp_init_fn); ++j) | 535 | for (unsigned int j = 0; j < ARRAYLEN(dsp_init_fn); ++j) |
536 | dsp_init_fn[j](dsp, i); | 536 | dsp_init_fn[j](dsp, i); |
537 | 537 | ||
538 | /* | ||
539 | * FIXME: This is a no-op and should not be needed, but it | ||
540 | * appears there is a race condition here that causes | ||
541 | * prefetch abort panics on the Clip+. See FS#13386. | ||
542 | * Replacing the loop with mdelay(1) also suppresses | ||
543 | * the crash. | ||
544 | */ | ||
545 | for (unsigned int j = 0; j < DSP_NUM_PROC_STAGES; j++) | ||
546 | dsp_proc_database[j]->configure(NULL, dsp, DSP_INIT, i); | ||
547 | |||
538 | dsp_configure(dsp, DSP_RESET, 0); | 548 | dsp_configure(dsp, DSP_RESET, 0); |
539 | } | 549 | } |
540 | } | 550 | } |
diff --git a/lib/rbcodec/dsp/dsp_core.h b/lib/rbcodec/dsp/dsp_core.h index 9b09d981cc..2fc26161fa 100644 --- a/lib/rbcodec/dsp/dsp_core.h +++ b/lib/rbcodec/dsp/dsp_core.h | |||
@@ -32,6 +32,7 @@ enum dsp_ids | |||
32 | 32 | ||
33 | enum dsp_settings | 33 | enum dsp_settings |
34 | { | 34 | { |
35 | DSP_INIT, | ||
35 | DSP_RESET, | 36 | DSP_RESET, |
36 | DSP_SET_FREQUENCY, | 37 | DSP_SET_FREQUENCY, |
37 | DSP_SET_SAMPLE_DEPTH, | 38 | DSP_SET_SAMPLE_DEPTH, |