diff options
author | Hemant Hariyani <hemanthariyani@ti.com> | 2011-08-25 03:01:10 -0400 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:18:39 -0400 |
commit | b7f68b0d0649bec8d50054b78873ca40b267321b (patch) | |
tree | 56e9917cfa159b1728721dbae9d8c46f33bc2699 /drivers/gpu/pvr/pdump/main.c | |
parent | 8827e270c06639a9a89390799c8860bf9640ec5f (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/main.c')
-rw-r--r-- | drivers/gpu/pvr/pdump/main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/pdump/main.c b/drivers/gpu/pvr/pdump/main.c index 69c0d9b1a97..45d041b087f 100644 --- a/drivers/gpu/pvr/pdump/main.c +++ b/drivers/gpu/pvr/pdump/main.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, |
@@ -116,7 +116,7 @@ IMG_VOID DBGDrvGetServiceTable(IMG_VOID **fn_table) | |||
116 | #if defined(SUPPORT_DRI_DRM) | 116 | #if defined(SUPPORT_DRI_DRM) |
117 | void dbgdrv_cleanup(void) | 117 | void dbgdrv_cleanup(void) |
118 | #else | 118 | #else |
119 | void __exit dbgdrv_cleanup_module(void) | 119 | static void __exit dbgdrv_cleanup(void) |
120 | #endif | 120 | #endif |
121 | { | 121 | { |
122 | #if !defined(SUPPORT_DRI_DRM) | 122 | #if !defined(SUPPORT_DRI_DRM) |
@@ -136,7 +136,7 @@ void __exit dbgdrv_cleanup_module(void) | |||
136 | #if defined(SUPPORT_DRI_DRM) | 136 | #if defined(SUPPORT_DRI_DRM) |
137 | IMG_INT dbgdrv_init(void) | 137 | IMG_INT dbgdrv_init(void) |
138 | #else | 138 | #else |
139 | int __init dbgdrv_init_module(void) | 139 | static int __init dbgdrv_init(void) |
140 | #endif | 140 | #endif |
141 | { | 141 | { |
142 | #if (defined(LDM_PLATFORM) || defined(LDM_PCI)) && !defined(SUPPORT_DRI_DRM) | 142 | #if (defined(LDM_PLATFORM) || defined(LDM_PCI)) && !defined(SUPPORT_DRI_DRM) |
@@ -240,6 +240,7 @@ long dbgdrv_ioctl(struct file *file, unsigned int ioctlCmd, unsigned long arg) | |||
240 | goto init_failed; | 240 | goto init_failed; |
241 | } | 241 | } |
242 | 242 | ||
243 | |||
243 | cmd = MAKEIOCTLINDEX(pIP->ui32Cmd) - DEBUG_SERVICE_IOCTL_BASE - 1; | 244 | cmd = MAKEIOCTLINDEX(pIP->ui32Cmd) - DEBUG_SERVICE_IOCTL_BASE - 1; |
244 | 245 | ||
245 | if(pIP->ui32Cmd == DEBUG_SERVICE_READ) | 246 | if(pIP->ui32Cmd == DEBUG_SERVICE_READ) |
@@ -310,5 +311,7 @@ IMG_VOID DefineHotKey (IMG_UINT32 ui32ScanCode, IMG_UINT32 ui32ShiftState, PHOTK | |||
310 | 311 | ||
311 | EXPORT_SYMBOL(DBGDrvGetServiceTable); | 312 | EXPORT_SYMBOL(DBGDrvGetServiceTable); |
312 | 313 | ||
313 | module_init(dbgdrv_init_module); | 314 | #if !defined(SUPPORT_DRI_DRM) |
314 | module_exit(dbgdrv_cleanup_module); | 315 | subsys_initcall(dbgdrv_init); |
316 | module_exit(dbgdrv_cleanup); | ||
317 | #endif | ||