diff options
| author | Lajos Molnar <lajos@ti.com> | 2011-12-12 12:34:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 12:34:49 -0800 |
| commit | 1d20db2afba8085bfdf9443573c44be9088e0f78 (patch) | |
| tree | 0dbfe88d050a7051bfa4bf14281acf3a482dd631 /hwc | |
| parent | 84f8813cce5a6d51413118f9ac4acdcb79ae1573 (diff) | |
| parent | 6ea2c8ec0f71e5edb49751e473fbd3b2c87ac018 (diff) | |
| download | hardware_ti_omap4-1d20db2afba8085bfdf9443573c44be9088e0f78.zip hardware_ti_omap4-1d20db2afba8085bfdf9443573c44be9088e0f78.tar.gz hardware_ti_omap4-1d20db2afba8085bfdf9443573c44be9088e0f78.tar.bz2 | |
am 085c0e54: am a752a6ad: hwc: Fix calculation of on_tv
* commit '085c0e5468f3ba46f42749f84828cfd3ec6a7b78':
hwc: Fix calculation of on_tv
Diffstat (limited to 'hwc')
| -rw-r--r-- | hwc/hwc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -874,7 +874,7 @@ static inline int can_dss_render_all(omap4_hwc_device_t *hwc_dev, struct counts num->max_scaling_overlays = num->max_hw_overlays - nonscaling_ovls; - int on_tv = hwc_dev->ext.on_tv; + int on_tv = hwc_dev->ext.on_tv && hwc_dev->ext.current.enabled; int tform = hwc_dev->ext.current.enabled && (hwc_dev->ext.current.rotation || hwc_dev->ext.current.hflip); return !hwc_dev->force_sgx && @@ -897,7 +897,7 @@ static inline int can_dss_render_layer(omap4_hwc_device_t *hwc_dev, { IMG_native_handle_t *handle = (IMG_native_handle_t *)layer->handle; - int on_tv = hwc_dev->ext.on_tv; + int on_tv = hwc_dev->ext.on_tv && hwc_dev->ext.current.enabled; int tform = hwc_dev->ext.current.enabled && (hwc_dev->ext.current.rotation || hwc_dev->ext.current.hflip); return omap4_hwc_is_valid_layer(hwc_dev, layer, handle) && |