From: Matt Roper <matthew.d.roper@intel.com>
To: Imre Deak <imre.deak@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t 8/8] lib/igt_fb: Make sure tiled YUV framebuffers are fully cleared
Date: Mon, 10 Feb 2020 15:34:46 -0800 [thread overview]
Message-ID: <20200210233446.GU232048@mdroper-desk1.amr.corp.intel.com> (raw)
In-Reply-To: <20200207191524.19362-8-imre.deak@intel.com>
On Fri, Feb 07, 2020 at 09:15:24PM +0200, Imre Deak wrote:
> For tiled FBs that are mapped in an other way than a GTT map we need to
> clear all tile-rows. Clearing only the first stride*height bytes may
> leave tiles at the end of the FB uncleared.
>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> lib/igt_fb.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index af3291a2..a4db0749 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -841,10 +841,20 @@ static void memset64(uint64_t *s, uint64_t c, size_t n)
> static void clear_yuv_buffer(struct igt_fb *fb)
> {
> bool full_range = fb->color_range == IGT_COLOR_YCBCR_FULL_RANGE;
> + size_t plane_size[2];
> void *ptr;
>
> igt_assert(igt_format_is_yuv(fb->drm_format));
>
> + for (int i = 0; i < min(ARRAY_SIZE(plane_size), fb->num_planes); i++) {
This will still calculate a plane_size[1] for packed YUV + CCS I think,
but I guess that doesn't hurt anything since it just never gets used
below.
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Matt
> + unsigned int tile_width, tile_height;
> +
> + igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[i],
> + &tile_width, &tile_height);
> + plane_size[i] = fb->strides[i] *
> + ALIGN(fb->plane_height[i], tile_height);
> + }
> +
> /* Ensure the framebuffer is preallocated */
> ptr = igt_fb_map_buffer(fb->fd, fb);
> igt_assert(*(uint32_t *)ptr == 0);
> @@ -853,48 +863,48 @@ static void clear_yuv_buffer(struct igt_fb *fb)
> case DRM_FORMAT_NV12:
> memset(ptr + fb->offsets[0],
> full_range ? 0x00 : 0x10,
> - fb->strides[0] * fb->plane_height[0]);
> + plane_size[0]);
> memset(ptr + fb->offsets[1],
> 0x80,
> - fb->strides[1] * fb->plane_height[1]);
> + plane_size[1]);
> break;
> case DRM_FORMAT_XYUV8888:
> wmemset(ptr + fb->offsets[0], full_range ? 0x00008080 : 0x00108080,
> - fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> break;
> case DRM_FORMAT_YUYV:
> case DRM_FORMAT_YVYU:
> wmemset(ptr + fb->offsets[0],
> full_range ? 0x80008000 : 0x80108010,
> - fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> break;
> case DRM_FORMAT_UYVY:
> case DRM_FORMAT_VYUY:
> wmemset(ptr + fb->offsets[0],
> full_range ? 0x00800080 : 0x10801080,
> - fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> break;
> case DRM_FORMAT_P010:
> case DRM_FORMAT_P012:
> case DRM_FORMAT_P016:
> wmemset(ptr, full_range ? 0 : 0x10001000,
> - fb->offsets[1] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> wmemset(ptr + fb->offsets[1], 0x80008000,
> - fb->strides[1] * fb->plane_height[1] / sizeof(wchar_t));
> + plane_size[1] / sizeof(wchar_t));
> break;
> case DRM_FORMAT_Y210:
> case DRM_FORMAT_Y212:
> case DRM_FORMAT_Y216:
> wmemset(ptr + fb->offsets[0],
> full_range ? 0x80000000 : 0x80001000,
> - fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> break;
>
> case DRM_FORMAT_XVYU2101010:
> case DRM_FORMAT_Y410:
> wmemset(ptr + fb->offsets[0],
> full_range ? 0x20000200 : 0x20010200,
> - fb->strides[0] * fb->plane_height[0] / sizeof(wchar_t));
> + plane_size[0] / sizeof(wchar_t));
> break;
>
> case DRM_FORMAT_XVYU12_16161616:
> @@ -903,7 +913,7 @@ static void clear_yuv_buffer(struct igt_fb *fb)
> case DRM_FORMAT_Y416:
> memset64(ptr + fb->offsets[0],
> full_range ? 0x800000008000ULL : 0x800010008000ULL,
> - fb->strides[0] * fb->plane_height[0] / sizeof(uint64_t));
> + plane_size[0] / sizeof(uint64_t));
> break;
> }
>
> --
> 2.23.1
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-02-10 23:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 19:15 [igt-dev] [PATCH i-g-t 1/8] lib/igt_draw: Refactor get_tiling calls Imre Deak
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 2/8] tests/kms_frontbuffer_tracking: Skip set tiling calls if not supported Imre Deak
2020-02-08 22:36 ` Dixit, Ashutosh
2020-02-10 22:32 ` Matt Roper
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 3/8] tests/kms_available_modes_crc: Don't set tiling for framebuffer Imre Deak
2020-02-10 22:47 ` Matt Roper
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 4/8] tests/kms_draw_crc: Skip GTT subtests on platforms w/o aperture Imre Deak
2020-02-10 22:51 ` Matt Roper
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 5/8] tests/kms_draw_crc: Fix generating reference CRCs " Imre Deak
2020-02-10 22:58 ` Matt Roper
2020-02-11 0:38 ` Imre Deak
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 6/8] tests/kms_frontbuffer_tracking: Skip GTT subtests " Imre Deak
2020-02-10 23:19 ` Matt Roper
2020-02-11 1:18 ` Imre Deak
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 7/8] lib/igt_draw: Fix igt_draw_fill_fb() " Imre Deak
2020-02-10 23:22 ` Matt Roper
2020-02-07 19:15 ` [igt-dev] [PATCH i-g-t 8/8] lib/igt_fb: Make sure tiled YUV framebuffers are fully cleared Imre Deak
2020-02-10 23:34 ` Matt Roper [this message]
2020-02-11 1:26 ` Imre Deak
2020-02-07 19:51 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/8] lib/igt_draw: Refactor get_tiling calls Patchwork
2020-02-08 22:36 ` [igt-dev] [PATCH i-g-t 1/8] " Dixit, Ashutosh
2020-02-10 11:37 ` Imre Deak
2020-02-11 19:10 ` Dixit, Ashutosh
2020-02-11 19:18 ` Imre Deak
2020-02-12 4:17 ` Dixit, Ashutosh
2020-02-10 22:13 ` Matt Roper
2020-02-11 0:37 ` Imre Deak
2020-02-11 9:30 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/8] " 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=20200210233446.GU232048@mdroper-desk1.amr.corp.intel.com \
--to=matthew.d.roper@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=imre.deak@intel.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