From 5deba2832dc42072d9abaeaa7934bc0e1b28b3ed Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 19 Dec 2012 20:03:33 +0000 Subject: [PATCH] sna: Ignore throttling during vertex close Signed-off-by: Chris Wilson --- src/sna/gen3_render.c | 3 ++- src/sna/gen4_render.c | 3 ++- src/sna/gen5_render.c | 3 ++- src/sna/gen6_render.c | 3 ++- src/sna/gen7_render.c | 3 ++- src/sna/kgem.c | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 34dcd042..a75efba5 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1707,7 +1707,8 @@ static void gen3_vertex_close(struct sna *sna) DBG(("%s: new vbo: %d\n", __FUNCTION__, sna->render.vertex_used)); bo = kgem_create_linear(&sna->kgem, - 4*sna->render.vertex_used, 0); + 4*sna->render.vertex_used, + CREATE_NO_THROTTLE); if (bo) { assert(bo->snoop == false); kgem_bo_write(&sna->kgem, bo, diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c index d6ba3466..3f120623 100644 --- a/src/sna/gen4_render.c +++ b/src/sna/gen4_render.c @@ -347,7 +347,8 @@ static void gen4_vertex_close(struct sna *sna) sna->kgem.nbatch += sna->render.vertex_used; } else { bo = kgem_create_linear(&sna->kgem, - 4*sna->render.vertex_used, 0); + 4*sna->render.vertex_used, + CREATE_NO_THROTTLE); if (bo && !kgem_bo_write(&sna->kgem, bo, sna->render.vertex_data, 4*sna->render.vertex_used)) { diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c index 054829e1..8f5ea2f9 100644 --- a/src/sna/gen5_render.c +++ b/src/sna/gen5_render.c @@ -339,7 +339,8 @@ static void gen5_vertex_close(struct sna *sna) sna->kgem.nbatch += sna->render.vertex_used; } else { bo = kgem_create_linear(&sna->kgem, - 4*sna->render.vertex_used, 0); + 4*sna->render.vertex_used, + CREATE_NO_THROTTLE); if (bo && !kgem_bo_write(&sna->kgem, bo, sna->render.vertex_data, 4*sna->render.vertex_used)) { diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index a274f9b4..5a60787d 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -1058,7 +1058,8 @@ static void gen6_vertex_close(struct sna *sna) sna->kgem.nbatch += sna->render.vertex_used; } else { bo = kgem_create_linear(&sna->kgem, - 4*sna->render.vertex_used, 0); + 4*sna->render.vertex_used, + CREATE_NO_THROTTLE); if (bo && !kgem_bo_write(&sna->kgem, bo, sna->render.vertex_data, 4*sna->render.vertex_used)) { diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index 4c67340f..cc3199d5 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -1195,7 +1195,8 @@ static void gen7_vertex_close(struct sna *sna) sna->kgem.nbatch += sna->render.vertex_used; } else { bo = kgem_create_linear(&sna->kgem, - 4*sna->render.vertex_used, 0); + 4*sna->render.vertex_used, + CREATE_NO_THROTTLE); if (bo && !kgem_bo_write(&sna->kgem, bo, sna->render.vertex_data, 4*sna->render.vertex_used)) { diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 2933ec46..974201e2 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -2877,7 +2877,7 @@ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags) return NULL; } - if (!__kgem_throttle_retire(kgem, 0)) { + if (!__kgem_throttle_retire(kgem, flags)) { DBG(("%s: nothing retired\n", __FUNCTION__)); return NULL; }