From 74261fd915efdcb8ff4bea1d648a607931ec7c1c Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Tue, 17 Jul 2018 16:20:34 +0300 Subject: lib/igt_fb: Pass fb_blit_upload to free_linear_mapping() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With fb_blit_upload now being the base class of fb_convert_blit_upload we can pass the entire structure down to free_linear_mapping(). Signed-off-by: Ville Syrjälä Reviewed-by: Paulo Zanoni --- lib/igt_fb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 948b7033..df966c92 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -1211,8 +1211,11 @@ struct fb_blit_upload { struct fb_blit_linear linear; }; -static void free_linear_mapping(int fd, struct igt_fb *fb, struct fb_blit_linear *linear) +static void free_linear_mapping(struct fb_blit_upload *blit) { + int fd = blit->fd; + struct igt_fb *fb = blit->fb; + struct fb_blit_linear *linear = &blit->linear; unsigned int obj_tiling = igt_fb_mod_to_tiling(fb->tiling); int i; @@ -1245,7 +1248,7 @@ static void destroy_cairo_surface__blit(void *arg) blit->fb->cairo_surface = NULL; - free_linear_mapping(blit->fd, blit->fb, &blit->linear); + free_linear_mapping(blit); free(blit); } @@ -1775,7 +1778,7 @@ static void destroy_cairo_surface__convert(void *arg) munmap(blit->rgb24.map, blit->rgb24.size); if (blit->base.linear.handle) - free_linear_mapping(blit->base.fd, blit->base.fb, &blit->base.linear); + free_linear_mapping(&blit->base); else gem_munmap(blit->base.linear.map, fb->size); -- cgit v1.2.3