diff mbox

[i-g-t] lib: Pass format instead of bpp to create_bo_for_fb()

Message ID 1461176187-7381-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä April 20, 2016, 6:16 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

create_bo_for_fb() expects the drm format as a parameter since
commit 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
but not all callers were updated. Fix that up.

Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93328
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_fb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Tomeu Vizoso April 21, 2016, 6:56 a.m. UTC | #1 
On 20 April 2016 at 20:16,  <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> create_bo_for_fb() expects the drm format as a parameter since
> commit 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
> but not all callers were updated. Fix that up.
>
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Fixes: 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93328
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Sorry and thanks,

Tomeu

> ---
>  lib/igt_fb.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index c4f87898e82e..3e53d3b8cd3d 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -1006,7 +1006,7 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
>         struct fb_blit_upload *blit;
>         cairo_format_t cairo_format;
>         unsigned int obj_tiling = fb_mod_to_obj_tiling(fb->tiling);
> -       int bpp, ret;
> +       int ret;
>
>         blit = malloc(sizeof(*blit));
>         igt_assert(blit);
> @@ -1016,8 +1016,7 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
>          * cairo). This linear bo will be then blitted to its final
>          * destination, tiling it at the same time.
>          */
> -       bpp = igt_drm_format_to_bpp(fb->drm_format);
> -       ret = create_bo_for_fb(fd, fb->width, fb->height, bpp,
> +       ret = create_bo_for_fb(fd, fb->width, fb->height, fb->drm_format,
>                                 LOCAL_DRM_FORMAT_MOD_NONE, 0, 0,
>                                 &blit->linear.handle,
>                                 &blit->linear.size,
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä April 21, 2016, 10:10 a.m. UTC | #2 
On Thu, Apr 21, 2016 at 08:56:09AM +0200, Tomeu Vizoso wrote:
> On 20 April 2016 at 20:16,  <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > create_bo_for_fb() expects the drm format as a parameter since
> > commit 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
> > but not all callers were updated. Fix that up.
> >
> > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> > Fixes: 8a1a38661f56 ("lib: Add igt_create_bo_with_dimensions")
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93328
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Thanks. Pushed.
>

> Sorry and thanks,
> 
> Tomeu
> 
> > ---
> >  lib/igt_fb.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> > index c4f87898e82e..3e53d3b8cd3d 100644
> > --- a/lib/igt_fb.c
> > +++ b/lib/igt_fb.c
> > @@ -1006,7 +1006,7 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
> >         struct fb_blit_upload *blit;
> >         cairo_format_t cairo_format;
> >         unsigned int obj_tiling = fb_mod_to_obj_tiling(fb->tiling);
> > -       int bpp, ret;
> > +       int ret;
> >
> >         blit = malloc(sizeof(*blit));
> >         igt_assert(blit);
> > @@ -1016,8 +1016,7 @@ static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
> >          * cairo). This linear bo will be then blitted to its final
> >          * destination, tiling it at the same time.
> >          */
> > -       bpp = igt_drm_format_to_bpp(fb->drm_format);
> > -       ret = create_bo_for_fb(fd, fb->width, fb->height, bpp,
> > +       ret = create_bo_for_fb(fd, fb->width, fb->height, fb->drm_format,
> >                                 LOCAL_DRM_FORMAT_MOD_NONE, 0, 0,
> >                                 &blit->linear.handle,
> >                                 &blit->linear.size,
> > --
> > 2.7.4
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index c4f87898e82e..3e53d3b8cd3d 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -1006,7 +1006,7 @@  static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
 	struct fb_blit_upload *blit;
 	cairo_format_t cairo_format;
 	unsigned int obj_tiling = fb_mod_to_obj_tiling(fb->tiling);
-	int bpp, ret;
+	int ret;
 
 	blit = malloc(sizeof(*blit));
 	igt_assert(blit);
@@ -1016,8 +1016,7 @@  static void create_cairo_surface__blit(int fd, struct igt_fb *fb)
 	 * cairo). This linear bo will be then blitted to its final
 	 * destination, tiling it at the same time.
 	 */
-	bpp = igt_drm_format_to_bpp(fb->drm_format);
-	ret = create_bo_for_fb(fd, fb->width, fb->height, bpp,
+	ret = create_bo_for_fb(fd, fb->width, fb->height, fb->drm_format,
 				LOCAL_DRM_FORMAT_MOD_NONE, 0, 0,
 				&blit->linear.handle,
 				&blit->linear.size,