merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h
index 52ef6a3..9c62242 100644
--- a/include/hardware/gralloc.h
+++ b/include/hardware/gralloc.h
@@ -258,6 +258,10 @@
* allow the implementation to satisfy hardware constraints on the width
* of a pixmap (eg: it may have to be multiple of 8 pixels).
* The CALLER TAKES OWNERSHIP of the buffer_handle_t.
+ *
+ * If format is HAL_PIXEL_FORMAT_YCbCr_420_888, the returned stride must be
+ * 0, since the actual strides are available from the android_ycbcr
+ * structure.
*
* Returns 0 on success or -errno on error.
*/
diff --git a/include/hardware/hwcomposer.h b/include/hardware/hwcomposer.h
index 3b29f1f..d75a047 100644
--- a/include/hardware/hwcomposer.h
+++ b/include/hardware/hwcomposer.h
@@ -299,7 +299,8 @@
hwc_surface_t sur;
};
- /* Fields only relevant for HWC_DEVICE_VERSION_1_2 and later. */
+ /* WARNING: These fields are for experimental virtual display support,
+ * and are not currently used. */
struct {
/* outbuf is the buffer that receives the composed image for
* virtual displays. Writes to the outbuf must wait until
@@ -307,6 +308,13 @@
* writes to outbuf are complete should be returned in
* retireFenceFd.
*
+ * This field will not be updated until after prepare(). If
+ * prepare() sets all non-FB layers to OVERLAY or sets all non-FB
+ * layers to FRAMEBUFFER, then the FRAMEBUFFER_TARGET buffer and
+ * the output buffer may be the same. In mixed OVERLAY/FRAMEBUFFER
+ * configurations they will have different buffers so the
+ * h/w composer does not have to read and write the same buffer.
+ *
* For physical displays, outbuf will be NULL.
*/
buffer_handle_t outbuf;
@@ -428,10 +436,9 @@
* For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries
* for unsupported or disabled/disconnected display types will be NULL.
*
- * For HWC 1.2 and later, numDisplays will be HWC_NUM_DISPLAY_TYPES or more.
- * The extra entries correspond to enabled virtual displays, and will be
- * non-NULL. In HWC 1.2, support for one virtual display is required, and
- * no more than one will be used. Future HWC versions might require more.
+ * In a future version, numDisplays may be larger than
+ * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual
+ * displays, and will be non-NULL.
*
* returns: 0 on success. An negative error code on error. If an error is
* returned, SurfaceFlinger will assume that none of the layer will be
@@ -462,10 +469,9 @@
* For HWC 1.1, numDisplays will always be HWC_NUM_DISPLAY_TYPES. Entries
* for unsupported or disabled/disconnected display types will be NULL.
*
- * For HWC 1.2 and later, numDisplays will be HWC_NUM_DISPLAY_TYPES or more.
- * The extra entries correspond to enabled virtual displays, and will be
- * non-NULL. In HWC 1.2, support for one virtual display is required, and
- * no more than one will be used. Future HWC versions might require more.
+ * In a future version, numDisplays may be larger than
+ * HWC_NUM_DISPLAY_TYPES. The extra entries correspond to enabled virtual
+ * displays, and will be non-NULL.
*
* IMPORTANT NOTE: There is an implicit layer containing opaque black
* pixels behind all the layers in the list. It is the responsibility of