diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-03-03 18:24:47 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-03-03 18:24:47 -0800 |
| commit | fe1676ea17c1791ff25528fac70483d2d9c03f4b (patch) | |
| tree | 5369327207cdf22eb10fb0f8bd84940e67ab6297 | |
| parent | 52eda420452ef2573b1029bca4046b22e57c7251 (diff) | |
| parent | 5f3c617c62642c316b47d3abc8f9e60c51e238ad (diff) | |
| download | gpu-fe1676ea17c1791ff25528fac70483d2d9c03f4b.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10
SBMerger: 610748217
Change-Id: Ic0a2cbc88f49f284b747445ae422f139e14a7842
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | mali_pixel/memory_group_manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mali_pixel/memory_group_manager.c b/mali_pixel/memory_group_manager.c index b767811..0c9a241 100644 --- a/mali_pixel/memory_group_manager.c +++ b/mali_pixel/memory_group_manager.c @@ -27,9 +27,9 @@ #include <uapi/gpu/arm/midgard/platform/pixel/pixel_memory_group_manager.h> - +#define NUM_PAGES_IN_2MB_LARGE_PAGE (SZ_2M / PAGE_SIZE) #define ORDER_SMALL_PAGE 0 -#define ORDER_LARGE_PAGE 9 +#define ORDER_LARGE_PAGE const_ilog2(NUM_PAGES_IN_2MB_LARGE_PAGE) /* Borr does not have "real" PBHA support. However, since we only use a 36-bit PA on the bus, * AxADDR[39:36] is wired up to the GPU AxUSER[PBHA] field seen by the rest of the system. |