From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: Maxime Ripard <maxime@cerno.tech>
Cc: Dom Cobley <popcornmix@gmail.com>,
Lucas Nussbaum <lucas@debian.org>,
DRI Development <dri-devel@lists.freedesktop.org>,
Ryutaroh Matsumoto <ryutaroh@ict.e.titech.ac.jp>
Subject: Re: [PATCH 1/2] drm/vc4: Correct lbm size and calculation
Date: Fri, 22 Jan 2021 10:12:23 +0000 [thread overview]
Message-ID: <CAPY8ntB9kmnCjN0xXmmzR6Uve2+f9UjeYqn6rFTmNOsof4RoXA@mail.gmail.com> (raw)
In-Reply-To: <20210121105759.1262699-1-maxime@cerno.tech>
Hi Maxime
On Thu, 21 Jan 2021 at 10:58, Maxime Ripard <maxime@cerno.tech> wrote:
>
> From: Dom Cobley <popcornmix@gmail.com>
>
> LBM base address is measured in units of pixels per cycle.
> That is 4 for 2711 (hvs5) and 2 for 2708.
>
> We are wasting 75% of lbm by indexing without the scaling.
> But we were also using too high a size for the lbm resulting
> in partial corruption (right hand side) of vertically
> scaled images, usually at 4K or lower resolutions with more layers.
>
> The physical RAM of LBM on 2711 is 8 * 1920 * 16 * 12-bit
> (pixels are stored 12-bits per component regardless of format).
>
> The LBM adress indexes work in units of pixels per clock,
> so for 4 pixels per clock that means we have 32 * 1920 = 60K
>
> Fixes: c54619b0bfb3 ("drm/vc4: Add support for the BCM2711 HVS5")
> Signed-off-by: Dom Cobley <popcornmix@gmail.com>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> ---
> drivers/gpu/drm/vc4/vc4_hvs.c | 8 ++++----
> drivers/gpu/drm/vc4/vc4_plane.c | 7 ++++++-
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
> index 2b3a597fa65f..c239045e05d6 100644
> --- a/drivers/gpu/drm/vc4/vc4_hvs.c
> +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
> @@ -622,11 +622,11 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
> * for now we just allocate globally.
> */
> if (!hvs->hvs5)
> - /* 96kB */
> - drm_mm_init(&hvs->lbm_mm, 0, 96 * 1024);
> + /* 48k words of 2x12-bit pixels */
> + drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
> else
> - /* 70k words */
> - drm_mm_init(&hvs->lbm_mm, 0, 70 * 2 * 1024);
> + /* 60k words of 4x12-bit pixels */
> + drm_mm_init(&hvs->lbm_mm, 0, 60 * 1024);
>
> /* Upload filter kernels. We only have the one for now, so we
> * keep it around for the lifetime of the driver.
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index 6bd8260aa9f2..b98eabb52920 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -437,6 +437,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
> static u32 vc4_lbm_size(struct drm_plane_state *state)
> {
> struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
> + struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
> u32 pix_per_line;
> u32 lbm;
>
> @@ -472,7 +473,11 @@ static u32 vc4_lbm_size(struct drm_plane_state *state)
> lbm = pix_per_line * 16;
> }
>
> - lbm = roundup(lbm, 32);
> + /* Align it to 64 or 128 (hvs5) bytes */
> + lbm = roundup(lbm, vc4->hvs->hvs5 ? 128 : 64);
> +
> + /* Each "word" of the LBM memory contains 2 or 4 (hvs5) pixels */
> + lbm /= vc4->hvs->hvs5 ? 4 : 2;
>
> return lbm;
> }
> --
> 2.29.2
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2021-01-22 10:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 10:57 [PATCH 1/2] drm/vc4: Correct lbm size and calculation Maxime Ripard
2021-01-21 10:57 ` [PATCH 2/2] drm/vc4: Correct POS1_SCL for hvs5 Maxime Ripard
2021-01-22 10:14 ` Dave Stevenson
2021-01-23 8:05 ` Lucas Nussbaum
2021-01-23 11:14 ` Ryutaroh Matsumoto
2021-01-25 10:54 ` Maxime Ripard
2021-01-21 11:04 ` [PATCH 1/2] drm/vc4: Correct lbm size and calculation Maxime Ripard
2021-01-21 16:26 ` Lucas Nussbaum
2021-01-22 5:11 ` Ryutaroh Matsumoto
2021-01-22 10:54 ` Maxime Ripard
2021-01-22 10:12 ` Dave Stevenson [this message]
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=CAPY8ntB9kmnCjN0xXmmzR6Uve2+f9UjeYqn6rFTmNOsof4RoXA@mail.gmail.com \
--to=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=lucas@debian.org \
--cc=maxime@cerno.tech \
--cc=popcornmix@gmail.com \
--cc=ryutaroh@ict.e.titech.ac.jp \
/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;
as well as URLs for NNTP newsgroup(s).