summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@google.com>2017-07-14 08:34:25 -0700
committerChia-I Wu <olv@google.com>2017-07-14 09:16:35 -0700
commit8853aaea50b0b4bbd216130bbb0f2656db707ff6 (patch)
treee84adfbd911665875b273834bf35da95ba427692
parenta3db107cbcc0af586bef2ffb04172250c97f6201 (diff)
downloadhikey-8853aaea50b0b4bbd216130bbb0f2656db707ff6.tar.gz
gralloc960: make register framebuffer no-opandroid-o-preview-4
Bug: 62222821 Test: boots Change-Id: I61ae68b3772b22e174aa8a0f7114ecf5f3a2dc14
-rw-r--r--gralloc960/gralloc_module.cpp3
-rw-r--r--gralloc960/gralloc_priv.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/gralloc960/gralloc_module.cpp b/gralloc960/gralloc_module.cpp
index 28d361d4..df2d82e3 100644
--- a/gralloc960/gralloc_module.cpp
+++ b/gralloc960/gralloc_module.cpp
@@ -72,7 +72,8 @@ static int gralloc_register_buffer(gralloc_module_t const* module, buffer_handle
if (hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER)
{
- AERR( "Can't register buffer %p as it is a framebuffer", handle );
+ AINF("Register framebuffer 0x%p is no-op", handle);
+ retval = 0;
}
else if (hnd->flags & private_handle_t::PRIV_FLAGS_USES_ION)
{
diff --git a/gralloc960/gralloc_priv.h b/gralloc960/gralloc_priv.h
index 7c4b8359..55feb67e 100644
--- a/gralloc960/gralloc_priv.h
+++ b/gralloc960/gralloc_priv.h
@@ -209,7 +209,8 @@ struct private_handle_t
#ifdef __cplusplus
/*
* We track the number of integers in the structure. There are 16 unconditional
- * integers (magic - pid, yuv_info, fd and offset). Note that the fd element is
+ * integers (magic - pid, yuv_info, shallow_fbdev_fd and offset).
+ * Note that the shallow_fbdev_fd element is
* considered an int not an fd because it is not intended to be used outside the
* surface flinger process. The GRALLOC_ARM_NUM_INTS variable is used to track the
* number of integers that are conditionally included. Similar considerations apply