From f0fca544b0602bc4ed2f68e8d260e0a3745b4bad Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 28 Dec 2012 18:52:44 +0000 Subject: [PATCH] sna/gen4+: Check for a spare exec slot for an outstanding vbo Signed-off-by: Chris Wilson --- src/sna/gen4_render.c | 2 +- src/sna/gen5_render.c | 2 +- src/sna/gen6_render.c | 4 +--- src/sna/gen7_render.c | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c index 21c860e3..84d78531 100644 --- a/src/sna/gen4_render.c +++ b/src/sna/gen4_render.c @@ -608,7 +608,7 @@ static int gen4_get_rectangles__flush(struct sna *sna, { if (!kgem_check_batch(&sna->kgem, op->need_magic_ca_pass ? 25 : 6)) return 0; - if (!kgem_check_reloc_and_exec(&sna->kgem, 1)) + if (!kgem_check_reloc_and_exec(&sna->kgem, 2)) return 0; if (op->need_magic_ca_pass && sna->render.vbo) diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c index 56178a6b..34cfd0e0 100644 --- a/src/sna/gen5_render.c +++ b/src/sna/gen5_render.c @@ -597,7 +597,7 @@ static int gen5_get_rectangles__flush(struct sna *sna, { if (!kgem_check_batch(&sna->kgem, op->need_magic_ca_pass ? 20 : 6)) return 0; - if (!kgem_check_reloc_and_exec(&sna->kgem, 1)) + if (!kgem_check_reloc_and_exec(&sna->kgem, 2)) return 0; if (op->need_magic_ca_pass && sna->render.vbo) diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index 013df6ff..0c55a2d0 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -1180,9 +1180,7 @@ static int gen6_get_rectangles__flush(struct sna *sna, { if (!kgem_check_batch(&sna->kgem, op->need_magic_ca_pass ? 65 : 5)) return 0; - if (!kgem_check_exec(&sna->kgem, 2)) - return 0; - if (!kgem_check_reloc(&sna->kgem, 4)) + if (!kgem_check_reloc_and_exec(&sna->kgem, 2)) return 0; if (op->need_magic_ca_pass && sna->render.vbo) diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index 52ddb125..d1ab2e3d 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -1306,9 +1306,7 @@ static int gen7_get_rectangles__flush(struct sna *sna, { if (!kgem_check_batch(&sna->kgem, op->need_magic_ca_pass ? 65 : 6)) return 0; - if (!kgem_check_exec(&sna->kgem, 1)) - return 0; - if (!kgem_check_reloc(&sna->kgem, 2)) + if (!kgem_check_reloc_and_exec(&sna->kgem, 2)) return 0; if (op->need_magic_ca_pass && sna->render.vbo)