From: Petri Latvala <petri.latvala@intel.com>
To: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Development mailing list for IGT GPU Tools
<igt-dev@lists.freedesktop.org>
Subject: Re: [igt-dev] [PATCH i-g-t] lib/igt_fb: Avoid hitting assertion on non-intel HW
Date: Tue, 18 Feb 2020 11:29:43 +0200 [thread overview]
Message-ID: <20200218092943.GO25209@platvala-desk.ger.corp.intel.com> (raw)
In-Reply-To: <20200218082904.12327-1-tomeu.vizoso@collabora.com>
On Tue, Feb 18, 2020 at 09:29:04AM +0100, Tomeu Vizoso wrote:
> Recently a call to intel_get_drm_devid was added in a code path that
> gets run on all hardware.
>
> Restore the previous behavior by bailing out before we reach the assert.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Fixes: 8b90eefce9b4 ("lib/igt_fb: Use render copy/blit on platforms w/o HW detiling")
The path is from use_blitter() to blitter_ok() to fast_blit_ok() where
the intel_get_drm_devid call is, right? And the change that broke this
was using blitter_ok() unconditionally instead of almost-accidentally
avoiding the blitter_ok call by checking for I915_FORMAT_MOD_*
modifiers...
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> lib/igt_fb.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 49a032f65c06..0c4fdc5d4889 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -1992,6 +1992,9 @@ static bool fast_blit_ok(const struct igt_fb *fb)
>
> static bool blitter_ok(const struct igt_fb *fb)
> {
> + if (!is_i915_device(fb->fd))
> + return false;
> +
> if (is_ccs_modifier(fb->modifier))
> return false;
>
> --
> 2.21.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
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-18 9:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 8:29 [igt-dev] [PATCH i-g-t] lib/igt_fb: Avoid hitting assertion on non-intel HW Tomeu Vizoso
2020-02-18 9:29 ` Petri Latvala [this message]
2020-02-18 9:36 ` Tomeu Vizoso
2020-02-18 16:52 ` [igt-dev] ✗ Fi.CI.BAT: failure for " 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=20200218092943.GO25209@platvala-desk.ger.corp.intel.com \
--to=petri.latvala@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=tomeu.vizoso@collabora.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