Mesa (master): winsys/amdgpu: add one likely() call in amdgpu_cs_flush()

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 5a6b1aadeadc66b802bd87f1201304d0c3188114
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a6b1aadeadc66b802bd87f1201304d0c3188114

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Jan 27 14:35:22 2017 +0100

winsys/amdgpu: add one likely() call in amdgpu_cs_flush()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 0bc4ce9..789a5db 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -1142,9 +1142,9 @@ static int amdgpu_cs_flush(struct radeon_winsys_cs *rcs,
    }
 
    /* If the CS is not empty or overflowed.... */
-   if (radeon_emitted(&cs->main.base, 0) &&
+   if (likely(radeon_emitted(&cs->main.base, 0) &&
        cs->main.base.current.cdw <= cs->main.base.current.max_dw &&
-       !debug_get_option_noop()) {
+       !debug_get_option_noop())) {
       struct amdgpu_cs_context *cur = cs->csc;
       unsigned i, num_buffers;