diff options
| author | Roman Kiryanov <rkir@google.com> | 2023-03-16 00:35:30 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2023-03-16 09:57:16 -0700 |
| commit | b9dab48a3434680fe997243cfad73e896d95938c (patch) | |
| tree | e24d98833606b92f6ca1775518b3f7de93768133 | |
| parent | 5017b79028c981e88f57ee42459f34fdd7fd0f2c (diff) | |
| download | goldfish-b9dab48a3434680fe997243cfad73e896d95938c.tar.gz | |
Revert "Remove ION_HEAP_TYPE_SYSTEM_CONTIG from ion_dummy_driver"
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.
Bug: 270219211
This reverts commit 39aed48194fabcf990c4f91ff7ddec9ad0aed92d.
Change-Id: I8796121aae0fa0dc532d74c90cbbb5717bd46c78
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | drivers/staging/android/ion/ion_dummy_driver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c index 72715bf2e73b..5678870bff48 100644 --- a/drivers/staging/android/ion/ion_dummy_driver.c +++ b/drivers/staging/android/ion/ion_dummy_driver.c @@ -38,6 +38,11 @@ static struct ion_platform_heap dummy_heaps[] = { .name = "system", }, { + .id = ION_HEAP_TYPE_SYSTEM_CONTIG, + .type = ION_HEAP_TYPE_SYSTEM_CONTIG, + .name = "system contig", + }, + { .id = ION_HEAP_TYPE_CARVEOUT, .type = ION_HEAP_TYPE_CARVEOUT, .name = "carveout", |