From d3080813c4284cd9a700bdc86bf3ee7807b8ceb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20PETIT?= Date: Thu, 13 Mar 2014 17:09:58 +0000 Subject: Don't use memset to clear the framebuffer on arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id0ad67505c206b6bfe0ea7b13a4860369b307e70 Signed-off-by: Kévin PETIT --- modules/gralloc/framebuffer.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index 9d8513a2..ffbe2230 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -132,6 +132,27 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) /*****************************************************************************/ +void clearFrameBuffer(void* vaddr, size_t fbSize) +{ +#ifdef __aarch64__ + /* + * The optimised memset for arm64 cannot operate on device memory. + * The zeroing has to be done differently. This is a copy of bionic's + * generic memset. + */ + char* q = (char*)vaddr; + char* end = q + fbSize; + for (;;) { + if (q >= end) break; *q++ = 0; + if (q >= end) break; *q++ = 0; + if (q >= end) break; *q++ = 0; + if (q >= end) break; *q++ = 0; + } +#else + memset(vaddr, 0, fbSize); +#endif +} + int mapFrameBufferLocked(struct private_module_t* module) { // already initialized... @@ -284,7 +305,7 @@ int mapFrameBufferLocked(struct private_module_t* module) return -errno; } module->framebuffer->base = intptr_t(vaddr); - memset(vaddr, 0, fbSize); + clearFrameBuffer(vaddr, fbSize); return 0; } -- cgit v1.2.3