diff options
| author | Jon Pry <jonpry@gmail.com> | 2012-07-30 16:36:35 -0400 |
|---|---|---|
| committer | Jason Simmons <jsimmons@google.com> | 2012-10-22 15:51:11 -0700 |
| commit | 2acde915b4868129963ef7dc7afe1f3b35ffeeac (patch) | |
| tree | b771a83adc66704fbd94b1bc78247c3e0e067fd9 | |
| parent | e563de0e326074ab07d98384b35ecf7477b5d3df (diff) | |
| download | omap4-aah-2acde915b4868129963ef7dc7afe1f3b35ffeeac.tar.gz | |
Fix electron beam crash
Under certain circumstances the ICS SurfaceFlinger attempts to disable
the hwc module by calling prepare with the list set to NULL. This code
path is specifically used by the Electron Beam screen off animation.
Since blit_reset() is just checking for a geometry change, this patch
handles the list pointer null case.
Reproducible with:
service call SurfaceFlinger 8 i32 1
(Thanks Jon & Michael!)
Change-Id: I27114b173446729511115bc73e780e7fdca8722b
Signed-off-by: Tony Lofthouse <tony.lofthouse@ti.com>
(cherry picked from commit dfe13a6b856b8443e001f9d8ce51bb05aaf03499)
| -rw-r--r-- | hwc/hwc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1671,7 +1671,7 @@ static int omap4_hwc_prepare(struct hwc_composer_device_1 *dev, size_t numDispla int big_layers = 0; int blit_all = 0; - blit_reset(hwc_dev, list->flags); + blit_reset(hwc_dev, list ? list->flags : 0); /* If the SGX is used or we are going to blit something we need a framebuffer * and a DSS pipe |