From 0f20f521d68546b69e9da64311f072782ff034b3 Mon Sep 17 00:00:00 2001 From: "He, Yue" Date: Fri, 17 Jan 2025 02:40:17 +0000 Subject: [PATCH] If have the flag PRIVATE_2, use dgpu sys memory All buffers allocated through buffer queue allocate dgpu sys memory.Unless click the app use dgpu local memroy button. Signed-off-by: He, Yue --- cros_gralloc/cros_gralloc_helpers.cc | 2 +- drv.h | 2 +- drv_priv.h | 4 ++-- i915.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc index 83aefed7..2210c402 100644 --- a/cros_gralloc/cros_gralloc_helpers.cc +++ b/cros_gralloc/cros_gralloc_helpers.cc @@ -160,7 +160,7 @@ uint64_t cros_gralloc_convert_usage(uint64_t usage) BO_USE_SENSOR_DIRECT_DATA); handle_usage(&usage, BUFFER_USAGE_GPU_DATA_BUFFER, &use_flags, BO_USE_GPU_DATA_BUFFER); handle_usage(&usage, BUFFER_USAGE_FRONT_RENDERING_MASK, &use_flags, BO_USE_FRONT_RENDERING); - handle_usage(&usage, GRALLOC_USAGE_PRIVATE_2, &use_flags, BO_USE_LOCAL_MEMORY); + handle_usage(&usage, GRALLOC_USAGE_PRIVATE_2, &use_flags, BO_USE_SYS_MEMORY); if (usage) { ALOGE("Unhandled gralloc usage: %llx", (unsigned long long)usage); diff --git a/drv.h b/drv.h index 5da5b526..697cd9ac 100644 --- a/drv.h +++ b/drv.h @@ -45,7 +45,7 @@ extern "C" { #define BO_USE_RENDERSCRIPT (1ull << 17) #define BO_USE_GPU_DATA_BUFFER (1ull << 18) #define BO_USE_SENSOR_DIRECT_DATA (1ull << 19) -#define BO_USE_LOCAL_MEMORY (1ull << 20) +#define BO_USE_SYS_MEMORY (1ull << 20) #define BO_USE_ARC_SCREEN_CAP_PROBED (1ull << 63) diff --git a/drv_priv.h b/drv_priv.h index e721d76e..87a4a4f3 100644 --- a/drv_priv.h +++ b/drv_priv.h @@ -133,12 +133,12 @@ struct backend { #define BO_USE_RENDER_MASK (BO_USE_LINEAR | BO_USE_RENDERING | BO_USE_RENDERSCRIPT | \ BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | \ BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE | BO_USE_FRONT_RENDERING | \ - BO_USE_LOCAL_MEMORY) + BO_USE_SYS_MEMORY) #define BO_USE_TEXTURE_MASK (BO_USE_LINEAR | BO_USE_RENDERSCRIPT | BO_USE_SW_READ_OFTEN | \ BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | \ BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE | BO_USE_FRONT_RENDERING | \ - BO_USE_LOCAL_MEMORY) + BO_USE_SYS_MEMORY) #define BO_USE_SW_MASK (BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \ BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY | BO_USE_FRONT_RENDERING) diff --git a/i915.c b/i915.c index 3ee34da1..9ee77fc6 100644 --- a/i915.c +++ b/i915.c @@ -914,10 +914,10 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig static bool is_need_local(int64_t use_flags) { - static bool local = false; + static bool local = true; - if (use_flags & BO_USE_LOCAL_MEMORY) { - local = true; + if (use_flags & BO_USE_SYS_MEMORY) { + local = false; } if (use_flags & BO_USE_SW_READ_RARELY || use_flags & BO_USE_SW_READ_OFTEN ||