public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@bootlin.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>,
	eben@raspberrypi.org,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [igt-dev] [PATCH i-g-t v3 07/14] igt: fb: Account for all planes bpp
Date: Tue, 22 Jan 2019 14:42:50 +0100	[thread overview]
Message-ID: <20190122134257.14038-8-maxime.ripard@bootlin.com> (raw)
In-Reply-To: <20190122134257.14038-1-maxime.ripard@bootlin.com>

When allocating a dumb buffer for a format with multiple plane, we need to
account for all plane's bpp in order to allocate the proper size.

Let's add all the planes bpp and use the result to allocate our buffer.

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

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 0f4021b77e5f..0f043acce29d 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -528,7 +528,9 @@ 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)
 {
+	const struct format_desc_struct *fmt = lookup_drm_format(fb->drm_format);
 	uint64_t size = calc_fb_size(fb);
+	unsigned int plane, bpp;
 	int fd = fb->fd;
 
 	/* respect the size requested by the caller */
@@ -557,10 +559,13 @@ static int create_bo_for_fb(struct igt_fb *fb)
 		}
 	}
 
+	for (plane = 0; plane < fb->num_planes; plane++)
+		bpp += DIV_ROUND_UP(fb->plane_bpp[plane],
+				    plane ? fmt->hsub * fmt->vsub : 1);
+
 	fb->is_dumb = true;
 	fb->gem_handle = kmstest_dumb_create(fd, fb->width, fb->height,
-					     fb->plane_bpp[0],
-					     &fb->strides[0], &fb->size);
+					     bpp, &fb->strides[0], &fb->size);
 
 	return fb->gem_handle;
 }
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-01-22 13:43 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-22 13:42 [igt-dev] [PATCH i-g-t v3 00/14] igt: chamelium: Test YUV buffers using the Chamelium Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 01/14] igt: fb: Add subsampling parameters to the formats Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 02/14] igt: fb: Reduce tile size alignment for non intel platforms Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 03/14] igt: fb: generic YUV convertion function Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 04/14] igt: fb: Move i915 YUV buffer clearing code to a function Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 05/14] igt: fb: Move size computation to the common path Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 06/14] igt: fb: Refactor dumb buffer allocation path Maxime Ripard
2019-01-22 13:42 ` Maxime Ripard [this message]
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 08/14] igt: fb: Don't pass the stride when allocating a dumb, multi-planar buffer Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 09/14] igt: fb: Clear YUV dumb buffers Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 10/14] igt: fb: Rework YUV i915 allocation path Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 11/14] igt: fb: Add a bunch of new YUV formats Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 12/14] igt: tests: chamelium: Start to unify tests Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 13/14] igt: tests: chamelium: Convert VGA tests to do_test_display Maxime Ripard
2019-01-22 13:42 ` [igt-dev] [PATCH i-g-t v3 14/14] igt: tests: chamelium: Add YUV formats tests Maxime Ripard
2019-01-22 14:11 ` [igt-dev] ✗ Fi.CI.BAT: failure for igt: chamelium: Test YUV buffers using the Chamelium (rev5) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190122134257.14038-8-maxime.ripard@bootlin.com \
    --to=maxime.ripard@bootlin.com \
    --cc=eben@raspberrypi.org \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=petri.latvala@intel.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox