diff options
| author | Chia-I Wu <olv@google.com> | 2017-07-15 00:10:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-15 00:10:54 +0000 |
| commit | 93af07a329918810d9142e5073f400e7abd907c2 (patch) | |
| tree | 534de7c6433f0ee89a6f5412c6eaf5875c72092a | |
| parent | ad5381a1b7d1cfb203a38bcdcafe200ac35390e3 (diff) | |
| parent | 7bc6394d888baade07f00ece9809893c4ab4641a (diff) | |
| download | hikey-93af07a329918810d9142e5073f400e7abd907c2.tar.gz | |
gralloc960: make register framebuffer no-op am: 8853aaea50
am: 7bc6394d88
Change-Id: Id41a51cb15c04e5caca16ab6cfccb9ca281ef8df
| -rw-r--r-- | gralloc960/gralloc_module.cpp | 3 | ||||
| -rw-r--r-- | gralloc960/gralloc_priv.h | 3 |
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 |