From: Ilia Mirkin <imirkin@alum.mit.edu>
To: Simon Ser <contact@emersion.fr>
Cc: nouveau <nouveau@lists.freedesktop.org>, Ben Skeggs <bskeggs@redhat.com>
Subject: Re: [Nouveau] [PATCH] nouveau/dispnv50: add cursor size/pitch checks
Date: Fri, 5 Feb 2021 12:34:20 -0500 [thread overview]
Message-ID: <CAKb7UvgpiHY3Z3BtCW3yP2YbfTvmpYS2uvErz1SjkR07pV6DSw@mail.gmail.com> (raw)
In-Reply-To: <20210205164515.4622-1-contact@emersion.fr>
On Fri, Feb 5, 2021 at 11:45 AM Simon Ser <contact@emersion.fr> wrote:
>
> The hardware needs a FB which is packed and not too large. Add
> checks to make sure this is the case.
>
> While at it, add a debug log for the existing check. This allows
> user-space to more easily figure out why a configuration is
> rejected.
>
> This commit depends on "drm/nouveau/kms/nv50-: Report max cursor
> size to userspace", otherwise mode_config.cursor_{width,height}
> is zero.
>
> Signed-off-by: Simon Ser <contact@emersion.fr>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Ilia Mirkin <imirkin@alum.mit.edu>
> ---
> drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 22 ++++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
> index 54fbd6fe751d..9a401751c56d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
> @@ -99,6 +99,7 @@ curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
> struct nv50_head_atom *asyh)
> {
> struct nv50_head *head = nv50_head(asyw->state.crtc);
> + struct drm_device *dev = head->base.base.dev;
> int ret;
>
> ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
> @@ -109,8 +110,27 @@ curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
> if (ret || !asyh->curs.visible)
> return ret;
>
> - if (asyw->image.w != asyw->image.h)
> + if (asyw->image.w != asyw->image.h) {
> + drm_dbg_atomic(dev,
> + "Invalid cursor image size: width (%d) must match height (%d)",
> + asyw->image.w, asyw->image.h);
> return -EINVAL;
> + }
> + if (asyw->image.w > dev->mode_config.cursor_width ||
> + asyw->image.h > dev->mode_config.cursor_height) {
> + drm_dbg_atomic(dev,
> + "Invalid cursor image size: too large (%dx%d > %dx%d)",
> + asyw->image.w, asyw->image.h,
> + dev->mode_config.cursor_width,
> + dev->mode_config.cursor_height);
> + return -EINVAL;
> + }
> + if (asyw->image.pitch[0] != asyw->image.w * 4) {
Rather than hard-coding to 4, make this look at the format (or cpp,
which should be available somewhere too I think). (Yeah, currently we
only expose RGBA8, but we should also be doing RGB5A1.)
> + drm_dbg_atomic(dev,
> + "Invalid cursor image pitch: image must be packed (pitch = %d, width = %d)",
> + asyw->image.pitch[0], asyw->image.w);
> + return -EINVAL;
> + }
>
> ret = head->func->curs_layout(head, asyw, asyh);
And this will fail due to the width/height not being supported, right?
-ilia
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
next prev parent reply other threads:[~2021-02-05 17:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 16:45 [Nouveau] [PATCH] nouveau/dispnv50: add cursor size/pitch checks Simon Ser
2021-02-05 17:34 ` Ilia Mirkin [this message]
2021-02-05 19:32 ` Lyude Paul
2021-02-05 21:00 ` Simon Ser
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=CAKb7UvgpiHY3Z3BtCW3yP2YbfTvmpYS2uvErz1SjkR07pV6DSw@mail.gmail.com \
--to=imirkin@alum.mit.edu \
--cc=bskeggs@redhat.com \
--cc=contact@emersion.fr \
--cc=nouveau@lists.freedesktop.org \
/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).