commit 22d87177a2c0b35e17271ab588c359536647554f
author Sushmita Susheelendra <ssusheel@codeaurora.org> Mon May 09 16:40:02 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:14:28 2011 -0700
tree a081f77ac7ac874a73442ae18b3143fcf343b022
parent 965072ee65bdc9b58d86729479946db5e8e6e332

msm: kgsl: Fix build errors when CONFIG_MSM_KGSL_CFF_DUMP is on

Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>

drivers/gpu/msm/kgsl_cffdump.c

diff --git a/drivers/gpu/msm/kgsl_cffdump.c b/drivers/gpu/msm/kgsl_cffdump.c
index 138f4ea..fe24d15 100644
--- a/drivers/gpu/msm/kgsl_cffdump.c
+++ b/drivers/gpu/msm/kgsl_cffdump.c
@@ -24,6 +24,9 @@
 #include "kgsl.h"
 #include "kgsl_cffdump.h"
 #include "kgsl_debugfs.h"
+#include "kgsl_log.h"
+#include "kgsl_sharedmem.h"
+#include "adreno_pm4types.h"
 
 static struct rchan	*chan;
 static struct dentry	*dir;
@@ -49,7 +52,7 @@
 	unsigned char op;
 	uint addr;
 	uint value;
-} __attribute__((packed));
+} __packed;
 
 #define CFF_OP_POLL_REG         0x00000004
 struct cff_op_poll_reg {
@@ -57,12 +60,12 @@
 	uint addr;
 	uint value;
 	uint mask;
-} __attribute__((packed));
+} __packed;
 
 #define CFF_OP_WAIT_IRQ         0x00000005
 struct cff_op_wait_irq {
 	unsigned char op;
-} __attribute__((packed));
+} __packed;
 
 #define CFF_OP_VERIFY_MEM_FILE  0x00000007
 #define CFF_OP_RMW              0x0000000a
@@ -72,7 +75,7 @@
 	unsigned char op;
 	uint addr;
 	uint value;
-} __attribute__((packed));
+} __packed;
 
 #define CFF_OP_WRITE_MEMBUF     0x0000000c
 struct cff_op_write_membuf {
@@ -80,12 +83,12 @@
 	uint addr;
 	ushort count;
 	uint buffer[MEMBUF_SIZE];
-} __attribute__((packed));
+} __packed;
 
 #define CFF_OP_EOF              0xffffffff
 struct cff_op_eof {
 	unsigned char op;
-} __attribute__((packed));
+} __packed;
 
 
 static void b64_encodeblock(unsigned char in[3], unsigned char out[4], int len)
@@ -342,7 +345,7 @@
 
 	src = kgsl_gpuaddr_to_vaddr(memdesc, gpuaddr, &host_size);
 	if (src == NULL || host_size < sizebytes) {
-		KGSL_CORE_ERR(("did not find mapping for "
+		KGSL_CORE_ERR("did not find mapping for "
 			"gpuaddr: 0x%08x, m->host: 0x%p, phys: 0x%08x\n",
 			gpuaddr, memdesc->hostptr, memdesc->physaddr);
 		return;
@@ -354,8 +357,8 @@
 
 		mb();
 
-		kgsl_cache_range_op(memdesc->hostptr, memdesc->size,
-				    memdesc->type, KGSL_CACHE_OP_INV);
+		kgsl_cache_range_op((struct kgsl_memdesc *)memdesc,
+				KGSL_CACHE_OP_INV);
 	}
 
 	BUG_ON(physaddr > 0x66000000 && physaddr < 0x66ffffff);
@@ -523,8 +526,8 @@
 		return true;
 	} else {
 		mb();
-		kgsl_cache_range_op(memdesc->hostptr, memdesc->size,
-				    memdesc->type, KGSL_CACHE_OP_INV);
+		kgsl_cache_range_op((struct kgsl_memdesc *)memdesc,
+				KGSL_CACHE_OP_INV);
 	}
 
 #ifdef DEBUG