diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index 522de36..f3cdd30 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -322,7 +322,7 @@
      */
 
     int err;
-    module->numBuffers = info.yres_virtual / info.yres;
+    module->numBuffers = 2;
     module->bufferMask = 0;
     //adreno needs page aligned offsets. Align the fbsize to pagesize.
     size_t fbSize = roundUpToPageSize(finfo.line_length * info.yres)*
diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 72b2176..ed4394a 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -230,7 +230,10 @@
         bufferType = BUFFER_TYPE_VIDEO;
     }
     int err;
-    if (usage & GRALLOC_USAGE_HW_FB) {
+    private_module_t* m = reinterpret_cast<private_module_t*>(common.module);
+    uint32_t bufferMask = m->bufferMask;
+    uint32_t numBuffers = m->numBuffers;
+    if (usage & GRALLOC_USAGE_HW_FB && (bufferMask < ((1LU << numBuffers) - 1))) {
         err = gralloc_alloc_framebuffer(size, usage, pHandle);
     } else {
         err = gralloc_alloc_buffer(size, usage, pHandle, bufferType,