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

i915: add missing returns in i915_bo_compute_metadata

Browse source 
Absorbed one of the return fix in crrev/c/3379650.

BUG=N/A
TEST=build

Change-Id: Ic169d6478a04915a5f8b907de90f9b84a9811750
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/4039721
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chad Versace <chadversary@chromium.org>
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
This commit is contained in:
Yiwei Zhang 2022-11-18 21:03:21 +00:00 • committed by Chromeos LUCI
parent a1b820fa9f
commit 3018207f4d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
i915.c
View file

@ -613,7 +613,7 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
* aligning to 32 bytes here.
*/
uint32_t stride = ALIGN(width, 32);
drv_bo_from_format(bo, stride, height, format);
return drv_bo_from_format(bo, stride, height, format);
} else if (modifier == I915_FORMAT_MOD_Y_TILED_CCS) {
/*
* For compressed surfaces, we need a color control surface
@ -691,7 +691,7 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
bo->meta.num_planes = i915_num_planes_from_modifier(bo->drv, format, modifier);
bo->meta.total_size = bo->meta.sizes[0] + bo->meta.sizes[1];
} else {
i915_bo_from_format(bo, width, height, format);
return i915_bo_from_format(bo, width, height, format);
}
return 0;
}