Mesa (master): freedreno/a5xx: fix emit_string_marker()

[Rob Clark]

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

Author: Rob Clark <robdclark at gmail.com>
Date:   Tue Dec  6 12:57:24 2016 -0500

freedreno/a5xx: fix emit_string_marker()

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/gallium/drivers/freedreno/freedreno_context.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index 1128d91..348cc60 100644
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -85,7 +85,10 @@ fd_emit_string_marker(struct pipe_context *pctx, const char *string, int len)
 	/* max packet size is 0x3fff dwords: */
 	len = MIN2(len, 0x3fff * 4);
 
-	OUT_PKT3(ring, CP_NOP, align(len, 4) / 4);
+	if (ctx->screen->gpu_id >= 500)
+		OUT_PKT7(ring, CP_NOP, align(len, 4) / 4);
+	else
+		OUT_PKT3(ring, CP_NOP, align(len, 4) / 4);
 	while (len >= 4) {
 		OUT_RING(ring, *buf);
 		buf++;