[igt-dev] [PATCH i-g-t v3 05/14] igt: fb: Move size computation to the common path

Maxime Ripard
2019-01-22T13:43:11Z

In order to properly support the YUV buffer on non-i915 platforms, we need
to run calc_fb_size for the dumb buffers allocation path too. Move it out
of the special case and in the common code path.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
lib/igt_fb.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index d69c3fb2d38d..a1368ec4703a 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -528,16 +528,14 @@ static void clear_yuv_buffer(struct igt_fb *fb)
/* helpers to create nice-looking framebuffers */
static int create_bo_for_fb(struct igt_fb *fb)
{
+ uint64_t size = calc_fb_size(fb);
int fd = fb->fd;

- if (fb->tiling || fb->size || fb->strides[0] || igt_format_is_yuv(fb->drm_format)) {
- uint64_t size;
+ /* respect the size requested by the caller */
+ if (fb->size == 0)
+ fb->size = size;

- size = calc_fb_size(fb);
-
- /* respect the size requested by the caller */
- if (fb->size == 0)
- fb->size = size;
+ if (fb->tiling || fb->size || igt_format_is_yuv(fb->drm_format)) {

fb->is_dumb = false;