lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

drm_hwcomposer: Ignore NULL display_contents

Browse source 
surfaceflinger will send in NULL display_contents in prepare/set,
make sure we don't blow up.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Change-Id: Ia5085d4bd5e5928b52d81d14d027d0a162995946
This commit is contained in:
Sean Paul 2015-02-04 10:19:55 -08:00 • committed by Sean Paul
parent a4283c5cc8
commit dffca95b7b
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hwcomposer.cpp
View file

@ -149,6 +149,10 @@ static int hwc_prepare(hwc_composer_device_1_t */* dev */, size_t num_displays,
/* TODO: Check flags for HWC_GEOMETRY_CHANGED */
for (i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; i++) {
if (!display_contents[i])
continue;
for (j = 0; j < (int)display_contents[i]->numHwLayers; j++) {
ret = hwc_prepare_layer(
&display_contents[i]->hwLayers[j]);
@ -471,7 +475,8 @@ static int hwc_set(hwc_composer_device_1_t *dev, size_t num_displays,
int ret = 0, i;
for (i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; i++) {
ret = hwc_set_display(ctx, i, display_contents[i]);
if (display_contents[i])
ret = hwc_set_display(ctx, i, display_contents[i]);
}
return ret;