diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-02-18 09:18:31 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-02-18 10:37:00 +0100 |
| commit | 4ab7c2120a89d77769871db186e739ff1342ee41 (patch) | |
| tree | 62f6529875f308f532c7eaa541b1076332787b43 /lib/igt_fb.c | |
| parent | 7a05faa0be53fa1544ec950290129d20e4101c72 (diff) | |
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 <tomeu.vizoso@collabora.com>
Fixes: 8b90eefce9b4 ("lib/igt_fb: Use render copy/blit on platforms w/o HW detiling")
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib/igt_fb.c')
| -rw-r--r-- | lib/igt_fb.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |