[igt-dev] [PATCH i-g-t] lib/igt_fb: Avoid hitting assertion on non-intel HW

[Petri Latvala]

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 at 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 at 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 at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev