From 4ab7c2120a89d77769871db186e739ff1342ee41 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 18 Feb 2020 09:18:31 +0100 Subject: lib/igt_fb: Avoid hitting assertion on non-intel HW 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 Fixes: 8b90eefce9b4 ("lib/igt_fb: Use render copy/blit on platforms w/o HW detiling") Reviewed-by: Petri Latvala --- lib/igt_fb.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/igt_fb.c') diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 49a032f6..0c4fdc5d 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; -- cgit v1.2.3