diff options
| author | Roman Kiryanov <rkir@google.com> | 2023-03-16 00:43:01 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2023-03-16 09:57:48 -0700 |
| commit | cc24b0a8f68af21e7fc2a6480646866d3ccdf83e (patch) | |
| tree | 71a22489dcda7d1ab0921f809a1df5255c1b85a5 | |
| parent | b9dab48a3434680fe997243cfad73e896d95938c (diff) | |
| download | goldfish-android-goldfish-4.4-dev.tar.gz | |
Skip allocating of ION_HEAP_TYPE_SYSTEM_CONTIG in ION_DUMMYandroid-goldfish-4.4-dev
The driver uses indexes from uapi/ion.h to access
heaps in dummy_heaps, so just removing an entry
from this array is not an option. Also, indexes
in uapi/ion.h is a userspace interface, so they
cannot be changed without rebuilding the userspace.
Bug: 270219211
Test: boot API28, check the kernel log
Change-Id: I4de745c34e03227dfe2636b2baed94c7f9b35000
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | drivers/staging/android/ion/ion_dummy_driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c index 5678870bff48..9de1ecfcf8d4 100644 --- a/drivers/staging/android/ion/ion_dummy_driver.c +++ b/drivers/staging/android/ion/ion_dummy_driver.c @@ -103,6 +103,9 @@ static int __init ion_dummy_init(void) if (heap_data->type == ION_HEAP_TYPE_CHUNK && !heap_data->base) continue; + if (heap_data->type == ION_HEAP_TYPE_SYSTEM_CONTIG) + continue; + heaps[i] = ion_heap_create(heap_data); if (IS_ERR_OR_NULL(heaps[i])) { err = PTR_ERR(heaps[i]); |