aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/pvr/pdump/hostfunc.c
diff options
context:
space:
mode:
authorHemant Hariyani <hemanthariyani@ti.com>2011-08-25 03:01:10 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:18:39 -0400
commitb7f68b0d0649bec8d50054b78873ca40b267321b (patch)
tree56e9917cfa159b1728721dbae9d8c46f33bc2699 /drivers/gpu/pvr/pdump/hostfunc.c
parent8827e270c06639a9a89390799c8860bf9640ec5f (diff)
OMAP4: SGX-KM: Upgrade DDK to version 1.7.17.4403
This patch upgrades the kernel side graphics driver to version 1.7.17.4403. The corresponding change in the user side must be in place for this to work. Change-Id: Id3a713fa22a227dbcd0ec098589d62b350802247 Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Diffstat (limited to 'drivers/gpu/pvr/pdump/hostfunc.c')
-rw-r--r--drivers/gpu/pvr/pdump/hostfunc.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/gpu/pvr/pdump/hostfunc.c b/drivers/gpu/pvr/pdump/hostfunc.c
index 64b20cc37b8..5eb8e1cc91a 100644
--- a/drivers/gpu/pvr/pdump/hostfunc.c
+++ b/drivers/gpu/pvr/pdump/hostfunc.c
@@ -1,6 +1,6 @@
1/********************************************************************** 1/**********************************************************************
2 * 2 *
3 * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. 3 * Copyright (C) Imagination Technologies Ltd. All rights reserved.
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms and conditions of the GNU General Public License, 6 * under the terms and conditions of the GNU General Public License,
@@ -29,13 +29,17 @@
29#include <linux/module.h> 29#include <linux/module.h>
30#include <linux/fs.h> 30#include <linux/fs.h>
31#include <linux/kernel.h> 31#include <linux/kernel.h>
32#include <linux/slab.h>
32#include <linux/mm.h> 33#include <linux/mm.h>
33#include <linux/string.h> 34#include <linux/string.h>
34#include <asm/page.h> 35#include <asm/page.h>
35#include <linux/vmalloc.h> 36#include <linux/vmalloc.h>
37#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15))
36#include <linux/mutex.h> 38#include <linux/mutex.h>
39#else
40#include <asm/semaphore.h>
41#endif
37#include <linux/hardirq.h> 42#include <linux/hardirq.h>
38#include <linux/slab.h>
39 43
40#if defined(SUPPORT_DBGDRV_EVENT_OBJECTS) 44#if defined(SUPPORT_DBGDRV_EVENT_OBJECTS)
41#include <linux/sched.h> 45#include <linux/sched.h>
@@ -51,13 +55,13 @@
51#include "hostfunc.h" 55#include "hostfunc.h"
52#include "dbgdriv.h" 56#include "dbgdriv.h"
53 57
54#if defined(DEBUG) && !defined(SUPPORT_DRI_DRM) 58#if defined(MODULE) && defined(DEBUG) && !defined(SUPPORT_DRI_DRM)
55IMG_UINT32 gPVRDumpDebugLevel = (DBGPRIV_FATAL | DBGPRIV_ERROR | DBGPRIV_WARNING); 59IMG_UINT32 gPVRDebugLevel = (DBGPRIV_FATAL | DBGPRIV_ERROR | DBGPRIV_WARNING);
56 60
57#define PVR_STRING_TERMINATOR '\0' 61#define PVR_STRING_TERMINATOR '\0'
58#define PVR_IS_FILE_SEPARATOR(character) ( ((character) == '\\') || ((character) == '/') ) 62#define PVR_IS_FILE_SEPARATOR(character) ( ((character) == '\\') || ((character) == '/') )
59 63
60void PVRSRVDumpDebugPrintf ( 64void PVRSRVDebugPrintf (
61 IMG_UINT32 ui32DebugLevel, 65 IMG_UINT32 ui32DebugLevel,
62 const IMG_CHAR* pszFileName, 66 const IMG_CHAR* pszFileName,
63 IMG_UINT32 ui32Line, 67 IMG_UINT32 ui32Line,
@@ -79,7 +83,7 @@ void PVRSRVDumpDebugPrintf (
79 83
80 bTrace = (IMG_BOOL)(ui32DebugLevel & DBGPRIV_CALLTRACE) ? IMG_TRUE : IMG_FALSE; 84 bTrace = (IMG_BOOL)(ui32DebugLevel & DBGPRIV_CALLTRACE) ? IMG_TRUE : IMG_FALSE;
81 85
82 if (gPVRDumpDebugLevel & ui32DebugLevel) 86 if (gPVRDebugLevel & ui32DebugLevel)
83 { 87 {
84 va_list vaArgs; 88 va_list vaArgs;
85 static char szBuffer[256]; 89 static char szBuffer[256];
@@ -131,7 +135,7 @@ void PVRSRVDumpDebugPrintf (
131 vsprintf (&szBuffer[strlen(szBuffer)], pszFormat, vaArgs); 135 vsprintf (&szBuffer[strlen(szBuffer)], pszFormat, vaArgs);
132 136
133 137
134 if (bTrace == IMG_FALSE) 138 if (bTrace == IMG_FALSE)
135 { 139 {
136 sprintf (&szBuffer[strlen(szBuffer)], " [%d, %s]", (int)ui32Line, pszFileName); 140 sprintf (&szBuffer[strlen(szBuffer)], " [%d, %s]", (int)ui32Line, pszFileName);
137 } 141 }