Skip to content

mixin-mixout: fix a firmware exception#6133

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

Merged
lgirdwood merged 1 commit into from
Aug 12, 2022
Merged

mixin-mixout: fix a firmware exception #6133

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
17 changes: 17 additions & 0 deletions src/audio/mixin_mixout.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,12 @@ static int mixin_copy(struct comp_dev *dev)
mixout_data = comp_get_drvdata(mixout);
mixed_data_info = mixed_data_info_acquire(mixout_data->mixed_data_info);
src_info = find_mixout_source_info(mixed_data_info, dev);
if (!src_info) {
comp_err(dev, "No source info");
mixed_data_info_release(mixed_data_info);
buffer_release(source_c);
return -EINVAL;
}

sink_c = buffer_acquire(sink);

Expand DownExpand Up@@ -589,6 +595,12 @@ static int mixin_copy(struct comp_dev *dev)
mixout_data = comp_get_drvdata(mixout);
mixed_data_info = mixed_data_info_acquire(mixout_data->mixed_data_info);
src_info = find_mixout_source_info(mixed_data_info, dev);
if (!src_info) {
comp_err(dev, "No source info");
mixed_data_info_release(mixed_data_info);
buffer_release(source_c);
return -EINVAL;
}

/* Skip data from previous run(s) not yet produced in mixout_copy().
* Normally start would be 0 unless mixout pipeline has serious
Expand DownExpand Up@@ -679,6 +691,11 @@ static int mixout_copy(struct comp_dev *dev)
mixin = buffer_get_comp(unused_in_between_buf, PPL_DIR_UPSTREAM);

src_info = find_mixout_source_info(mixed_data_info, mixin);
if (!src_info) {
comp_err(dev, "No source info");
mixed_data_info_release(mixed_data_info);
return -EINVAL;
}

bytes_to_produce = MIN(bytes_to_produce, src_info->consumed_yet_not_produced_bytes);
}
Expand Down