[igt-dev] [PATCH i-g-t v6 01/10] igt: fb: Refactor dumb buffer allocation path

Maxime Ripard
2019-02-08T13:19:12Z

The else condition is not needed, since all the other conditions return
when they are done.

Move the KMS dumb buffer allocation outside of the outer else condition,
this will also allow to ease later changes.

Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
lib/igt_fb.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 5d8c187a9ac9..c61e6805ff7a 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -559,15 +559,14 @@ static int create_bo_for_fb(struct igt_fb *fb)
igt_require(driver_has_gem_api);
return -EINVAL;
}
- } else {
- fb->is_dumb = true;
-
- fb->gem_handle = kmstest_dumb_create(fd, fb->width, fb->height,
- fb->plane_bpp[0],
- &fb->strides[0], &fb->size);
-
- return fb->gem_handle;
}
+
+ fb->is_dumb = true;
+ fb->gem_handle = kmstest_dumb_create(fd, fb->width, fb->height,
+ fb->plane_bpp[0],
+ &fb->strides[0], &fb->size);
+
+ return fb->gem_handle;
}

/**