From: Imre Deak <imre.deak@nokia.com>
Date: Fri, 1 Apr 2011 15:19:04 +0000 (+0300)
Subject: gpu: pvr: print the command trace to syslog during HWrec
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8734b9e8103122036d76cc3ba3750c5719c25c66;p=sgx.git

gpu: pvr: print the command trace to syslog during HWrec

Signed-off-by: Imre Deak <imre.deak@nokia.com>
Reviewed-by: Luc Verhaegen <libv@codethink.co.uk>
---

diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index d0bf38b..c1f0f53 100644
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -58,6 +58,8 @@
 #include "pvrversion.h"
 #include "sgx_options.h"
 
+#include "pvr_trace_cmd.h"
+
 #ifdef CONFIG_DEBUG_FS
 #include "pvr_debugfs.h"
 #endif
@@ -665,6 +667,47 @@ static void pr_err_sgx_registers(struct PVRSRV_SGXDEV_INFO *psDevInfo)
 		readl(psDevInfo->pvRegsBaseKM + EUR_CR_CLKGATECTL));
 }
 
+#ifdef CONFIG_PVR_TRACE_CMD
+static void pr_err_cmd_trace(void)
+{
+	u8 *snapshot;
+	size_t snapshot_size;
+	loff_t snapshot_ofs;
+	char *str_buf;
+	size_t str_len;
+	int r;
+
+	str_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	if (!str_buf) {
+		pr_err("%s: out of mem\n", __func__);
+		return;
+	}
+
+	pvr_trcmd_lock();
+
+	r = pvr_trcmd_create_snapshot(&snapshot, &snapshot_size);
+	if (r < 0) {
+		pvr_trcmd_unlock();
+		kfree(str_buf);
+		pr_err("%s: can't create snapshot (%d)\n", __func__, r);
+
+		return;
+	}
+
+	pvr_trcmd_unlock();
+
+	snapshot_ofs = 0;
+	do {
+		str_len = pvr_trcmd_print(str_buf, PAGE_SIZE, snapshot,
+					snapshot_size, &snapshot_ofs);
+		printk(KERN_DEBUG "%s", str_buf);
+	} while (str_len);
+
+	pvr_trcmd_destroy_snapshot(snapshot);
+	kfree(str_buf);
+}
+#endif
+
 /* Should be called with pvr_lock held */
 void
 HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode, const char *caller)
@@ -693,6 +736,9 @@ HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode, const char *caller)
 #ifdef PVRSRV_USSE_EDM_STATUS_DEBUG
 	edm_trace_print(psDevInfo, NULL, 0);
 #endif
+#ifdef CONFIG_PVR_TRACE_CMD
+	pr_err_cmd_trace();
+#endif
 
 #ifdef CONFIG_DEBUG_FS
 	pvr_hwrec_dump(proc, psDevInfo);