From: Imre Deak <imre.deak@nokia.com>
Date: Tue, 6 Apr 2010 09:09:47 +0000 (+0300)
Subject: gpu: pvr: enable debug trace for basic debug build
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a49639b2dc6a2643ca6563d586078b2bc7775a;p=sgx.git

gpu: pvr: enable debug trace for basic debug build

Enable debug messages for basic debug type builds.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
CC: Mark Underwood <mark.underwood@imgtec.com>
CC: Mark Riding <mark.riding@imgtec.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
---

diff --git a/pvr/handle.c b/pvr/handle.c
index 3372c6a..bced654 100644
--- a/pvr/handle.c
+++ b/pvr/handle.c
@@ -199,7 +199,7 @@ static inline IMG_BOOL HandleListIsEmpty(u32 ui32Index,
 	return bIsEmpty;
 }
 
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 static inline IMG_BOOL NoChildren(struct PVRSRV_HANDLE_BASE *psBase,
 				  struct sHandle *psHandle)
 {
diff --git a/pvr/mmap.c b/pvr/mmap.c
index 6bc58e1..5e3cfc9 100644
--- a/pvr/mmap.c
+++ b/pvr/mmap.c
@@ -118,7 +118,7 @@ static struct KV_OFFSET_STRUCT *CreateOffsetStruct(struct LinuxMemArea
 						   u32 ui32RealByteSize)
 {
 	struct KV_OFFSET_STRUCT *psOffsetStruct;
-#if defined(CONFIG_PVR_DEBUG_EXTRA) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(CONFIG_PVR_DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
 	const char *pszName =
 	    LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
@@ -714,7 +714,7 @@ unlock_and_return:
 enum PVRSRV_ERROR PVRMMapRegisterArea(struct LinuxMemArea *psLinuxMemArea)
 {
 	enum PVRSRV_ERROR eError = PVRSRV_ERROR_GENERIC;
-#if defined(CONFIG_PVR_DEBUG_EXTRA) || defined(DEBUG_LINUX_MMAP_AREAS)
+#if defined(CONFIG_PVR_DEBUG) || defined(DEBUG_LINUX_MMAP_AREAS)
 	const char *pszName =
 	    LinuxMemAreaTypeToString(LinuxMemAreaRootType(psLinuxMemArea));
 #endif
diff --git a/pvr/pvr_debug.h b/pvr/pvr_debug.h
index 23ebe65..c8c7e75 100644
--- a/pvr/pvr_debug.h
+++ b/pvr/pvr_debug.h
@@ -52,7 +52,7 @@
 #define PVR_DBG_CALLTRACE		DBGPRIV_CALLTRACE
 #define PVR_DBG_ALLOC			DBGPRIV_ALLOC
 
-#if defined(CONFIG_PVR_DEBUG_EXTRA)
+#if defined(CONFIG_PVR_DEBUG)
 
 #define PVR_ASSERT(EXPR)						     \
 	do {								     \
diff --git a/pvr/resman.c b/pvr/resman.c
index 59e8a17..f05c2d7 100644
--- a/pvr/resman.c
+++ b/pvr/resman.c
@@ -48,7 +48,7 @@ static DEFINE_SEMAPHORE(lock);
 #define RESMAN_SIGNATURE 0x12345678
 
 struct RESMAN_ITEM {
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	u32 ui32Signature;
 #endif
 	struct RESMAN_ITEM **ppsThis;
@@ -64,7 +64,7 @@ struct RESMAN_ITEM {
 };
 
 struct RESMAN_CONTEXT {
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	u32 ui32Signature;
 #endif
 	struct RESMAN_CONTEXT **ppsThis;
@@ -144,7 +144,7 @@ enum PVRSRV_ERROR PVRSRVResManConnect(void *hPerProc,
 
 		return eError;
 	}
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	psResManContext->ui32Signature = RESMAN_SIGNATURE;
 #endif
 	psResManContext->psResItemList = NULL;
@@ -274,7 +274,7 @@ struct RESMAN_ITEM *ResManRegisterRes(struct RESMAN_CONTEXT *psResManContext,
 		return (struct RESMAN_ITEM *)NULL;
 	}
 
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	psNewResItem->ui32Signature = RESMAN_SIGNATURE;
 #endif
 	psNewResItem->ui32ResType = ui32ResType;
@@ -349,7 +349,7 @@ enum PVRSRV_ERROR ResManDissociateRes(struct RESMAN_ITEM *psResItem,
 		PVR_DBG_BREAK;
 		return PVRSRV_ERROR_INVALID_PARAMS;
 	}
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	PVR_ASSERT(psResItem->ui32Signature == RESMAN_SIGNATURE);
 #endif
 
@@ -385,7 +385,7 @@ enum PVRSRV_ERROR ResManFindResourceByPtr(
 		PVR_DBG_BREAK;
 		return PVRSRV_ERROR_INVALID_PARAMS;
 	}
-#ifdef CONFIG_PVR_DEBUG_EXTRA
+#ifdef CONFIG_PVR_DEBUG
 	PVR_ASSERT(psItem->ui32Signature == RESMAN_SIGNATURE);
 #endif