gpu: pvr: pdump: move pdump.c and pdump_km.h to pvr_pdump.[ch]

Also make pvr_pdump.c build fully conditional.

Signed-off-by: Luc Verhaegen <Luc.Verhaegen@basyskom.de>
Signed-off-by: Imre Deak <imre.deak@nokia.com>

diff --git a/pvr/Makefile b/pvr/Makefile
index db1f491df97833f4f64c66787f1ee8e016496110..efb593b7de5f465faca57c1b8103caa33572405f 100644 (file)
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_PVR)       += omaplfb.o pvrsrvkm.o
 
 omaplfb-objs           := omaplfb_displayclass.o omaplfb_linux.o
 
-pvrsrvkm-objs          := osfunc.o mmap.o module.o pdump.o proc.o         \
+pvrsrvkm-objs          := osfunc.o mmap.o module.o proc.o         \
                           pvr_bridge_k.o mm.o event.o     \
                           buffer_manager.o devicemem.o deviceclass.o      \
                           handle.o hash.o pvrsrv.o queue.o ra.o           \
@@ -15,6 +15,7 @@ pvrsrvkm-objs         := osfunc.o mmap.o module.o pdump.o proc.o         \
 pvrsrvkm-objs-$(CONFIG_PVR_DEBUG) += pvr_debug.o
 pvrsrvkm-objs-$(CONFIG_DEBUG_FS) += pvr_debugfs.o
 pvrsrvkm-objs-$(CONFIG_PVR_TIMING) += pvr_debug.o
+pvrsrvkm-objs-$(CONFIG_PVR_DEBUG_PDUMP) += pvr_pdump.o
 
 pvrsrvkm-objs          += $(pvrsrvkm-objs-y) $(pvrsrvkm-objs-m)
 

diff --git a/pvr/bridged_pvr_bridge.c b/pvr/bridged_pvr_bridge.c
index 6568cb6e0d0e07a1c4d49918e4c8de16541092de..2ce50ce85dd59d67e0fefca5ddaa503bbf50b078 100644 (file)
--- a/pvr/bridged_pvr_bridge.c
+++ b/pvr/bridged_pvr_bridge.c
@@ -37,7 +37,7 @@
 #include "device.h"
 #include "buffer_manager.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "syscommon.h"
 
 #include "bridged_pvr_bridge.h"

diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index 7f61b305926a6f64779c41d2288a2bc7185f3905..a6afdb769f14d6c45ec872fe59a7a85c6164e4e3 100644 (file)
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -41,7 +41,7 @@
 #include "bridged_pvr_bridge.h"
 #include "bridged_sgx_bridge.h"
 #include "sgxutils.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "pvr_events.h"
 
 int SGXGetClientInfoBW(u32 ui32BridgeID,

diff --git a/pvr/buffer_manager.c b/pvr/buffer_manager.c
index 87e60cf8f43943c06d983fd63ba85d1f51d7642d..535f3ae2dec10cd06f5b3955c3ba9be08dfd0f76 100644 (file)
--- a/pvr/buffer_manager.c
+++ b/pvr/buffer_manager.c
@@ -28,7 +28,7 @@
 #include "sysconfig.h"
 #include "hash.h"
 #include "ra.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 
 #define MIN(a, b)       (a > b ? b : a)

diff --git a/pvr/devicemem.c b/pvr/devicemem.c
index 3912f2bc1175733acf889d2c7ba5161a13854dbc..881cf2498f1742bd41c823d4a21c026b89a79279 100644 (file)
--- a/pvr/devicemem.c
+++ b/pvr/devicemem.c
@@ -28,7 +28,7 @@
 
 #include "services_headers.h"
 #include "buffer_manager.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "pvr_bridge_km.h"
 
 #include <linux/pagemap.h>

diff --git a/pvr/mmu.c b/pvr/mmu.c
index af3bcfa296a793040c9a2b33eb96490464266535..2311626ae0d4a86f8e04a192f9b0ad14139a5a9a 100644 (file)
--- a/pvr/mmu.c
+++ b/pvr/mmu.c
@@ -30,7 +30,7 @@
 #include "buffer_manager.h"
 #include "hash.h"
 #include "ra.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxapi_km.h"
 #include "sgx_bridge_km.h"
 #include "sgxinfo.h"

diff --git a/pvr/pb.c b/pvr/pb.c
index ffd8f69eecf7ff7e0193b9d44b6640636481622d..5088a8c57b4c0e69c2be12754731428d07765123 100644 (file)
--- a/pvr/pb.c
+++ b/pvr/pb.c
@@ -32,7 +32,7 @@
 #include "sgxinfokm.h"
 #include "pvr_bridge_km.h"
 #include "sgx_bridge_km.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxutils.h"
 
 static struct RESMAN_ITEM *psResItemCreateSharedPB;

diff --git a/pvr/power.c b/pvr/power.c
index a33e0de81c47a0f1d4a0bddd4b72c7a392b3205f..3d6d087170256f6c3c9a5385c75c55d52f961006 100644 (file)
--- a/pvr/power.c
+++ b/pvr/power.c
@@ -24,7 +24,7 @@
  *
  ******************************************************************************/
 #include "services_headers.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>

diff --git a/pvr/pdump.c b/pvr/pvr_pdump.c
similarity index 99%
rename from pvr/pdump.c
rename to pvr/pvr_pdump.c
index daf50a39c700c3013fc3eb11e3e8d2358d7d167b..4bf8cd4adba0a91c96b7979c5aa8a27cd04dcc3a 100644 (file)
--- a/pvr/pdump.c
+++ b/pvr/pvr_pdump.c
@@ -1,4 +1,4 @@
-/**********************************************************************
+/*
  *
  * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
  *
@@ -22,9 +22,8 @@
  * Imagination Technologies Ltd. <gpl-support@imgtec.com>
  * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
  *
- ******************************************************************************/
+ */
 
-#if defined(PDUMP)
 #include <asm/atomic.h>
 #include <stdarg.h>
 
@@ -33,7 +32,7 @@
 #include "pvrversion.h"
 #include "sgxmmu.h"
 #include "mm.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 /*
  * There is no sense in having SGX_MMU_PAGE_SIZE differ from PAGE_SIZE.
@@ -762,5 +761,3 @@ void PDumpIDLWithFlags(u32 ui32Clocks, u32 ui32Flags)
 {
        pdump_print(ui32Flags, "IDL %u\r\n", ui32Clocks);
 }
-
-#endif

diff --git a/pvr/pdump_km.h b/pvr/pvr_pdump.h
similarity index 98%
rename from pvr/pdump_km.h
rename to pvr/pvr_pdump.h
index f3d7146dee6e53a98127f0d49973f74cf9918ffd..30232cb99a2be52dcef81540ea9619a7f973616b 100644 (file)
--- a/pvr/pdump_km.h
+++ b/pvr/pvr_pdump.h
@@ -24,8 +24,8 @@
  *
  ******************************************************************************/
 
-#ifndef _PDUMP_KM_H_
-#define _PDUMP_KM_H_
+#ifndef _PVR_PDUMP_H_
+#define _PVR_PDUMP_H_
 
 
 #define PDUMP_FLAGS_NEVER              0x08000000
@@ -183,4 +183,4 @@ void PDumpResumeKM(void);
 #define PDUMPRESUME(args...)
 #endif
 
-#endif
+#endif /* _PVR_PDUMP_H_ */

diff --git a/pvr/pvrsrv.c b/pvr/pvrsrv.c
index 72365ea6387f455d0bf8e6a0751508cdefa30e45..2bfb8569bd9546da2b8ce9106a2008451f343e13 100644 (file)
--- a/pvr/pvrsrv.c
+++ b/pvr/pvrsrv.c
@@ -31,7 +31,7 @@
 #include "pvr_bridge_km.h"
 #include "handle.h"
 #include "perproc.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "ra.h"
 #include "pvr_events.h"
 

diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index 1942ba621687c6b521a380a443ead035324226a0..210c66d20a05647a7db555ed21e2f717f978ec7e 100644 (file)
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -47,7 +47,7 @@
 #include "resman.h"
 #include "bridged_support.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "ra.h"
 #include "mmu.h"
 #include "mm.h"

diff --git a/pvr/sgxkick.c b/pvr/sgxkick.c
index 4054988eaf6767e4faa19c8ea84ce803ddaa2995..6678b49b9aa96f32ddc28a3d985a8665ab5605bf 100644 (file)
--- a/pvr/sgxkick.c
+++ b/pvr/sgxkick.c
@@ -30,7 +30,7 @@
 #include "sgxinfokm.h"
 #if defined(PDUMP)
 #include "sgxapi_km.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #endif
 #include "sgx_bridge_km.h"
 #include "osfunc.h"

diff --git a/pvr/sgxpower.c b/pvr/sgxpower.c
index 551b1a2bbb29453bb9b87e42b098fc81ee309027..30cfb58bbc70df8c720d3aa5fcb8fe5006e1d217 100644 (file)
--- a/pvr/sgxpower.c
+++ b/pvr/sgxpower.c
@@ -33,7 +33,7 @@
 #include "sgxapi_km.h"
 #include "sgxinfokm.h"
 #include "sgxutils.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 #define MS_TO_NS(x)                    ((x) * 1000000ULL)
 #define SGX_CMD_BURST_THRESHOLD_NS     MS_TO_NS(3)

diff --git a/pvr/sgxreset.c b/pvr/sgxreset.c
index ad76a01fe31e11d05a88771e553d5eeba36fc8f3..4d9dab025f1b385e8010fb39e65dd5cc90a86ff0 100644 (file)
--- a/pvr/sgxreset.c
+++ b/pvr/sgxreset.c
@@ -30,7 +30,7 @@
 #include "sgxinfokm.h"
 #include "sgxconfig.h"
 
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 
 static void SGXResetSoftReset(struct PVRSRV_SGXDEV_INFO *psDevInfo,
                                  IMG_BOOL bResetBIF, u32 ui32PDUMPFlags,

diff --git a/pvr/sgxtransfer.c b/pvr/sgxtransfer.c
index 410b97ed629b3a44fc392b9d57bc62c5a769c22c..22d2ac8bd6dcbf7c40016d9b9f824f442c5499cc 100644 (file)
--- a/pvr/sgxtransfer.c
+++ b/pvr/sgxtransfer.c
@@ -32,7 +32,7 @@
 #include "buffer_manager.h"
 #include "sgxinfo.h"
 #include "sysconfig.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 #include "pvr_bridge.h"
 #include "sgx_bridge_km.h"

diff --git a/pvr/sgxutils.c b/pvr/sgxutils.c
index 05973dfab5c72a4c9ddbd342e9acd7969550731e..860cbb6e4755b07b8a732f4a64e1c29bee59c6a0 100644 (file)
--- a/pvr/sgxutils.c
+++ b/pvr/sgxutils.c
@@ -33,7 +33,7 @@
 #include "sgxinfo.h"
 #include "sgxinfokm.h"
 #include "sysconfig.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "mmu.h"
 #include "pvr_bridge_km.h"
 #include "sgx_bridge_km.h"

diff --git a/pvr/sysconfig.c b/pvr/sysconfig.c
index 8ce48e4efb74173f91f17c55aab3eabaf5843e91..45b9d1fbb617d64ff5e5a41a7e8f2e0c4d6d5c3b 100644 (file)
--- a/pvr/sysconfig.c
+++ b/pvr/sysconfig.c
@@ -30,7 +30,7 @@
 #include "kerneldisplay.h"
 #include "oemfuncs.h"
 #include "sgxinfo.h"
-#include "pdump_km.h"
+#include "pvr_pdump.h"
 #include "sgxinfokm.h"
 #include "syslocal.h"
 #include "sysconfig.h"