diff options
Diffstat (limited to 'meta-crownbay/recipes-kernel')
4 files changed, 2306 insertions, 0 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable/0001-crownbay-update-a-handful-of-EMGD-licenses.patch b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable/0001-crownbay-update-a-handful-of-EMGD-licenses.patch new file mode 100644 index 00000000..5fcc2c2a --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable/0001-crownbay-update-a-handful-of-EMGD-licenses.patch | |||
@@ -0,0 +1,1151 @@ | |||
1 | From fb0e43f18c33979abf5c1eb36cf3f0ca04c3d0fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Zanussi <tom.zanussi@intel.com> | ||
3 | Date: Thu, 17 Mar 2011 13:03:34 -0500 | ||
4 | Subject: [KERNEL][linux-yocto-stable][PATCH 1/1] crownbay: update a handful of EMGD licenses | ||
5 | |||
6 | The version of the EMGD driver we use had a few included license | ||
7 | mistakes. Correct these as per upstream. | ||
8 | |||
9 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
10 | --- | ||
11 | drivers/gpu/drm/emgd/emgd/pal/Makefile.include | 39 ++-- | ||
12 | .../emgd/pvr/services4/system/common/sysconfig.c | 287 ++++++++++---------- | ||
13 | .../drm/emgd/pvr/services4/system/plb/sysconfig.c | 64 +++--- | ||
14 | .../drm/emgd/pvr/services4/system/tnc/sysconfig.c | 64 +++--- | ||
15 | .../gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | 48 ++-- | ||
16 | 5 files changed, 246 insertions(+), 256 deletions(-) | ||
17 | |||
18 | diff --git a/drivers/gpu/drm/emgd/emgd/pal/Makefile.include b/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
19 | index 8143979..91f9afa 100644 | ||
20 | --- a/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
21 | +++ b/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
22 | @@ -1,25 +1,26 @@ | ||
23 | #---------------------------------------------------------------------------- | ||
24 | # Filename: Makefile.include | ||
25 | -# $Revision: 1.1 $ | ||
26 | +# $Revision: 1.2 $ | ||
27 | #---------------------------------------------------------------------------- | ||
28 | -# INTEL CONFIDENTIAL | ||
29 | -# Copyright (2002-2008) Intel Corporation All Rights Reserved. | ||
30 | -# The source code contained or described herein and all documents related to | ||
31 | -# the source code ("Material") are owned by Intel Corporation or its suppliers | ||
32 | -# or licensors. Title to the Material remains with Intel Corporation or its | ||
33 | -# suppliers and licensors. The Material contains trade secrets and proprietary | ||
34 | -# and confidential information of Intel or its suppliers and licensors. The | ||
35 | -# Material is protected by worldwide copyright and trade secret laws and | ||
36 | -# treaty provisions. No part of the Material may be used, copied, reproduced, | ||
37 | -# modified, published, uploaded, posted, transmitted, distributed, or | ||
38 | -# disclosed in any way without Intel's prior express written permission. | ||
39 | -# | ||
40 | -# No license under any patent, copyright, trade secret or other intellectual | ||
41 | -# property right is granted to or conferred upon you by disclosure or | ||
42 | -# delivery of the Materials, either expressly, by implication, inducement, | ||
43 | -# estoppel or otherwise. Any license under such intellectual property rights | ||
44 | -# must be express and approved by Intel in writing. | ||
45 | -# | ||
46 | +# Copyright © 2002-2010, Intel Corporation. | ||
47 | +# | ||
48 | +# Permission is hereby granted, free of charge, to any person obtaining a copy | ||
49 | +# of this software and associated documentation files (the "Software"), to deal | ||
50 | +# in the Software without restriction, including without limitation the rights | ||
51 | +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
52 | +# copies of the Software, and to permit persons to whom the Software is | ||
53 | +# furnished to do so, subject to the following conditions: | ||
54 | +# | ||
55 | +# The above copyright notice and this permission notice shall be included in | ||
56 | +# all copies or substantial portions of the Software. | ||
57 | +# | ||
58 | +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
59 | +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
60 | +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
61 | +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
62 | +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
63 | +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
64 | +# THE SOFTWARE. | ||
65 | #---------------------------------------------------------------------------- | ||
66 | |||
67 | ifeq ($(origin EGD_CFG), undefined) | ||
68 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
69 | index 5037186..4c9946c 100644 | ||
70 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
71 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
72 | @@ -1,35 +1,36 @@ | ||
73 | /* -*- syscommon-c -*- | ||
74 | -*----------------------------------------------------------------------------- | ||
75 | -* Filename: syscommon.c | ||
76 | -* $Revision: 1.6 $ | ||
77 | -*----------------------------------------------------------------------------- | ||
78 | -* INTEL CONFIDENTIAL | ||
79 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
80 | -* The source code contained or described herein and all documents related to | ||
81 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
82 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
83 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
84 | -* and confidential information of Intel or its suppliers and licensors. The | ||
85 | -* Material is protected by worldwide copyright and trade secret laws and | ||
86 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
87 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
88 | -* disclosed in any way without Intel's prior express written permission. | ||
89 | -* | ||
90 | -* No license under any patent, copyright, trade secret or other intellectual | ||
91 | -* property right is granted to or conferred upon you by disclosure or | ||
92 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
93 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
94 | -* must be express and approved by Intel in writing. | ||
95 | -* | ||
96 | -* | ||
97 | -*----------------------------------------------------------------------------- | ||
98 | -* Description: platform detection, and sharing of correct platform interface. | ||
99 | -* | ||
100 | -*----------------------------------------------------------------------------- | ||
101 | -* Authors: | ||
102 | -* Marcin Tomczyk | ||
103 | -*----------------------------------------------------------------------------- | ||
104 | -*/ | ||
105 | + *----------------------------------------------------------------------------- | ||
106 | + * Filename: syscommon.c | ||
107 | + * $Revision: 1.7 $ | ||
108 | + *----------------------------------------------------------------------------- | ||
109 | + * Copyright © 2002-2010, Intel Corporation. | ||
110 | + * | ||
111 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
112 | + * of this software and associated documentation files (the "Software"), to deal | ||
113 | + * in the Software without restriction, including without limitation the rights | ||
114 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
115 | + * copies of the Software, and to permit persons to whom the Software is | ||
116 | + * furnished to do so, subject to the following conditions: | ||
117 | + * | ||
118 | + * The above copyright notice and this permission notice shall be included in | ||
119 | + * all copies or substantial portions of the Software. | ||
120 | + * | ||
121 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
122 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
123 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
124 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
125 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
126 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
127 | + * THE SOFTWARE. | ||
128 | + * | ||
129 | + *----------------------------------------------------------------------------- | ||
130 | + * Description: platform detection, and sharing of correct platform interface. | ||
131 | + * | ||
132 | + *----------------------------------------------------------------------------- | ||
133 | + * Authors: | ||
134 | + * Marcin Tomczyk | ||
135 | + *----------------------------------------------------------------------------- | ||
136 | + */ | ||
137 | |||
138 | #include <linux/pci.h> | ||
139 | #include "sgxdefs.h" | ||
140 | @@ -124,7 +125,7 @@ IMG_VOID SysPlatformDetect(IMG_VOID) | ||
141 | |||
142 | |||
143 | /* --------------------------------------------------------------------------*/ | ||
144 | -/** | ||
145 | +/** | ||
146 | * @Synopsis Interface for Atom E6xx device | ||
147 | */ | ||
148 | /* ----------------------------------------------------------------------------*/ | ||
149 | @@ -196,14 +197,14 @@ static PVRSRV_ERROR PCIInitDev(SYS_DATA *psSysData) | ||
150 | #if defined(SGX_FEATURE_HOST_PORT) | ||
151 | PVR_TRACE(("Host Port region: %x to %x", OSPCIAddrRangeStart(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX), OSPCIAddrRangeEnd(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX))); | ||
152 | #endif | ||
153 | - | ||
154 | + | ||
155 | if (OSPCIAddrRangeLen(psSysSpecData->hSGXPCI, ADDR_RANGE_INDEX) < MAX_OFFSET) | ||
156 | { | ||
157 | PVR_DPF((PVR_DBG_ERROR,"PCIInitDev: Device memory region isn't big enough")); | ||
158 | return PVRSRV_ERROR_GENERIC; | ||
159 | } | ||
160 | |||
161 | - | ||
162 | + | ||
163 | if (OSPCIRequestAddrRange(psSysSpecData->hSGXPCI, ADDR_RANGE_INDEX) != PVRSRV_OK) | ||
164 | { | ||
165 | PVR_DPF((PVR_DBG_ERROR,"PCIInitDev: Device memory region not available")); | ||
166 | @@ -211,7 +212,7 @@ static PVRSRV_ERROR PCIInitDev(SYS_DATA *psSysData) | ||
167 | } | ||
168 | SYS_SPECIFIC_DATA_SET(psSysSpecData, SYS_SPECIFIC_DATA_PCI_REQUEST_SGX_ADDR_RANGE); | ||
169 | |||
170 | - | ||
171 | + | ||
172 | #if defined(SGX_FEATURE_HOST_PORT) | ||
173 | if (OSPCIRequestAddrRange(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX) != PVRSRV_OK) | ||
174 | { | ||
175 | @@ -244,31 +245,31 @@ static IMG_VOID PCIDeInitDev(SYS_DATA *psSysData) | ||
176 | OSPCIReleaseDev(psSysSpecData->hSGXPCI); | ||
177 | } | ||
178 | } | ||
179 | -#else | ||
180 | +#else | ||
181 | static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PCICONFIG_SPACE *psPCISpace) | ||
182 | { | ||
183 | IMG_UINT32 ui32BusNum; | ||
184 | IMG_UINT32 ui32DevNum; | ||
185 | IMG_UINT32 ui32VenDevID; | ||
186 | |||
187 | - | ||
188 | + | ||
189 | for (ui32BusNum=0; ui32BusNum < 255; ui32BusNum++) | ||
190 | { | ||
191 | - | ||
192 | + | ||
193 | for (ui32DevNum=0; ui32DevNum < 32; ui32DevNum++) | ||
194 | { | ||
195 | - | ||
196 | + | ||
197 | ui32VenDevID=OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 0); | ||
198 | |||
199 | - | ||
200 | + | ||
201 | if (ui32VenDevID == (IMG_UINT32)((ui16DevID<<16)+ui16VenID)) | ||
202 | { | ||
203 | IMG_UINT32 ui32Idx; | ||
204 | |||
205 | - | ||
206 | + | ||
207 | OSPCIWriteDword(ui32BusNum, ui32DevNum, 0, 4, OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 4) | 0x02); | ||
208 | |||
209 | - | ||
210 | + | ||
211 | for (ui32Idx=0; ui32Idx < 64; ui32Idx++) | ||
212 | { | ||
213 | psPCISpace->u.aui32PCISpace[ui32Idx] = OSPCIReadDword(ui32BusNum, ui32DevNum, 0, ui32Idx*4); | ||
214 | @@ -289,7 +290,7 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
215 | |||
216 | return PVRSRV_ERROR_GENERIC; | ||
217 | } | ||
218 | -#endif | ||
219 | +#endif | ||
220 | |||
221 | static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
222 | { | ||
223 | @@ -339,21 +340,21 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
224 | } | ||
225 | |||
226 | ui32IRQ = (IMG_UINT32)sPCISpace.u.aui8PCISpace[0x3C]; | ||
227 | -#endif | ||
228 | +#endif | ||
229 | + | ||
230 | |||
231 | - | ||
232 | gsSGXDeviceMap.ui32Flags = 0x0; | ||
233 | |||
234 | - | ||
235 | + | ||
236 | #if defined(NO_HARDWARE) | ||
237 | - | ||
238 | + | ||
239 | gsSGXDeviceMap.ui32IRQ = 0; | ||
240 | #else | ||
241 | gsSGXDeviceMap.ui32IRQ = ui32IRQ; | ||
242 | #endif | ||
243 | |||
244 | #if defined(NO_HARDWARE) | ||
245 | - | ||
246 | + | ||
247 | eError = OSBaseAllocContigMemory(SGX_REG_SIZE, | ||
248 | &gsSGXRegsCPUVAddr, | ||
249 | &sCpuPAddr); | ||
250 | @@ -368,29 +369,29 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
251 | OSMemSet(gsSGXRegsCPUVAddr, 0, SGX_REG_SIZE); | ||
252 | |||
253 | #if defined(__linux__) | ||
254 | - | ||
255 | + | ||
256 | gsSGXDeviceMap.pvRegsCpuVBase = gsSGXRegsCPUVAddr; | ||
257 | #else | ||
258 | - | ||
259 | + | ||
260 | gsSGXDeviceMap.pvRegsCpuVBase = IMG_NULL; | ||
261 | #endif | ||
262 | |||
263 | -#else | ||
264 | +#else | ||
265 | gsSGXDeviceMap.sRegsSysPBase.uiAddr = ui32BaseAddr + SGX_REGS_OFFSET; | ||
266 | -#endif | ||
267 | +#endif | ||
268 | + | ||
269 | |||
270 | - | ||
271 | gsSGXDeviceMap.sRegsCpuPBase = SysSysPAddrToCpuPAddr(gsSGXDeviceMap.sRegsSysPBase); | ||
272 | gsSGXDeviceMap.ui32RegsSize = SGX_REG_SIZE; | ||
273 | |||
274 | #if defined(SGX_FEATURE_HOST_PORT) | ||
275 | - | ||
276 | + | ||
277 | gsSGXDeviceMap.ui32Flags = SGX_HOSTPORT_PRESENT; | ||
278 | gsSGXDeviceMap.sHPSysPBase.uiAddr = ui32HostPortAddr; | ||
279 | gsSGXDeviceMap.sHPCpuPBase = SysSysPAddrToCpuPAddr(gsSGXDeviceMap.sHPSysPBase); | ||
280 | gsSGXDeviceMap.ui32HPSize = SYS_SGX_HP_SIZE; | ||
281 | #endif | ||
282 | - | ||
283 | + | ||
284 | |||
285 | |||
286 | |||
287 | @@ -400,7 +401,7 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
288 | gsSGXDeviceMap.ui32LocalMemSize = 0; | ||
289 | |||
290 | #if !defined(NO_HARDWARE) | ||
291 | - | ||
292 | + | ||
293 | { | ||
294 | IMG_SYS_PHYADDR sPoulsboRegsCpuPBase; | ||
295 | |||
296 | @@ -421,10 +422,10 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
297 | #endif | ||
298 | |||
299 | #ifdef SUPPORT_MSVDX | ||
300 | - | ||
301 | + | ||
302 | |||
303 | #if defined(NO_HARDWARE) | ||
304 | - | ||
305 | + | ||
306 | eError = OSBaseAllocContigMemory(MSVDX_REG_SIZE, | ||
307 | &gsMSVDXRegsCPUVAddr, | ||
308 | &sCpuPAddr); | ||
309 | @@ -438,10 +439,10 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
310 | OSMemSet(gsMSVDXRegsCPUVAddr, 0, MSVDX_REG_SIZE); | ||
311 | |||
312 | #if defined(__linux__) | ||
313 | - | ||
314 | + | ||
315 | gsMSVDXDeviceMap.pvRegsCpuVBase = gsMSVDXRegsCPUVAddr; | ||
316 | #else | ||
317 | - | ||
318 | + | ||
319 | gsMSVDXDeviceMap.pvRegsCpuVBase = IMG_NULL; | ||
320 | #endif | ||
321 | #else | ||
322 | @@ -450,7 +451,7 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
323 | gsMSVDXDeviceMap.sRegsSysPBase = SysCpuPAddrToSysPAddr(gsMSVDXDeviceMap.sRegsCpuPBase); | ||
324 | gsMSVDXDeviceMap.ui32RegsSize = MSVDX_REG_SIZE; | ||
325 | |||
326 | - | ||
327 | + | ||
328 | |||
329 | |||
330 | |||
331 | @@ -459,13 +460,13 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
332 | gsMSVDXDeviceMap.sLocalMemCpuPBase.uiAddr = 0; | ||
333 | gsMSVDXDeviceMap.ui32LocalMemSize = 0; | ||
334 | |||
335 | - | ||
336 | + | ||
337 | |||
338 | gsMSVDXDeviceMap.ui32IRQ = ui32IRQ; | ||
339 | |||
340 | -#endif | ||
341 | +#endif | ||
342 | + | ||
343 | |||
344 | - | ||
345 | |||
346 | return PVRSRV_OK; | ||
347 | } | ||
348 | @@ -478,28 +479,28 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
349 | IMG_UINT32 ui32VenDevID; | ||
350 | IMG_UINT32 ui32BarIndex; | ||
351 | |||
352 | - | ||
353 | + | ||
354 | for (ui32BusNum=0; ui32BusNum < 255; ui32BusNum++) | ||
355 | { | ||
356 | - | ||
357 | + | ||
358 | for (ui32DevNum=0; ui32DevNum < 32; ui32DevNum++) | ||
359 | { | ||
360 | - | ||
361 | + | ||
362 | ui32VenDevID=OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 0); | ||
363 | |||
364 | - | ||
365 | + | ||
366 | if (ui32VenDevID == (IMG_UINT32)((ui16DevID<<16)+ui16VenID)) | ||
367 | { | ||
368 | IMG_UINT32 ui32Idx; | ||
369 | |||
370 | - | ||
371 | + | ||
372 | OSPCIWriteDword(ui32BusNum, ui32DevNum, 0, 4, OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 4) | 0x02); | ||
373 | |||
374 | - psPCISpace->ui32BusNum = ui32BusNum; | ||
375 | + psPCISpace->ui32BusNum = ui32BusNum; | ||
376 | psPCISpace->ui32DevNum = ui32DevNum; | ||
377 | psPCISpace->ui32FuncNum = 0; | ||
378 | |||
379 | - | ||
380 | + | ||
381 | for (ui32Idx=0; ui32Idx < 64; ui32Idx++) | ||
382 | { | ||
383 | psPCISpace->u.aui32PCISpace[ui32Idx] = OSPCIReadDword(ui32BusNum, ui32DevNum, 0, ui32Idx*4); | ||
384 | @@ -509,7 +510,7 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
385 | PVR_DPF((PVR_DBG_VERBOSE,"%08X\n",psPCISpace->u.aui32PCISpace[ui32Idx])); | ||
386 | } | ||
387 | } | ||
388 | - | ||
389 | + | ||
390 | for (ui32BarIndex = 0; ui32BarIndex < 6; ui32BarIndex++) | ||
391 | { | ||
392 | GetPCIMemSpaceSize (ui32BusNum, ui32DevNum, ui32BarIndex, &psPCISpace->aui32PCIMemSpaceSize[ui32BarIndex]); | ||
393 | @@ -557,7 +558,7 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
394 | IMG_CHAR *pszVersionString; | ||
395 | |||
396 | #if !defined(NO_HARDWARE) | ||
397 | - | ||
398 | + | ||
399 | { | ||
400 | IMG_VOID *pvSGXRegs; | ||
401 | |||
402 | @@ -571,8 +572,8 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
403 | ui32SGXRevision = OSReadHWReg(pvSGXRegs, EUR_CR_CORE_REVISION); | ||
404 | |||
405 | OSUnMapPhysToLin(pvSGXRegs, | ||
406 | - gsSGXDeviceMap.ui32RegsSize, | ||
407 | - PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
408 | + gsSGXDeviceMap.ui32RegsSize, | ||
409 | + PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
410 | IMG_NULL); | ||
411 | } | ||
412 | else | ||
413 | @@ -609,7 +610,7 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
414 | ui32MaxStrLen + 1, | ||
415 | pszVersionString, | ||
416 | IMG_NULL); | ||
417 | - | ||
418 | + | ||
419 | return PVRSRV_ERROR_GENERIC; | ||
420 | } | ||
421 | |||
422 | @@ -631,7 +632,7 @@ static IMG_VOID SysFreeVersionString(SYS_DATA *psSysData) | ||
423 | psSysData->pszVersionString = NULL; | ||
424 | } | ||
425 | } | ||
426 | -#endif | ||
427 | +#endif | ||
428 | PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
429 | { | ||
430 | IMG_UINT32 i; | ||
431 | @@ -642,14 +643,14 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
432 | PVR_DPF((PVR_DBG_MESSAGE,"SysInitialise")); | ||
433 | |||
434 | SysPlatformDetect(); | ||
435 | - | ||
436 | + | ||
437 | gpsSysData = &gsSysData; | ||
438 | OSMemSet(gpsSysData, 0, sizeof(SYS_DATA)); | ||
439 | |||
440 | gpsSysData->pvSysSpecificData = &gsSysSpecificData; | ||
441 | gsSysSpecificData.ui32SysSpecificData = 0; | ||
442 | #ifdef LDM_PCI | ||
443 | - | ||
444 | + | ||
445 | PVR_ASSERT(gpsPVRLDMDev != IMG_NULL); | ||
446 | gsSysSpecificData.psPCIDev = gpsPVRLDMDev; | ||
447 | #endif | ||
448 | @@ -663,15 +664,15 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
449 | return eError; | ||
450 | } | ||
451 | |||
452 | - | ||
453 | + | ||
454 | psTimingInfo = &gsSGXDeviceMap.sTimingInfo; | ||
455 | psTimingInfo->ui32CoreClockSpeed = SYS_SGX_CLOCK_SPEED; | ||
456 | psTimingInfo->ui32HWRecoveryFreq = SYS_SGX_HWRECOVERY_TIMEOUT_FREQ; | ||
457 | #if defined(SUPPORT_ACTIVE_POWER_MANAGEMENT) | ||
458 | psTimingInfo->bEnableActivePM = IMG_TRUE; | ||
459 | -#else | ||
460 | +#else | ||
461 | psTimingInfo->bEnableActivePM = IMG_FALSE; | ||
462 | -#endif | ||
463 | +#endif | ||
464 | psTimingInfo->ui32ActivePowManLatencyms = SYS_SGX_ACTIVE_POWER_LATENCY_MS; | ||
465 | psTimingInfo->ui32uKernelFreq = SYS_SGX_PDS_TIMER_FREQ; | ||
466 | |||
467 | @@ -687,7 +688,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
468 | |||
469 | gpsSysData->ui32NumDevices = SYS_DEVICE_COUNT; | ||
470 | |||
471 | - | ||
472 | + | ||
473 | for(i=0; i<SYS_DEVICE_COUNT; i++) | ||
474 | { | ||
475 | gpsSysData->sDeviceID[i].uiID = i; | ||
476 | @@ -716,7 +717,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
477 | return eError; | ||
478 | } | ||
479 | |||
480 | - | ||
481 | + | ||
482 | eError = PVRSRVRegisterDevice(gpsSysData, SGXRegisterDevice, | ||
483 | DEVICE_SGX_INTERRUPT, &gui32SGXDeviceID); | ||
484 | if (eError != PVRSRV_OK) | ||
485 | @@ -744,7 +745,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
486 | |||
487 | while(psDeviceNode) | ||
488 | { | ||
489 | - | ||
490 | + | ||
491 | switch(psDeviceNode->sDevId.eDeviceType) | ||
492 | { | ||
493 | case PVRSRV_DEVICE_TYPE_SGX: | ||
494 | @@ -752,19 +753,19 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
495 | DEVICE_MEMORY_INFO *psDevMemoryInfo; | ||
496 | DEVICE_MEMORY_HEAP_INFO *psDeviceMemoryHeap; | ||
497 | |||
498 | - | ||
499 | + | ||
500 | psDeviceNode->psLocalDevMemArena = IMG_NULL; | ||
501 | |||
502 | - | ||
503 | + | ||
504 | psDevMemoryInfo = &psDeviceNode->sDevMemoryInfo; | ||
505 | psDeviceMemoryHeap = psDevMemoryInfo->psDeviceMemoryHeap; | ||
506 | |||
507 | - | ||
508 | + | ||
509 | for(i=0; i<psDevMemoryInfo->ui32HeapCount; i++) | ||
510 | { | ||
511 | psDeviceMemoryHeap[i].ui32Attribs |= PVRSRV_BACKINGSTORE_SYSMEM_NONCONTIG; | ||
512 | #ifdef OEM_CUSTOMISE | ||
513 | - | ||
514 | + | ||
515 | #endif | ||
516 | } | ||
517 | |||
518 | @@ -777,19 +778,19 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
519 | DEVICE_MEMORY_INFO *psDevMemoryInfo; | ||
520 | DEVICE_MEMORY_HEAP_INFO *psDeviceMemoryHeap; | ||
521 | |||
522 | - | ||
523 | + | ||
524 | psDeviceNode->psLocalDevMemArena = IMG_NULL; | ||
525 | |||
526 | - | ||
527 | + | ||
528 | psDevMemoryInfo = &psDeviceNode->sDevMemoryInfo; | ||
529 | psDeviceMemoryHeap = psDevMemoryInfo->psDeviceMemoryHeap; | ||
530 | |||
531 | - | ||
532 | + | ||
533 | for(i=0; i<psDevMemoryInfo->ui32HeapCount; i++) | ||
534 | { | ||
535 | psDeviceMemoryHeap[i].ui32Attribs |= PVRSRV_BACKINGSTORE_SYSMEM_NONCONTIG; | ||
536 | #ifdef OEM_CUSTOMISE | ||
537 | - | ||
538 | + | ||
539 | #endif | ||
540 | } | ||
541 | break; | ||
542 | @@ -802,14 +803,14 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
543 | } | ||
544 | } | ||
545 | |||
546 | - | ||
547 | + | ||
548 | psDeviceNode = psDeviceNode->psNext; | ||
549 | } | ||
550 | |||
551 | PDUMPINIT(); | ||
552 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PDUMP_INIT); | ||
553 | |||
554 | - | ||
555 | + | ||
556 | eError = PVRSRVInitialiseDevice (gui32SGXDeviceID); | ||
557 | if (eError != PVRSRV_OK) | ||
558 | { | ||
559 | @@ -843,15 +844,15 @@ static IMG_VOID SysEnableInterrupts(SYS_DATA *psSysData) | ||
560 | IMG_UINT32 ui32Mask; | ||
561 | |||
562 | ui32Mask = THALIA_MASK | MSVDX_MASK; | ||
563 | - | ||
564 | + | ||
565 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG); | ||
566 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG, ui32RegData | ui32Mask); | ||
567 | |||
568 | - | ||
569 | + | ||
570 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG); | ||
571 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG, ui32RegData & (~ui32Mask)); | ||
572 | |||
573 | - | ||
574 | + | ||
575 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
576 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG, ui32RegData | ui32Mask); | ||
577 | |||
578 | @@ -868,11 +869,11 @@ static IMG_VOID SysDisableInterrupts(SYS_DATA *psSysData) | ||
579 | |||
580 | |||
581 | ui32Mask = THALIA_MASK | MSVDX_MASK; | ||
582 | - | ||
583 | + | ||
584 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
585 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG, ui32RegData & (~ui32Mask)); | ||
586 | |||
587 | - | ||
588 | + | ||
589 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG); | ||
590 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG, ui32RegData | ui32Mask); | ||
591 | |||
592 | @@ -916,7 +917,7 @@ PVRSRV_ERROR SysFinalise(IMG_VOID) | ||
593 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_IRQ_ENABLED); | ||
594 | |||
595 | #ifdef __linux__ | ||
596 | - | ||
597 | + | ||
598 | eError = SysCreateVersionString(gpsSysData); | ||
599 | if (eError != PVRSRV_OK) | ||
600 | { | ||
601 | @@ -963,7 +964,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
602 | #if defined(SUPPORT_MSVDX) | ||
603 | if (SYS_SPECIFIC_DATA_TEST(psSysSpecData, SYS_SPECIFIC_DATA_MSVDX_INITIALISED)) | ||
604 | { | ||
605 | - | ||
606 | + | ||
607 | eError = PVRSRVDeinitialiseDevice(gui32MSVDXDeviceID); | ||
608 | if (eError != PVRSRV_OK) | ||
609 | { | ||
610 | @@ -975,7 +976,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
611 | |||
612 | if (SYS_SPECIFIC_DATA_TEST(psSysSpecData, SYS_SPECIFIC_DATA_SGX_INITIALISED)) | ||
613 | { | ||
614 | - | ||
615 | + | ||
616 | eError = PVRSRVDeinitialiseDevice(gui32SGXDeviceID); | ||
617 | if (eError != PVRSRV_OK) | ||
618 | { | ||
619 | @@ -1014,7 +1015,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
620 | #endif | ||
621 | |||
622 | #if !defined(NO_HARDWARE) | ||
623 | - | ||
624 | + | ||
625 | OSUnMapPhysToLin(gsPoulsboRegsCPUVaddr, | ||
626 | REG_SIZE, | ||
627 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
628 | @@ -1049,7 +1050,7 @@ IMG_UINT32 SysGetInterruptSource(SYS_DATA* psSysData, | ||
629 | PVR_UNREFERENCED_PARAMETER(psSysData); | ||
630 | PVR_UNREFERENCED_PARAMETER(psDeviceNode); | ||
631 | |||
632 | - | ||
633 | + | ||
634 | ui32Data = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG); | ||
635 | |||
636 | if (ui32Data & THALIA_MASK) | ||
637 | @@ -1062,11 +1063,11 @@ IMG_UINT32 SysGetInterruptSource(SYS_DATA* psSysData, | ||
638 | ui32Devices |= DEVICE_MSVDX_INTERRUPT; | ||
639 | } | ||
640 | |||
641 | - | ||
642 | + | ||
643 | ui32DIMMask = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
644 | ui32DIMMask &= ~(THALIA_MASK | MSVDX_MASK); | ||
645 | |||
646 | - | ||
647 | + | ||
648 | if (ui32Data & ui32DIMMask) | ||
649 | { | ||
650 | ui32Devices |= DEVICE_DISP_INTERRUPT; | ||
651 | @@ -1123,14 +1124,14 @@ PVRSRV_ERROR SysGetDeviceMemoryMap(PVRSRV_DEVICE_TYPE eDeviceType, | ||
652 | { | ||
653 | case PVRSRV_DEVICE_TYPE_SGX: | ||
654 | { | ||
655 | - | ||
656 | + | ||
657 | *ppvDeviceMap = (IMG_VOID*)&gsSGXDeviceMap; | ||
658 | break; | ||
659 | } | ||
660 | #ifdef SUPPORT_MSVDX | ||
661 | case PVRSRV_DEVICE_TYPE_MSVDX: | ||
662 | { | ||
663 | - | ||
664 | + | ||
665 | *ppvDeviceMap = (IMG_VOID*)&gsMSVDXDeviceMap; | ||
666 | break; | ||
667 | } | ||
668 | @@ -1151,7 +1152,7 @@ IMG_DEV_PHYADDR SysCpuPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, | ||
669 | |||
670 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
671 | |||
672 | - | ||
673 | + | ||
674 | DevPAddr.uiAddr = CpuPAddr.uiAddr; | ||
675 | |||
676 | return DevPAddr; | ||
677 | @@ -1162,7 +1163,7 @@ IMG_CPU_PHYADDR SysSysPAddrToCpuPAddr (IMG_SYS_PHYADDR sys_paddr) | ||
678 | { | ||
679 | IMG_CPU_PHYADDR cpu_paddr; | ||
680 | |||
681 | - | ||
682 | + | ||
683 | cpu_paddr.uiAddr = sys_paddr.uiAddr; | ||
684 | return cpu_paddr; | ||
685 | } | ||
686 | @@ -1171,7 +1172,7 @@ IMG_SYS_PHYADDR SysCpuPAddrToSysPAddr (IMG_CPU_PHYADDR cpu_paddr) | ||
687 | { | ||
688 | IMG_SYS_PHYADDR sys_paddr; | ||
689 | |||
690 | - | ||
691 | + | ||
692 | sys_paddr.uiAddr = cpu_paddr.uiAddr; | ||
693 | return sys_paddr; | ||
694 | } | ||
695 | @@ -1183,7 +1184,7 @@ IMG_DEV_PHYADDR SysSysPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_SYS_P | ||
696 | |||
697 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
698 | |||
699 | - | ||
700 | + | ||
701 | DevPAddr.uiAddr = SysPAddr.uiAddr; | ||
702 | |||
703 | return DevPAddr; | ||
704 | @@ -1196,7 +1197,7 @@ IMG_SYS_PHYADDR SysDevPAddrToSysPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_DEV_P | ||
705 | |||
706 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
707 | |||
708 | - | ||
709 | + | ||
710 | SysPAddr.uiAddr = DevPAddr.uiAddr; | ||
711 | |||
712 | return SysPAddr; | ||
713 | @@ -1255,12 +1256,12 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
714 | { | ||
715 | PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
716 | #if defined(NO_HARDWARE) && defined(__linux__) | ||
717 | - | ||
718 | + | ||
719 | PVR_ASSERT(gsSGXRegsCPUVAddr); | ||
720 | |||
721 | psDevInfo->pvRegsBaseKM = gsSGXRegsCPUVAddr; | ||
722 | -#else | ||
723 | - | ||
724 | +#else | ||
725 | + | ||
726 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS)) | ||
727 | { | ||
728 | psDevInfo->pvRegsBaseKM = OSMapPhysToLin(gsSGXDeviceMap.sRegsCpuPBase, | ||
729 | @@ -1275,7 +1276,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
730 | } | ||
731 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS); | ||
732 | } | ||
733 | -#endif | ||
734 | +#endif | ||
735 | |||
736 | psDevInfo->ui32RegSize = gsSGXDeviceMap.ui32RegsSize; | ||
737 | psDevInfo->sRegsPhysBase = gsSGXDeviceMap.sRegsSysPBase; | ||
738 | @@ -1285,7 +1286,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
739 | { | ||
740 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_HP)) | ||
741 | { | ||
742 | - | ||
743 | + | ||
744 | psDevInfo->pvHostPortBaseKM = OSMapPhysToLin(gsSGXDeviceMap.sHPCpuPBase, | ||
745 | gsSGXDeviceMap.ui32HPSize, | ||
746 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
747 | @@ -1300,7 +1301,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
748 | psDevInfo->ui32HPSize = gsSGXDeviceMap.ui32HPSize; | ||
749 | psDevInfo->sHPSysPAddr = gsSGXDeviceMap.sHPSysPBase; | ||
750 | } | ||
751 | -#endif | ||
752 | +#endif | ||
753 | break; | ||
754 | } | ||
755 | #ifdef SUPPORT_MSVDX | ||
756 | @@ -1308,13 +1309,13 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
757 | { | ||
758 | PVRSRV_MSVDXDEV_INFO *psDevInfo = (PVRSRV_MSVDXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
759 | #if defined(NO_HARDWARE) && defined(__linux__) | ||
760 | - | ||
761 | + | ||
762 | PVR_ASSERT(gsMSVDXRegsCPUVAddr); | ||
763 | psDevInfo->pvRegsBaseKM = gsMSVDXRegsCPUVAddr; | ||
764 | -#else | ||
765 | +#else | ||
766 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS)) | ||
767 | { | ||
768 | - | ||
769 | + | ||
770 | psDevInfo->pvRegsBaseKM = OSMapPhysToLin ( | ||
771 | gsMSVDXDeviceMap.sRegsCpuPBase, | ||
772 | gsMSVDXDeviceMap.ui32RegsSize, | ||
773 | @@ -1327,12 +1328,12 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
774 | } | ||
775 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS); | ||
776 | } | ||
777 | -#endif | ||
778 | +#endif | ||
779 | psDevInfo->ui32RegSize = gsMSVDXDeviceMap.ui32RegsSize; | ||
780 | psDevInfo->sRegsPhysBase = gsMSVDXDeviceMap.sRegsSysPBase; | ||
781 | break; | ||
782 | } | ||
783 | -#endif | ||
784 | +#endif | ||
785 | default: | ||
786 | break; | ||
787 | } | ||
788 | @@ -1357,7 +1358,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
789 | { | ||
790 | PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
791 | #if !(defined(NO_HARDWARE) && defined(__linux__)) | ||
792 | - | ||
793 | + | ||
794 | if (psDevInfo->pvRegsBaseKM) | ||
795 | { | ||
796 | OSUnMapPhysToLin(psDevInfo->pvRegsBaseKM, | ||
797 | @@ -1367,7 +1368,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
798 | |||
799 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS); | ||
800 | } | ||
801 | -#endif | ||
802 | +#endif | ||
803 | |||
804 | psDevInfo->pvRegsBaseKM = IMG_NULL; | ||
805 | psDevInfo->ui32RegSize = 0; | ||
806 | @@ -1376,7 +1377,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
807 | #if defined(SGX_FEATURE_HOST_PORT) | ||
808 | if (gsSGXDeviceMap.ui32Flags & SGX_HOSTPORT_PRESENT) | ||
809 | { | ||
810 | - | ||
811 | + | ||
812 | if (psDevInfo->pvHostPortBaseKM) | ||
813 | { | ||
814 | OSUnMapPhysToLin(psDevInfo->pvHostPortBaseKM, | ||
815 | @@ -1392,7 +1393,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
816 | psDevInfo->ui32HPSize = 0; | ||
817 | psDevInfo->sHPSysPAddr.uiAddr = 0; | ||
818 | } | ||
819 | -#endif | ||
820 | +#endif | ||
821 | break; | ||
822 | } | ||
823 | #ifdef SUPPORT_MSVDX | ||
824 | @@ -1409,13 +1410,13 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
825 | |||
826 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS); | ||
827 | } | ||
828 | -#endif | ||
829 | +#endif | ||
830 | psDevInfo->pvRegsBaseKM = IMG_NULL; | ||
831 | psDevInfo->ui32RegSize = 0; | ||
832 | psDevInfo->sRegsPhysBase.uiAddr = 0; | ||
833 | break; | ||
834 | } | ||
835 | -#endif | ||
836 | +#endif | ||
837 | default: | ||
838 | break; | ||
839 | } | ||
840 | @@ -1423,13 +1424,13 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
841 | } | ||
842 | |||
843 | #if !(defined(NO_HARDWARE) || defined(__linux__)) | ||
844 | - | ||
845 | + | ||
846 | OSUnMapPhysToLin(gsPoulsboRegsCPUVaddr, | ||
847 | REG_SIZE, | ||
848 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
849 | IMG_NULL); | ||
850 | |||
851 | - | ||
852 | + | ||
853 | #if defined(MAP_UNUSED_MAPPINGS) | ||
854 | OSUnMapPhysToLin(gsPoulsboDisplayRegsCPUVaddr, | ||
855 | DISPLAY_REG_SIZE, | ||
856 | @@ -1437,7 +1438,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
857 | IMG_NULL); | ||
858 | #endif | ||
859 | |||
860 | -#endif | ||
861 | +#endif | ||
862 | |||
863 | #if defined(NO_HARDWARE) | ||
864 | #ifdef SUPPORT_MSVDX | ||
865 | @@ -1462,7 +1463,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
866 | |||
867 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_ALLOC_DUMMY_SGX_REGS); | ||
868 | } | ||
869 | -#endif | ||
870 | +#endif | ||
871 | |||
872 | return PVRSRV_OK; | ||
873 | } | ||
874 | @@ -1477,7 +1478,7 @@ PVRSRV_ERROR SysSystemPrePowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
875 | if ((eNewPowerState == PVRSRV_SYS_POWER_STATE_D3) && | ||
876 | (gpsSysData->eCurrentPowerState < PVRSRV_SYS_POWER_STATE_D3)) | ||
877 | { | ||
878 | - | ||
879 | + | ||
880 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_IRQ_ENABLED)) | ||
881 | { | ||
882 | SysDisableInterrupts(gpsSysData); | ||
883 | @@ -1497,9 +1498,9 @@ PVRSRV_ERROR SysSystemPrePowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
884 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNINSTALL_LISR); | ||
885 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_LISR_INSTALLED); | ||
886 | } | ||
887 | -#endif | ||
888 | +#endif | ||
889 | + | ||
890 | |||
891 | - | ||
892 | SysUnmapRegisters(); | ||
893 | #ifdef __linux__ | ||
894 | eError = OSPCISuspendDev(gsSysSpecificData.hSGXPCI); | ||
895 | @@ -1530,7 +1531,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
896 | PVR_DPF((PVR_DBG_ERROR,"SysSystemPostPowerState: OSPCIResumeDev failed (%d)", eError)); | ||
897 | } | ||
898 | #endif | ||
899 | - | ||
900 | + | ||
901 | |||
902 | |||
903 | eError = SysLocateDevices(gpsSysData); | ||
904 | @@ -1540,7 +1541,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
905 | return eError; | ||
906 | } | ||
907 | |||
908 | - | ||
909 | + | ||
910 | eError = SysMapInRegisters(); | ||
911 | if (eError != PVRSRV_OK) | ||
912 | { | ||
913 | @@ -1559,7 +1560,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
914 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_LISR_INSTALLED); | ||
915 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNINSTALL_LISR); | ||
916 | } | ||
917 | -#endif | ||
918 | +#endif | ||
919 | |||
920 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_IRQ_DISABLE)) | ||
921 | { | ||
922 | @@ -1606,7 +1607,3 @@ PVRSRV_ERROR SysDevicePostPowerState(IMG_UINT32 ui32DeviceIndex, | ||
923 | |||
924 | return PVRSRV_OK; | ||
925 | } | ||
926 | - | ||
927 | - | ||
928 | - | ||
929 | - | ||
930 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
931 | index 0737aaf..63a1c96 100644 | ||
932 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
933 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
934 | @@ -1,35 +1,36 @@ | ||
935 | /* -*- syscommon-c -*- | ||
936 | -*----------------------------------------------------------------------------- | ||
937 | -* Filename: syscommon.c | ||
938 | -* $Revision: 1.2 $ | ||
939 | -*----------------------------------------------------------------------------- | ||
940 | -* INTEL CONFIDENTIAL | ||
941 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
942 | -* The source code contained or described herein and all documents related to | ||
943 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
944 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
945 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
946 | -* and confidential information of Intel or its suppliers and licensors. The | ||
947 | -* Material is protected by worldwide copyright and trade secret laws and | ||
948 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
949 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
950 | -* disclosed in any way without Intel's prior express written permission. | ||
951 | -* | ||
952 | -* No license under any patent, copyright, trade secret or other intellectual | ||
953 | -* property right is granted to or conferred upon you by disclosure or | ||
954 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
955 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
956 | -* must be express and approved by Intel in writing. | ||
957 | -* | ||
958 | -* | ||
959 | -*----------------------------------------------------------------------------- | ||
960 | -* Description: platform detection, and sharing of correct platform interface. | ||
961 | -* | ||
962 | -*----------------------------------------------------------------------------- | ||
963 | -* Authors: | ||
964 | -* Marcin Tomczyk | ||
965 | -*----------------------------------------------------------------------------- | ||
966 | -*/ | ||
967 | + *----------------------------------------------------------------------------- | ||
968 | + * Filename: syscommon.c | ||
969 | + * $Revision: 1.3 $ | ||
970 | + *----------------------------------------------------------------------------- | ||
971 | + * Copyright © 2002-2010, Intel Corporation. | ||
972 | + * | ||
973 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
974 | + * of this software and associated documentation files (the "Software"), to deal | ||
975 | + * in the Software without restriction, including without limitation the rights | ||
976 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
977 | + * copies of the Software, and to permit persons to whom the Software is | ||
978 | + * furnished to do so, subject to the following conditions: | ||
979 | + * | ||
980 | + * The above copyright notice and this permission notice shall be included in | ||
981 | + * all copies or substantial portions of the Software. | ||
982 | + * | ||
983 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
984 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
985 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
986 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
987 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
988 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
989 | + * THE SOFTWARE. | ||
990 | + * | ||
991 | + *----------------------------------------------------------------------------- | ||
992 | + * Description: platform detection, and sharing of correct platform interface. | ||
993 | + * | ||
994 | + *----------------------------------------------------------------------------- | ||
995 | + * Authors: | ||
996 | + * Marcin Tomczyk | ||
997 | + *----------------------------------------------------------------------------- | ||
998 | + */ | ||
999 | |||
1000 | #include "sysconfig.h" | ||
1001 | #include "sysplb.h" | ||
1002 | @@ -47,4 +48,3 @@ SYS_PLATFORM_INTERFACE gpsSysPlatformInterfacePlb = { | ||
1003 | SYS_SGX_CLOCK_SPEED_PLB, | ||
1004 | SYS_SGX_ACTIVE_POWER_LATENCY_MS_PLB | ||
1005 | }; | ||
1006 | - | ||
1007 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1008 | index 5b94861..e4d9426 100644 | ||
1009 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1010 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1011 | @@ -1,35 +1,36 @@ | ||
1012 | /* -*- syscommon-c -*- | ||
1013 | -*----------------------------------------------------------------------------- | ||
1014 | -* Filename: syscommon.c | ||
1015 | -* $Revision: 1.2 $ | ||
1016 | -*----------------------------------------------------------------------------- | ||
1017 | -* INTEL CONFIDENTIAL | ||
1018 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
1019 | -* The source code contained or described herein and all documents related to | ||
1020 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
1021 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
1022 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
1023 | -* and confidential information of Intel or its suppliers and licensors. The | ||
1024 | -* Material is protected by worldwide copyright and trade secret laws and | ||
1025 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
1026 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
1027 | -* disclosed in any way without Intel's prior express written permission. | ||
1028 | -* | ||
1029 | -* No license under any patent, copyright, trade secret or other intellectual | ||
1030 | -* property right is granted to or conferred upon you by disclosure or | ||
1031 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
1032 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
1033 | -* must be express and approved by Intel in writing. | ||
1034 | -* | ||
1035 | -* | ||
1036 | -*----------------------------------------------------------------------------- | ||
1037 | -* Description: platform detection, and sharing of correct platform interface. | ||
1038 | -* | ||
1039 | -*----------------------------------------------------------------------------- | ||
1040 | -* Authors: | ||
1041 | -* Marcin Tomczyk | ||
1042 | -*----------------------------------------------------------------------------- | ||
1043 | -*/ | ||
1044 | + *----------------------------------------------------------------------------- | ||
1045 | + * Filename: syscommon.c | ||
1046 | + * $Revision: 1.3 $ | ||
1047 | + *----------------------------------------------------------------------------- | ||
1048 | + * Copyright © 2002-2010, Intel Corporation. | ||
1049 | + * | ||
1050 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
1051 | + * of this software and associated documentation files (the "Software"), to deal | ||
1052 | + * in the Software without restriction, including without limitation the rights | ||
1053 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
1054 | + * copies of the Software, and to permit persons to whom the Software is | ||
1055 | + * furnished to do so, subject to the following conditions: | ||
1056 | + * | ||
1057 | + * The above copyright notice and this permission notice shall be included in | ||
1058 | + * all copies or substantial portions of the Software. | ||
1059 | + * | ||
1060 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
1061 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
1062 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
1063 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
1064 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
1065 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
1066 | + * THE SOFTWARE. | ||
1067 | + * | ||
1068 | + *----------------------------------------------------------------------------- | ||
1069 | + * Description: platform detection, and sharing of correct platform interface. | ||
1070 | + * | ||
1071 | + *----------------------------------------------------------------------------- | ||
1072 | + * Authors: | ||
1073 | + * Marcin Tomczyk | ||
1074 | + *----------------------------------------------------------------------------- | ||
1075 | + */ | ||
1076 | |||
1077 | #include "sysconfig.h" | ||
1078 | #include "systnc.h" | ||
1079 | @@ -47,4 +48,3 @@ SYS_PLATFORM_INTERFACE gpsSysPlatformInterfaceTnc = { | ||
1080 | SYS_SGX_CLOCK_SPEED_TNC, | ||
1081 | SYS_SGX_ACTIVE_POWER_LATENCY_MS_TNC | ||
1082 | }; | ||
1083 | - | ||
1084 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1085 | index 3f26d4c..7d5c2d6 100644 | ||
1086 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1087 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1088 | @@ -1,40 +1,32 @@ | ||
1089 | /********************************************************************** | ||
1090 | - * | ||
1091 | - * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. | ||
1092 | - * | ||
1093 | - * This program is free software; you can redistribute it and/or modify it | ||
1094 | - * under the terms and conditions of the GNU General Public License, | ||
1095 | - * version 2, as published by the Free Software Foundation. | ||
1096 | - * | ||
1097 | - * This program is distributed in the hope it will be useful but, except | ||
1098 | - * as otherwise stated in writing, without any warranty; without even the | ||
1099 | - * implied warranty of merchantability or fitness for a particular purpose. | ||
1100 | - * See the GNU General Public License for more details. | ||
1101 | - * | ||
1102 | - * You should have received a copy of the GNU General Public License along with | ||
1103 | - * this program; if not, write to the Free Software Foundation, Inc., | ||
1104 | - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
1105 | - * | ||
1106 | - * The full GNU General Public License is included in this distribution in | ||
1107 | - * the file called "COPYING". | ||
1108 | - * | ||
1109 | - * Contact Information: | ||
1110 | - * Imagination Technologies Ltd. <gpl-support@imgtec.com> | ||
1111 | - * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK | ||
1112 | - * | ||
1113 | + Copyright (c) Imagination Technologies Ltd. | ||
1114 | + | ||
1115 | + Permission is hereby granted, free of charge, to any person obtaining a copy | ||
1116 | + of this software and associated documentation files (the "Software"), to deal | ||
1117 | + in the Software without restriction, including without limitation the rights | ||
1118 | + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
1119 | + copies of the Software, and to permit persons to whom the Software is | ||
1120 | + furnished to do so, subject to the following conditions: | ||
1121 | + | ||
1122 | + The above copyright notice and this permission notice shall be included in | ||
1123 | + all copies or substantial portions of the Software. | ||
1124 | + | ||
1125 | + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
1126 | + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
1127 | + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
1128 | + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
1129 | + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
1130 | + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
1131 | + THE SOFTWARE. | ||
1132 | ******************************************************************************/ | ||
1133 | -/* INTEL CONFIDENTIAL | ||
1134 | - * Copyright 2010 Intel Corporation All Rights Reserved. | ||
1135 | - */ | ||
1136 | |||
1137 | #ifndef _SYSTNC_H | ||
1138 | #define _SYSTNC_H | ||
1139 | |||
1140 | -#define SYS_SGX_DEV_DEVICE_ID_TNC 0x4108 | ||
1141 | +#define SYS_SGX_DEV_DEVICE_ID_TNC 0x4108 | ||
1142 | #define VS_PRODUCT_NAME_TNC "SGX Atom E6xx" | ||
1143 | #define SGX_REGS_OFFSET_TNC 0x80000 | ||
1144 | #define MSVDX_REGS_OFFSET_TNC 0x90000 | ||
1145 | #define SYS_SGX_CLOCK_SPEED_TNC (400000000) | ||
1146 | #define SYS_SGX_ACTIVE_POWER_LATENCY_MS_TNC (50) | ||
1147 | #endif | ||
1148 | - | ||
1149 | -- | ||
1150 | 1.7.0.4 | ||
1151 | |||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend index 4136536f..bb86798e 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend | |||
@@ -5,3 +5,5 @@ KMACHINE_crownbay = "crownbay" | |||
5 | 5 | ||
6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
7 | KMACHINE_crownbay-noemgd = "crownbay" | 7 | KMACHINE_crownbay-noemgd = "crownbay" |
8 | |||
9 | SRC_URI += "file://0001-crownbay-update-a-handful-of-EMGD-licenses.patch" | ||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto/0001-crownbay-update-a-handful-of-EMGD-licenses.patch b/meta-crownbay/recipes-kernel/linux/linux-yocto/0001-crownbay-update-a-handful-of-EMGD-licenses.patch new file mode 100644 index 00000000..6b0fec93 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto/0001-crownbay-update-a-handful-of-EMGD-licenses.patch | |||
@@ -0,0 +1,1151 @@ | |||
1 | From dfec29236dd9ae7899b9a01d768486f439651af3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Zanussi <tom.zanussi@intel.com> | ||
3 | Date: Thu, 17 Mar 2011 13:03:34 -0500 | ||
4 | Subject: [KERNEL][linux-yocto][PATCH 1/1] crownbay: update a handful of EMGD licenses | ||
5 | |||
6 | The version of the EMGD driver we use had a few included license | ||
7 | mistakes. Correct these as per upstream. | ||
8 | |||
9 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
10 | --- | ||
11 | drivers/gpu/drm/emgd/emgd/pal/Makefile.include | 39 ++-- | ||
12 | .../emgd/pvr/services4/system/common/sysconfig.c | 287 ++++++++++---------- | ||
13 | .../drm/emgd/pvr/services4/system/plb/sysconfig.c | 64 +++--- | ||
14 | .../drm/emgd/pvr/services4/system/tnc/sysconfig.c | 64 +++--- | ||
15 | .../gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | 48 ++-- | ||
16 | 5 files changed, 246 insertions(+), 256 deletions(-) | ||
17 | |||
18 | diff --git a/drivers/gpu/drm/emgd/emgd/pal/Makefile.include b/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
19 | index 8143979..91f9afa 100644 | ||
20 | --- a/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
21 | +++ b/drivers/gpu/drm/emgd/emgd/pal/Makefile.include | ||
22 | @@ -1,25 +1,26 @@ | ||
23 | #---------------------------------------------------------------------------- | ||
24 | # Filename: Makefile.include | ||
25 | -# $Revision: 1.1 $ | ||
26 | +# $Revision: 1.2 $ | ||
27 | #---------------------------------------------------------------------------- | ||
28 | -# INTEL CONFIDENTIAL | ||
29 | -# Copyright (2002-2008) Intel Corporation All Rights Reserved. | ||
30 | -# The source code contained or described herein and all documents related to | ||
31 | -# the source code ("Material") are owned by Intel Corporation or its suppliers | ||
32 | -# or licensors. Title to the Material remains with Intel Corporation or its | ||
33 | -# suppliers and licensors. The Material contains trade secrets and proprietary | ||
34 | -# and confidential information of Intel or its suppliers and licensors. The | ||
35 | -# Material is protected by worldwide copyright and trade secret laws and | ||
36 | -# treaty provisions. No part of the Material may be used, copied, reproduced, | ||
37 | -# modified, published, uploaded, posted, transmitted, distributed, or | ||
38 | -# disclosed in any way without Intel's prior express written permission. | ||
39 | -# | ||
40 | -# No license under any patent, copyright, trade secret or other intellectual | ||
41 | -# property right is granted to or conferred upon you by disclosure or | ||
42 | -# delivery of the Materials, either expressly, by implication, inducement, | ||
43 | -# estoppel or otherwise. Any license under such intellectual property rights | ||
44 | -# must be express and approved by Intel in writing. | ||
45 | -# | ||
46 | +# Copyright © 2002-2010, Intel Corporation. | ||
47 | +# | ||
48 | +# Permission is hereby granted, free of charge, to any person obtaining a copy | ||
49 | +# of this software and associated documentation files (the "Software"), to deal | ||
50 | +# in the Software without restriction, including without limitation the rights | ||
51 | +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
52 | +# copies of the Software, and to permit persons to whom the Software is | ||
53 | +# furnished to do so, subject to the following conditions: | ||
54 | +# | ||
55 | +# The above copyright notice and this permission notice shall be included in | ||
56 | +# all copies or substantial portions of the Software. | ||
57 | +# | ||
58 | +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
59 | +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
60 | +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
61 | +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
62 | +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
63 | +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
64 | +# THE SOFTWARE. | ||
65 | #---------------------------------------------------------------------------- | ||
66 | |||
67 | ifeq ($(origin EGD_CFG), undefined) | ||
68 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
69 | index 5037186..4c9946c 100644 | ||
70 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
71 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/common/sysconfig.c | ||
72 | @@ -1,35 +1,36 @@ | ||
73 | /* -*- syscommon-c -*- | ||
74 | -*----------------------------------------------------------------------------- | ||
75 | -* Filename: syscommon.c | ||
76 | -* $Revision: 1.6 $ | ||
77 | -*----------------------------------------------------------------------------- | ||
78 | -* INTEL CONFIDENTIAL | ||
79 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
80 | -* The source code contained or described herein and all documents related to | ||
81 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
82 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
83 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
84 | -* and confidential information of Intel or its suppliers and licensors. The | ||
85 | -* Material is protected by worldwide copyright and trade secret laws and | ||
86 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
87 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
88 | -* disclosed in any way without Intel's prior express written permission. | ||
89 | -* | ||
90 | -* No license under any patent, copyright, trade secret or other intellectual | ||
91 | -* property right is granted to or conferred upon you by disclosure or | ||
92 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
93 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
94 | -* must be express and approved by Intel in writing. | ||
95 | -* | ||
96 | -* | ||
97 | -*----------------------------------------------------------------------------- | ||
98 | -* Description: platform detection, and sharing of correct platform interface. | ||
99 | -* | ||
100 | -*----------------------------------------------------------------------------- | ||
101 | -* Authors: | ||
102 | -* Marcin Tomczyk | ||
103 | -*----------------------------------------------------------------------------- | ||
104 | -*/ | ||
105 | + *----------------------------------------------------------------------------- | ||
106 | + * Filename: syscommon.c | ||
107 | + * $Revision: 1.7 $ | ||
108 | + *----------------------------------------------------------------------------- | ||
109 | + * Copyright © 2002-2010, Intel Corporation. | ||
110 | + * | ||
111 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
112 | + * of this software and associated documentation files (the "Software"), to deal | ||
113 | + * in the Software without restriction, including without limitation the rights | ||
114 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
115 | + * copies of the Software, and to permit persons to whom the Software is | ||
116 | + * furnished to do so, subject to the following conditions: | ||
117 | + * | ||
118 | + * The above copyright notice and this permission notice shall be included in | ||
119 | + * all copies or substantial portions of the Software. | ||
120 | + * | ||
121 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
122 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
123 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
124 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
125 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
126 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
127 | + * THE SOFTWARE. | ||
128 | + * | ||
129 | + *----------------------------------------------------------------------------- | ||
130 | + * Description: platform detection, and sharing of correct platform interface. | ||
131 | + * | ||
132 | + *----------------------------------------------------------------------------- | ||
133 | + * Authors: | ||
134 | + * Marcin Tomczyk | ||
135 | + *----------------------------------------------------------------------------- | ||
136 | + */ | ||
137 | |||
138 | #include <linux/pci.h> | ||
139 | #include "sgxdefs.h" | ||
140 | @@ -124,7 +125,7 @@ IMG_VOID SysPlatformDetect(IMG_VOID) | ||
141 | |||
142 | |||
143 | /* --------------------------------------------------------------------------*/ | ||
144 | -/** | ||
145 | +/** | ||
146 | * @Synopsis Interface for Atom E6xx device | ||
147 | */ | ||
148 | /* ----------------------------------------------------------------------------*/ | ||
149 | @@ -196,14 +197,14 @@ static PVRSRV_ERROR PCIInitDev(SYS_DATA *psSysData) | ||
150 | #if defined(SGX_FEATURE_HOST_PORT) | ||
151 | PVR_TRACE(("Host Port region: %x to %x", OSPCIAddrRangeStart(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX), OSPCIAddrRangeEnd(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX))); | ||
152 | #endif | ||
153 | - | ||
154 | + | ||
155 | if (OSPCIAddrRangeLen(psSysSpecData->hSGXPCI, ADDR_RANGE_INDEX) < MAX_OFFSET) | ||
156 | { | ||
157 | PVR_DPF((PVR_DBG_ERROR,"PCIInitDev: Device memory region isn't big enough")); | ||
158 | return PVRSRV_ERROR_GENERIC; | ||
159 | } | ||
160 | |||
161 | - | ||
162 | + | ||
163 | if (OSPCIRequestAddrRange(psSysSpecData->hSGXPCI, ADDR_RANGE_INDEX) != PVRSRV_OK) | ||
164 | { | ||
165 | PVR_DPF((PVR_DBG_ERROR,"PCIInitDev: Device memory region not available")); | ||
166 | @@ -211,7 +212,7 @@ static PVRSRV_ERROR PCIInitDev(SYS_DATA *psSysData) | ||
167 | } | ||
168 | SYS_SPECIFIC_DATA_SET(psSysSpecData, SYS_SPECIFIC_DATA_PCI_REQUEST_SGX_ADDR_RANGE); | ||
169 | |||
170 | - | ||
171 | + | ||
172 | #if defined(SGX_FEATURE_HOST_PORT) | ||
173 | if (OSPCIRequestAddrRange(psSysSpecData->hSGXPCI, HP_ADDR_RANGE_INDEX) != PVRSRV_OK) | ||
174 | { | ||
175 | @@ -244,31 +245,31 @@ static IMG_VOID PCIDeInitDev(SYS_DATA *psSysData) | ||
176 | OSPCIReleaseDev(psSysSpecData->hSGXPCI); | ||
177 | } | ||
178 | } | ||
179 | -#else | ||
180 | +#else | ||
181 | static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PCICONFIG_SPACE *psPCISpace) | ||
182 | { | ||
183 | IMG_UINT32 ui32BusNum; | ||
184 | IMG_UINT32 ui32DevNum; | ||
185 | IMG_UINT32 ui32VenDevID; | ||
186 | |||
187 | - | ||
188 | + | ||
189 | for (ui32BusNum=0; ui32BusNum < 255; ui32BusNum++) | ||
190 | { | ||
191 | - | ||
192 | + | ||
193 | for (ui32DevNum=0; ui32DevNum < 32; ui32DevNum++) | ||
194 | { | ||
195 | - | ||
196 | + | ||
197 | ui32VenDevID=OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 0); | ||
198 | |||
199 | - | ||
200 | + | ||
201 | if (ui32VenDevID == (IMG_UINT32)((ui16DevID<<16)+ui16VenID)) | ||
202 | { | ||
203 | IMG_UINT32 ui32Idx; | ||
204 | |||
205 | - | ||
206 | + | ||
207 | OSPCIWriteDword(ui32BusNum, ui32DevNum, 0, 4, OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 4) | 0x02); | ||
208 | |||
209 | - | ||
210 | + | ||
211 | for (ui32Idx=0; ui32Idx < 64; ui32Idx++) | ||
212 | { | ||
213 | psPCISpace->u.aui32PCISpace[ui32Idx] = OSPCIReadDword(ui32BusNum, ui32DevNum, 0, ui32Idx*4); | ||
214 | @@ -289,7 +290,7 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
215 | |||
216 | return PVRSRV_ERROR_GENERIC; | ||
217 | } | ||
218 | -#endif | ||
219 | +#endif | ||
220 | |||
221 | static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
222 | { | ||
223 | @@ -339,21 +340,21 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
224 | } | ||
225 | |||
226 | ui32IRQ = (IMG_UINT32)sPCISpace.u.aui8PCISpace[0x3C]; | ||
227 | -#endif | ||
228 | +#endif | ||
229 | + | ||
230 | |||
231 | - | ||
232 | gsSGXDeviceMap.ui32Flags = 0x0; | ||
233 | |||
234 | - | ||
235 | + | ||
236 | #if defined(NO_HARDWARE) | ||
237 | - | ||
238 | + | ||
239 | gsSGXDeviceMap.ui32IRQ = 0; | ||
240 | #else | ||
241 | gsSGXDeviceMap.ui32IRQ = ui32IRQ; | ||
242 | #endif | ||
243 | |||
244 | #if defined(NO_HARDWARE) | ||
245 | - | ||
246 | + | ||
247 | eError = OSBaseAllocContigMemory(SGX_REG_SIZE, | ||
248 | &gsSGXRegsCPUVAddr, | ||
249 | &sCpuPAddr); | ||
250 | @@ -368,29 +369,29 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
251 | OSMemSet(gsSGXRegsCPUVAddr, 0, SGX_REG_SIZE); | ||
252 | |||
253 | #if defined(__linux__) | ||
254 | - | ||
255 | + | ||
256 | gsSGXDeviceMap.pvRegsCpuVBase = gsSGXRegsCPUVAddr; | ||
257 | #else | ||
258 | - | ||
259 | + | ||
260 | gsSGXDeviceMap.pvRegsCpuVBase = IMG_NULL; | ||
261 | #endif | ||
262 | |||
263 | -#else | ||
264 | +#else | ||
265 | gsSGXDeviceMap.sRegsSysPBase.uiAddr = ui32BaseAddr + SGX_REGS_OFFSET; | ||
266 | -#endif | ||
267 | +#endif | ||
268 | + | ||
269 | |||
270 | - | ||
271 | gsSGXDeviceMap.sRegsCpuPBase = SysSysPAddrToCpuPAddr(gsSGXDeviceMap.sRegsSysPBase); | ||
272 | gsSGXDeviceMap.ui32RegsSize = SGX_REG_SIZE; | ||
273 | |||
274 | #if defined(SGX_FEATURE_HOST_PORT) | ||
275 | - | ||
276 | + | ||
277 | gsSGXDeviceMap.ui32Flags = SGX_HOSTPORT_PRESENT; | ||
278 | gsSGXDeviceMap.sHPSysPBase.uiAddr = ui32HostPortAddr; | ||
279 | gsSGXDeviceMap.sHPCpuPBase = SysSysPAddrToCpuPAddr(gsSGXDeviceMap.sHPSysPBase); | ||
280 | gsSGXDeviceMap.ui32HPSize = SYS_SGX_HP_SIZE; | ||
281 | #endif | ||
282 | - | ||
283 | + | ||
284 | |||
285 | |||
286 | |||
287 | @@ -400,7 +401,7 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
288 | gsSGXDeviceMap.ui32LocalMemSize = 0; | ||
289 | |||
290 | #if !defined(NO_HARDWARE) | ||
291 | - | ||
292 | + | ||
293 | { | ||
294 | IMG_SYS_PHYADDR sPoulsboRegsCpuPBase; | ||
295 | |||
296 | @@ -421,10 +422,10 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
297 | #endif | ||
298 | |||
299 | #ifdef SUPPORT_MSVDX | ||
300 | - | ||
301 | + | ||
302 | |||
303 | #if defined(NO_HARDWARE) | ||
304 | - | ||
305 | + | ||
306 | eError = OSBaseAllocContigMemory(MSVDX_REG_SIZE, | ||
307 | &gsMSVDXRegsCPUVAddr, | ||
308 | &sCpuPAddr); | ||
309 | @@ -438,10 +439,10 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
310 | OSMemSet(gsMSVDXRegsCPUVAddr, 0, MSVDX_REG_SIZE); | ||
311 | |||
312 | #if defined(__linux__) | ||
313 | - | ||
314 | + | ||
315 | gsMSVDXDeviceMap.pvRegsCpuVBase = gsMSVDXRegsCPUVAddr; | ||
316 | #else | ||
317 | - | ||
318 | + | ||
319 | gsMSVDXDeviceMap.pvRegsCpuVBase = IMG_NULL; | ||
320 | #endif | ||
321 | #else | ||
322 | @@ -450,7 +451,7 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
323 | gsMSVDXDeviceMap.sRegsSysPBase = SysCpuPAddrToSysPAddr(gsMSVDXDeviceMap.sRegsCpuPBase); | ||
324 | gsMSVDXDeviceMap.ui32RegsSize = MSVDX_REG_SIZE; | ||
325 | |||
326 | - | ||
327 | + | ||
328 | |||
329 | |||
330 | |||
331 | @@ -459,13 +460,13 @@ static PVRSRV_ERROR SysLocateDevices(SYS_DATA *psSysData) | ||
332 | gsMSVDXDeviceMap.sLocalMemCpuPBase.uiAddr = 0; | ||
333 | gsMSVDXDeviceMap.ui32LocalMemSize = 0; | ||
334 | |||
335 | - | ||
336 | + | ||
337 | |||
338 | gsMSVDXDeviceMap.ui32IRQ = ui32IRQ; | ||
339 | |||
340 | -#endif | ||
341 | +#endif | ||
342 | + | ||
343 | |||
344 | - | ||
345 | |||
346 | return PVRSRV_OK; | ||
347 | } | ||
348 | @@ -478,28 +479,28 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
349 | IMG_UINT32 ui32VenDevID; | ||
350 | IMG_UINT32 ui32BarIndex; | ||
351 | |||
352 | - | ||
353 | + | ||
354 | for (ui32BusNum=0; ui32BusNum < 255; ui32BusNum++) | ||
355 | { | ||
356 | - | ||
357 | + | ||
358 | for (ui32DevNum=0; ui32DevNum < 32; ui32DevNum++) | ||
359 | { | ||
360 | - | ||
361 | + | ||
362 | ui32VenDevID=OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 0); | ||
363 | |||
364 | - | ||
365 | + | ||
366 | if (ui32VenDevID == (IMG_UINT32)((ui16DevID<<16)+ui16VenID)) | ||
367 | { | ||
368 | IMG_UINT32 ui32Idx; | ||
369 | |||
370 | - | ||
371 | + | ||
372 | OSPCIWriteDword(ui32BusNum, ui32DevNum, 0, 4, OSPCIReadDword(ui32BusNum, ui32DevNum, 0, 4) | 0x02); | ||
373 | |||
374 | - psPCISpace->ui32BusNum = ui32BusNum; | ||
375 | + psPCISpace->ui32BusNum = ui32BusNum; | ||
376 | psPCISpace->ui32DevNum = ui32DevNum; | ||
377 | psPCISpace->ui32FuncNum = 0; | ||
378 | |||
379 | - | ||
380 | + | ||
381 | for (ui32Idx=0; ui32Idx < 64; ui32Idx++) | ||
382 | { | ||
383 | psPCISpace->u.aui32PCISpace[ui32Idx] = OSPCIReadDword(ui32BusNum, ui32DevNum, 0, ui32Idx*4); | ||
384 | @@ -509,7 +510,7 @@ static PVRSRV_ERROR FindPCIDevice(IMG_UINT16 ui16VenID, IMG_UINT16 ui16DevID, PC | ||
385 | PVR_DPF((PVR_DBG_VERBOSE,"%08X\n",psPCISpace->u.aui32PCISpace[ui32Idx])); | ||
386 | } | ||
387 | } | ||
388 | - | ||
389 | + | ||
390 | for (ui32BarIndex = 0; ui32BarIndex < 6; ui32BarIndex++) | ||
391 | { | ||
392 | GetPCIMemSpaceSize (ui32BusNum, ui32DevNum, ui32BarIndex, &psPCISpace->aui32PCIMemSpaceSize[ui32BarIndex]); | ||
393 | @@ -557,7 +558,7 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
394 | IMG_CHAR *pszVersionString; | ||
395 | |||
396 | #if !defined(NO_HARDWARE) | ||
397 | - | ||
398 | + | ||
399 | { | ||
400 | IMG_VOID *pvSGXRegs; | ||
401 | |||
402 | @@ -571,8 +572,8 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
403 | ui32SGXRevision = OSReadHWReg(pvSGXRegs, EUR_CR_CORE_REVISION); | ||
404 | |||
405 | OSUnMapPhysToLin(pvSGXRegs, | ||
406 | - gsSGXDeviceMap.ui32RegsSize, | ||
407 | - PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
408 | + gsSGXDeviceMap.ui32RegsSize, | ||
409 | + PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
410 | IMG_NULL); | ||
411 | } | ||
412 | else | ||
413 | @@ -609,7 +610,7 @@ static PVRSRV_ERROR SysCreateVersionString(SYS_DATA *psSysData) | ||
414 | ui32MaxStrLen + 1, | ||
415 | pszVersionString, | ||
416 | IMG_NULL); | ||
417 | - | ||
418 | + | ||
419 | return PVRSRV_ERROR_GENERIC; | ||
420 | } | ||
421 | |||
422 | @@ -631,7 +632,7 @@ static IMG_VOID SysFreeVersionString(SYS_DATA *psSysData) | ||
423 | psSysData->pszVersionString = NULL; | ||
424 | } | ||
425 | } | ||
426 | -#endif | ||
427 | +#endif | ||
428 | PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
429 | { | ||
430 | IMG_UINT32 i; | ||
431 | @@ -642,14 +643,14 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
432 | PVR_DPF((PVR_DBG_MESSAGE,"SysInitialise")); | ||
433 | |||
434 | SysPlatformDetect(); | ||
435 | - | ||
436 | + | ||
437 | gpsSysData = &gsSysData; | ||
438 | OSMemSet(gpsSysData, 0, sizeof(SYS_DATA)); | ||
439 | |||
440 | gpsSysData->pvSysSpecificData = &gsSysSpecificData; | ||
441 | gsSysSpecificData.ui32SysSpecificData = 0; | ||
442 | #ifdef LDM_PCI | ||
443 | - | ||
444 | + | ||
445 | PVR_ASSERT(gpsPVRLDMDev != IMG_NULL); | ||
446 | gsSysSpecificData.psPCIDev = gpsPVRLDMDev; | ||
447 | #endif | ||
448 | @@ -663,15 +664,15 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
449 | return eError; | ||
450 | } | ||
451 | |||
452 | - | ||
453 | + | ||
454 | psTimingInfo = &gsSGXDeviceMap.sTimingInfo; | ||
455 | psTimingInfo->ui32CoreClockSpeed = SYS_SGX_CLOCK_SPEED; | ||
456 | psTimingInfo->ui32HWRecoveryFreq = SYS_SGX_HWRECOVERY_TIMEOUT_FREQ; | ||
457 | #if defined(SUPPORT_ACTIVE_POWER_MANAGEMENT) | ||
458 | psTimingInfo->bEnableActivePM = IMG_TRUE; | ||
459 | -#else | ||
460 | +#else | ||
461 | psTimingInfo->bEnableActivePM = IMG_FALSE; | ||
462 | -#endif | ||
463 | +#endif | ||
464 | psTimingInfo->ui32ActivePowManLatencyms = SYS_SGX_ACTIVE_POWER_LATENCY_MS; | ||
465 | psTimingInfo->ui32uKernelFreq = SYS_SGX_PDS_TIMER_FREQ; | ||
466 | |||
467 | @@ -687,7 +688,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
468 | |||
469 | gpsSysData->ui32NumDevices = SYS_DEVICE_COUNT; | ||
470 | |||
471 | - | ||
472 | + | ||
473 | for(i=0; i<SYS_DEVICE_COUNT; i++) | ||
474 | { | ||
475 | gpsSysData->sDeviceID[i].uiID = i; | ||
476 | @@ -716,7 +717,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
477 | return eError; | ||
478 | } | ||
479 | |||
480 | - | ||
481 | + | ||
482 | eError = PVRSRVRegisterDevice(gpsSysData, SGXRegisterDevice, | ||
483 | DEVICE_SGX_INTERRUPT, &gui32SGXDeviceID); | ||
484 | if (eError != PVRSRV_OK) | ||
485 | @@ -744,7 +745,7 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
486 | |||
487 | while(psDeviceNode) | ||
488 | { | ||
489 | - | ||
490 | + | ||
491 | switch(psDeviceNode->sDevId.eDeviceType) | ||
492 | { | ||
493 | case PVRSRV_DEVICE_TYPE_SGX: | ||
494 | @@ -752,19 +753,19 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
495 | DEVICE_MEMORY_INFO *psDevMemoryInfo; | ||
496 | DEVICE_MEMORY_HEAP_INFO *psDeviceMemoryHeap; | ||
497 | |||
498 | - | ||
499 | + | ||
500 | psDeviceNode->psLocalDevMemArena = IMG_NULL; | ||
501 | |||
502 | - | ||
503 | + | ||
504 | psDevMemoryInfo = &psDeviceNode->sDevMemoryInfo; | ||
505 | psDeviceMemoryHeap = psDevMemoryInfo->psDeviceMemoryHeap; | ||
506 | |||
507 | - | ||
508 | + | ||
509 | for(i=0; i<psDevMemoryInfo->ui32HeapCount; i++) | ||
510 | { | ||
511 | psDeviceMemoryHeap[i].ui32Attribs |= PVRSRV_BACKINGSTORE_SYSMEM_NONCONTIG; | ||
512 | #ifdef OEM_CUSTOMISE | ||
513 | - | ||
514 | + | ||
515 | #endif | ||
516 | } | ||
517 | |||
518 | @@ -777,19 +778,19 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
519 | DEVICE_MEMORY_INFO *psDevMemoryInfo; | ||
520 | DEVICE_MEMORY_HEAP_INFO *psDeviceMemoryHeap; | ||
521 | |||
522 | - | ||
523 | + | ||
524 | psDeviceNode->psLocalDevMemArena = IMG_NULL; | ||
525 | |||
526 | - | ||
527 | + | ||
528 | psDevMemoryInfo = &psDeviceNode->sDevMemoryInfo; | ||
529 | psDeviceMemoryHeap = psDevMemoryInfo->psDeviceMemoryHeap; | ||
530 | |||
531 | - | ||
532 | + | ||
533 | for(i=0; i<psDevMemoryInfo->ui32HeapCount; i++) | ||
534 | { | ||
535 | psDeviceMemoryHeap[i].ui32Attribs |= PVRSRV_BACKINGSTORE_SYSMEM_NONCONTIG; | ||
536 | #ifdef OEM_CUSTOMISE | ||
537 | - | ||
538 | + | ||
539 | #endif | ||
540 | } | ||
541 | break; | ||
542 | @@ -802,14 +803,14 @@ PVRSRV_ERROR SysInitialise(IMG_VOID) | ||
543 | } | ||
544 | } | ||
545 | |||
546 | - | ||
547 | + | ||
548 | psDeviceNode = psDeviceNode->psNext; | ||
549 | } | ||
550 | |||
551 | PDUMPINIT(); | ||
552 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PDUMP_INIT); | ||
553 | |||
554 | - | ||
555 | + | ||
556 | eError = PVRSRVInitialiseDevice (gui32SGXDeviceID); | ||
557 | if (eError != PVRSRV_OK) | ||
558 | { | ||
559 | @@ -843,15 +844,15 @@ static IMG_VOID SysEnableInterrupts(SYS_DATA *psSysData) | ||
560 | IMG_UINT32 ui32Mask; | ||
561 | |||
562 | ui32Mask = THALIA_MASK | MSVDX_MASK; | ||
563 | - | ||
564 | + | ||
565 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG); | ||
566 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG, ui32RegData | ui32Mask); | ||
567 | |||
568 | - | ||
569 | + | ||
570 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG); | ||
571 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG, ui32RegData & (~ui32Mask)); | ||
572 | |||
573 | - | ||
574 | + | ||
575 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
576 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG, ui32RegData | ui32Mask); | ||
577 | |||
578 | @@ -868,11 +869,11 @@ static IMG_VOID SysDisableInterrupts(SYS_DATA *psSysData) | ||
579 | |||
580 | |||
581 | ui32Mask = THALIA_MASK | MSVDX_MASK; | ||
582 | - | ||
583 | + | ||
584 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
585 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG, ui32RegData & (~ui32Mask)); | ||
586 | |||
587 | - | ||
588 | + | ||
589 | ui32RegData = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG); | ||
590 | OSWriteHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_MASK_REG, ui32RegData | ui32Mask); | ||
591 | |||
592 | @@ -916,7 +917,7 @@ PVRSRV_ERROR SysFinalise(IMG_VOID) | ||
593 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_IRQ_ENABLED); | ||
594 | |||
595 | #ifdef __linux__ | ||
596 | - | ||
597 | + | ||
598 | eError = SysCreateVersionString(gpsSysData); | ||
599 | if (eError != PVRSRV_OK) | ||
600 | { | ||
601 | @@ -963,7 +964,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
602 | #if defined(SUPPORT_MSVDX) | ||
603 | if (SYS_SPECIFIC_DATA_TEST(psSysSpecData, SYS_SPECIFIC_DATA_MSVDX_INITIALISED)) | ||
604 | { | ||
605 | - | ||
606 | + | ||
607 | eError = PVRSRVDeinitialiseDevice(gui32MSVDXDeviceID); | ||
608 | if (eError != PVRSRV_OK) | ||
609 | { | ||
610 | @@ -975,7 +976,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
611 | |||
612 | if (SYS_SPECIFIC_DATA_TEST(psSysSpecData, SYS_SPECIFIC_DATA_SGX_INITIALISED)) | ||
613 | { | ||
614 | - | ||
615 | + | ||
616 | eError = PVRSRVDeinitialiseDevice(gui32SGXDeviceID); | ||
617 | if (eError != PVRSRV_OK) | ||
618 | { | ||
619 | @@ -1014,7 +1015,7 @@ PVRSRV_ERROR SysDeinitialise (SYS_DATA *psSysData) | ||
620 | #endif | ||
621 | |||
622 | #if !defined(NO_HARDWARE) | ||
623 | - | ||
624 | + | ||
625 | OSUnMapPhysToLin(gsPoulsboRegsCPUVaddr, | ||
626 | REG_SIZE, | ||
627 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
628 | @@ -1049,7 +1050,7 @@ IMG_UINT32 SysGetInterruptSource(SYS_DATA* psSysData, | ||
629 | PVR_UNREFERENCED_PARAMETER(psSysData); | ||
630 | PVR_UNREFERENCED_PARAMETER(psDeviceNode); | ||
631 | |||
632 | - | ||
633 | + | ||
634 | ui32Data = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_IDENTITY_REG); | ||
635 | |||
636 | if (ui32Data & THALIA_MASK) | ||
637 | @@ -1062,11 +1063,11 @@ IMG_UINT32 SysGetInterruptSource(SYS_DATA* psSysData, | ||
638 | ui32Devices |= DEVICE_MSVDX_INTERRUPT; | ||
639 | } | ||
640 | |||
641 | - | ||
642 | + | ||
643 | ui32DIMMask = OSReadHWReg(gsPoulsboRegsCPUVaddr, INTERRUPT_ENABLE_REG); | ||
644 | ui32DIMMask &= ~(THALIA_MASK | MSVDX_MASK); | ||
645 | |||
646 | - | ||
647 | + | ||
648 | if (ui32Data & ui32DIMMask) | ||
649 | { | ||
650 | ui32Devices |= DEVICE_DISP_INTERRUPT; | ||
651 | @@ -1123,14 +1124,14 @@ PVRSRV_ERROR SysGetDeviceMemoryMap(PVRSRV_DEVICE_TYPE eDeviceType, | ||
652 | { | ||
653 | case PVRSRV_DEVICE_TYPE_SGX: | ||
654 | { | ||
655 | - | ||
656 | + | ||
657 | *ppvDeviceMap = (IMG_VOID*)&gsSGXDeviceMap; | ||
658 | break; | ||
659 | } | ||
660 | #ifdef SUPPORT_MSVDX | ||
661 | case PVRSRV_DEVICE_TYPE_MSVDX: | ||
662 | { | ||
663 | - | ||
664 | + | ||
665 | *ppvDeviceMap = (IMG_VOID*)&gsMSVDXDeviceMap; | ||
666 | break; | ||
667 | } | ||
668 | @@ -1151,7 +1152,7 @@ IMG_DEV_PHYADDR SysCpuPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, | ||
669 | |||
670 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
671 | |||
672 | - | ||
673 | + | ||
674 | DevPAddr.uiAddr = CpuPAddr.uiAddr; | ||
675 | |||
676 | return DevPAddr; | ||
677 | @@ -1162,7 +1163,7 @@ IMG_CPU_PHYADDR SysSysPAddrToCpuPAddr (IMG_SYS_PHYADDR sys_paddr) | ||
678 | { | ||
679 | IMG_CPU_PHYADDR cpu_paddr; | ||
680 | |||
681 | - | ||
682 | + | ||
683 | cpu_paddr.uiAddr = sys_paddr.uiAddr; | ||
684 | return cpu_paddr; | ||
685 | } | ||
686 | @@ -1171,7 +1172,7 @@ IMG_SYS_PHYADDR SysCpuPAddrToSysPAddr (IMG_CPU_PHYADDR cpu_paddr) | ||
687 | { | ||
688 | IMG_SYS_PHYADDR sys_paddr; | ||
689 | |||
690 | - | ||
691 | + | ||
692 | sys_paddr.uiAddr = cpu_paddr.uiAddr; | ||
693 | return sys_paddr; | ||
694 | } | ||
695 | @@ -1183,7 +1184,7 @@ IMG_DEV_PHYADDR SysSysPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_SYS_P | ||
696 | |||
697 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
698 | |||
699 | - | ||
700 | + | ||
701 | DevPAddr.uiAddr = SysPAddr.uiAddr; | ||
702 | |||
703 | return DevPAddr; | ||
704 | @@ -1196,7 +1197,7 @@ IMG_SYS_PHYADDR SysDevPAddrToSysPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_DEV_P | ||
705 | |||
706 | PVR_UNREFERENCED_PARAMETER(eDeviceType); | ||
707 | |||
708 | - | ||
709 | + | ||
710 | SysPAddr.uiAddr = DevPAddr.uiAddr; | ||
711 | |||
712 | return SysPAddr; | ||
713 | @@ -1255,12 +1256,12 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
714 | { | ||
715 | PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
716 | #if defined(NO_HARDWARE) && defined(__linux__) | ||
717 | - | ||
718 | + | ||
719 | PVR_ASSERT(gsSGXRegsCPUVAddr); | ||
720 | |||
721 | psDevInfo->pvRegsBaseKM = gsSGXRegsCPUVAddr; | ||
722 | -#else | ||
723 | - | ||
724 | +#else | ||
725 | + | ||
726 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS)) | ||
727 | { | ||
728 | psDevInfo->pvRegsBaseKM = OSMapPhysToLin(gsSGXDeviceMap.sRegsCpuPBase, | ||
729 | @@ -1275,7 +1276,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
730 | } | ||
731 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS); | ||
732 | } | ||
733 | -#endif | ||
734 | +#endif | ||
735 | |||
736 | psDevInfo->ui32RegSize = gsSGXDeviceMap.ui32RegsSize; | ||
737 | psDevInfo->sRegsPhysBase = gsSGXDeviceMap.sRegsSysPBase; | ||
738 | @@ -1285,7 +1286,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
739 | { | ||
740 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_HP)) | ||
741 | { | ||
742 | - | ||
743 | + | ||
744 | psDevInfo->pvHostPortBaseKM = OSMapPhysToLin(gsSGXDeviceMap.sHPCpuPBase, | ||
745 | gsSGXDeviceMap.ui32HPSize, | ||
746 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
747 | @@ -1300,7 +1301,7 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
748 | psDevInfo->ui32HPSize = gsSGXDeviceMap.ui32HPSize; | ||
749 | psDevInfo->sHPSysPAddr = gsSGXDeviceMap.sHPSysPBase; | ||
750 | } | ||
751 | -#endif | ||
752 | +#endif | ||
753 | break; | ||
754 | } | ||
755 | #ifdef SUPPORT_MSVDX | ||
756 | @@ -1308,13 +1309,13 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
757 | { | ||
758 | PVRSRV_MSVDXDEV_INFO *psDevInfo = (PVRSRV_MSVDXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
759 | #if defined(NO_HARDWARE) && defined(__linux__) | ||
760 | - | ||
761 | + | ||
762 | PVR_ASSERT(gsMSVDXRegsCPUVAddr); | ||
763 | psDevInfo->pvRegsBaseKM = gsMSVDXRegsCPUVAddr; | ||
764 | -#else | ||
765 | +#else | ||
766 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS)) | ||
767 | { | ||
768 | - | ||
769 | + | ||
770 | psDevInfo->pvRegsBaseKM = OSMapPhysToLin ( | ||
771 | gsMSVDXDeviceMap.sRegsCpuPBase, | ||
772 | gsMSVDXDeviceMap.ui32RegsSize, | ||
773 | @@ -1327,12 +1328,12 @@ static PVRSRV_ERROR SysMapInRegisters(IMG_VOID) | ||
774 | } | ||
775 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS); | ||
776 | } | ||
777 | -#endif | ||
778 | +#endif | ||
779 | psDevInfo->ui32RegSize = gsMSVDXDeviceMap.ui32RegsSize; | ||
780 | psDevInfo->sRegsPhysBase = gsMSVDXDeviceMap.sRegsSysPBase; | ||
781 | break; | ||
782 | } | ||
783 | -#endif | ||
784 | +#endif | ||
785 | default: | ||
786 | break; | ||
787 | } | ||
788 | @@ -1357,7 +1358,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
789 | { | ||
790 | PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)psDeviceNodeList->pvDevice; | ||
791 | #if !(defined(NO_HARDWARE) && defined(__linux__)) | ||
792 | - | ||
793 | + | ||
794 | if (psDevInfo->pvRegsBaseKM) | ||
795 | { | ||
796 | OSUnMapPhysToLin(psDevInfo->pvRegsBaseKM, | ||
797 | @@ -1367,7 +1368,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
798 | |||
799 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_SGX_REGS); | ||
800 | } | ||
801 | -#endif | ||
802 | +#endif | ||
803 | |||
804 | psDevInfo->pvRegsBaseKM = IMG_NULL; | ||
805 | psDevInfo->ui32RegSize = 0; | ||
806 | @@ -1376,7 +1377,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
807 | #if defined(SGX_FEATURE_HOST_PORT) | ||
808 | if (gsSGXDeviceMap.ui32Flags & SGX_HOSTPORT_PRESENT) | ||
809 | { | ||
810 | - | ||
811 | + | ||
812 | if (psDevInfo->pvHostPortBaseKM) | ||
813 | { | ||
814 | OSUnMapPhysToLin(psDevInfo->pvHostPortBaseKM, | ||
815 | @@ -1392,7 +1393,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
816 | psDevInfo->ui32HPSize = 0; | ||
817 | psDevInfo->sHPSysPAddr.uiAddr = 0; | ||
818 | } | ||
819 | -#endif | ||
820 | +#endif | ||
821 | break; | ||
822 | } | ||
823 | #ifdef SUPPORT_MSVDX | ||
824 | @@ -1409,13 +1410,13 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
825 | |||
826 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNMAP_MSVDX_REGS); | ||
827 | } | ||
828 | -#endif | ||
829 | +#endif | ||
830 | psDevInfo->pvRegsBaseKM = IMG_NULL; | ||
831 | psDevInfo->ui32RegSize = 0; | ||
832 | psDevInfo->sRegsPhysBase.uiAddr = 0; | ||
833 | break; | ||
834 | } | ||
835 | -#endif | ||
836 | +#endif | ||
837 | default: | ||
838 | break; | ||
839 | } | ||
840 | @@ -1423,13 +1424,13 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
841 | } | ||
842 | |||
843 | #if !(defined(NO_HARDWARE) || defined(__linux__)) | ||
844 | - | ||
845 | + | ||
846 | OSUnMapPhysToLin(gsPoulsboRegsCPUVaddr, | ||
847 | REG_SIZE, | ||
848 | PVRSRV_HAP_KERNEL_ONLY|PVRSRV_HAP_UNCACHED, | ||
849 | IMG_NULL); | ||
850 | |||
851 | - | ||
852 | + | ||
853 | #if defined(MAP_UNUSED_MAPPINGS) | ||
854 | OSUnMapPhysToLin(gsPoulsboDisplayRegsCPUVaddr, | ||
855 | DISPLAY_REG_SIZE, | ||
856 | @@ -1437,7 +1438,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
857 | IMG_NULL); | ||
858 | #endif | ||
859 | |||
860 | -#endif | ||
861 | +#endif | ||
862 | |||
863 | #if defined(NO_HARDWARE) | ||
864 | #ifdef SUPPORT_MSVDX | ||
865 | @@ -1462,7 +1463,7 @@ static PVRSRV_ERROR SysUnmapRegisters(IMG_VOID) | ||
866 | |||
867 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_ALLOC_DUMMY_SGX_REGS); | ||
868 | } | ||
869 | -#endif | ||
870 | +#endif | ||
871 | |||
872 | return PVRSRV_OK; | ||
873 | } | ||
874 | @@ -1477,7 +1478,7 @@ PVRSRV_ERROR SysSystemPrePowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
875 | if ((eNewPowerState == PVRSRV_SYS_POWER_STATE_D3) && | ||
876 | (gpsSysData->eCurrentPowerState < PVRSRV_SYS_POWER_STATE_D3)) | ||
877 | { | ||
878 | - | ||
879 | + | ||
880 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_IRQ_ENABLED)) | ||
881 | { | ||
882 | SysDisableInterrupts(gpsSysData); | ||
883 | @@ -1497,9 +1498,9 @@ PVRSRV_ERROR SysSystemPrePowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
884 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNINSTALL_LISR); | ||
885 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_LISR_INSTALLED); | ||
886 | } | ||
887 | -#endif | ||
888 | +#endif | ||
889 | + | ||
890 | |||
891 | - | ||
892 | SysUnmapRegisters(); | ||
893 | #ifdef __linux__ | ||
894 | eError = OSPCISuspendDev(gsSysSpecificData.hSGXPCI); | ||
895 | @@ -1530,7 +1531,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
896 | PVR_DPF((PVR_DBG_ERROR,"SysSystemPostPowerState: OSPCIResumeDev failed (%d)", eError)); | ||
897 | } | ||
898 | #endif | ||
899 | - | ||
900 | + | ||
901 | |||
902 | |||
903 | eError = SysLocateDevices(gpsSysData); | ||
904 | @@ -1540,7 +1541,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
905 | return eError; | ||
906 | } | ||
907 | |||
908 | - | ||
909 | + | ||
910 | eError = SysMapInRegisters(); | ||
911 | if (eError != PVRSRV_OK) | ||
912 | { | ||
913 | @@ -1559,7 +1560,7 @@ PVRSRV_ERROR SysSystemPostPowerState(PVRSRV_SYS_POWER_STATE eNewPowerState) | ||
914 | SYS_SPECIFIC_DATA_SET(&gsSysSpecificData, SYS_SPECIFIC_DATA_LISR_INSTALLED); | ||
915 | SYS_SPECIFIC_DATA_CLEAR(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_UNINSTALL_LISR); | ||
916 | } | ||
917 | -#endif | ||
918 | +#endif | ||
919 | |||
920 | if (SYS_SPECIFIC_DATA_TEST(&gsSysSpecificData, SYS_SPECIFIC_DATA_PM_IRQ_DISABLE)) | ||
921 | { | ||
922 | @@ -1606,7 +1607,3 @@ PVRSRV_ERROR SysDevicePostPowerState(IMG_UINT32 ui32DeviceIndex, | ||
923 | |||
924 | return PVRSRV_OK; | ||
925 | } | ||
926 | - | ||
927 | - | ||
928 | - | ||
929 | - | ||
930 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
931 | index 0737aaf..63a1c96 100644 | ||
932 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
933 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/plb/sysconfig.c | ||
934 | @@ -1,35 +1,36 @@ | ||
935 | /* -*- syscommon-c -*- | ||
936 | -*----------------------------------------------------------------------------- | ||
937 | -* Filename: syscommon.c | ||
938 | -* $Revision: 1.2 $ | ||
939 | -*----------------------------------------------------------------------------- | ||
940 | -* INTEL CONFIDENTIAL | ||
941 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
942 | -* The source code contained or described herein and all documents related to | ||
943 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
944 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
945 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
946 | -* and confidential information of Intel or its suppliers and licensors. The | ||
947 | -* Material is protected by worldwide copyright and trade secret laws and | ||
948 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
949 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
950 | -* disclosed in any way without Intel's prior express written permission. | ||
951 | -* | ||
952 | -* No license under any patent, copyright, trade secret or other intellectual | ||
953 | -* property right is granted to or conferred upon you by disclosure or | ||
954 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
955 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
956 | -* must be express and approved by Intel in writing. | ||
957 | -* | ||
958 | -* | ||
959 | -*----------------------------------------------------------------------------- | ||
960 | -* Description: platform detection, and sharing of correct platform interface. | ||
961 | -* | ||
962 | -*----------------------------------------------------------------------------- | ||
963 | -* Authors: | ||
964 | -* Marcin Tomczyk | ||
965 | -*----------------------------------------------------------------------------- | ||
966 | -*/ | ||
967 | + *----------------------------------------------------------------------------- | ||
968 | + * Filename: syscommon.c | ||
969 | + * $Revision: 1.3 $ | ||
970 | + *----------------------------------------------------------------------------- | ||
971 | + * Copyright © 2002-2010, Intel Corporation. | ||
972 | + * | ||
973 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
974 | + * of this software and associated documentation files (the "Software"), to deal | ||
975 | + * in the Software without restriction, including without limitation the rights | ||
976 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
977 | + * copies of the Software, and to permit persons to whom the Software is | ||
978 | + * furnished to do so, subject to the following conditions: | ||
979 | + * | ||
980 | + * The above copyright notice and this permission notice shall be included in | ||
981 | + * all copies or substantial portions of the Software. | ||
982 | + * | ||
983 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
984 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
985 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
986 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
987 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
988 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
989 | + * THE SOFTWARE. | ||
990 | + * | ||
991 | + *----------------------------------------------------------------------------- | ||
992 | + * Description: platform detection, and sharing of correct platform interface. | ||
993 | + * | ||
994 | + *----------------------------------------------------------------------------- | ||
995 | + * Authors: | ||
996 | + * Marcin Tomczyk | ||
997 | + *----------------------------------------------------------------------------- | ||
998 | + */ | ||
999 | |||
1000 | #include "sysconfig.h" | ||
1001 | #include "sysplb.h" | ||
1002 | @@ -47,4 +48,3 @@ SYS_PLATFORM_INTERFACE gpsSysPlatformInterfacePlb = { | ||
1003 | SYS_SGX_CLOCK_SPEED_PLB, | ||
1004 | SYS_SGX_ACTIVE_POWER_LATENCY_MS_PLB | ||
1005 | }; | ||
1006 | - | ||
1007 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1008 | index 5b94861..e4d9426 100644 | ||
1009 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1010 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/sysconfig.c | ||
1011 | @@ -1,35 +1,36 @@ | ||
1012 | /* -*- syscommon-c -*- | ||
1013 | -*----------------------------------------------------------------------------- | ||
1014 | -* Filename: syscommon.c | ||
1015 | -* $Revision: 1.2 $ | ||
1016 | -*----------------------------------------------------------------------------- | ||
1017 | -* INTEL CONFIDENTIAL | ||
1018 | -* Copyright 2010 Intel Corporation All Rights Reserved. | ||
1019 | -* The source code contained or described herein and all documents related to | ||
1020 | -* the source code ("Material") are owned by Intel Corporation or its suppliers | ||
1021 | -* or licensors. Title to the Material remains with Intel Corporation or its | ||
1022 | -* suppliers and licensors. The Material contains trade secrets and proprietary | ||
1023 | -* and confidential information of Intel or its suppliers and licensors. The | ||
1024 | -* Material is protected by worldwide copyright and trade secret laws and | ||
1025 | -* treaty provisions. No part of the Material may be used, copied, reproduced, | ||
1026 | -* modified, published, uploaded, posted, transmitted, distributed, or | ||
1027 | -* disclosed in any way without Intel's prior express written permission. | ||
1028 | -* | ||
1029 | -* No license under any patent, copyright, trade secret or other intellectual | ||
1030 | -* property right is granted to or conferred upon you by disclosure or | ||
1031 | -* delivery of the Materials, either expressly, by implication, inducement, | ||
1032 | -* estoppel or otherwise. Any license under such intellectual property rights | ||
1033 | -* must be express and approved by Intel in writing. | ||
1034 | -* | ||
1035 | -* | ||
1036 | -*----------------------------------------------------------------------------- | ||
1037 | -* Description: platform detection, and sharing of correct platform interface. | ||
1038 | -* | ||
1039 | -*----------------------------------------------------------------------------- | ||
1040 | -* Authors: | ||
1041 | -* Marcin Tomczyk | ||
1042 | -*----------------------------------------------------------------------------- | ||
1043 | -*/ | ||
1044 | + *----------------------------------------------------------------------------- | ||
1045 | + * Filename: syscommon.c | ||
1046 | + * $Revision: 1.3 $ | ||
1047 | + *----------------------------------------------------------------------------- | ||
1048 | + * Copyright © 2002-2010, Intel Corporation. | ||
1049 | + * | ||
1050 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
1051 | + * of this software and associated documentation files (the "Software"), to deal | ||
1052 | + * in the Software without restriction, including without limitation the rights | ||
1053 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
1054 | + * copies of the Software, and to permit persons to whom the Software is | ||
1055 | + * furnished to do so, subject to the following conditions: | ||
1056 | + * | ||
1057 | + * The above copyright notice and this permission notice shall be included in | ||
1058 | + * all copies or substantial portions of the Software. | ||
1059 | + * | ||
1060 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
1061 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
1062 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
1063 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
1064 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
1065 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
1066 | + * THE SOFTWARE. | ||
1067 | + * | ||
1068 | + *----------------------------------------------------------------------------- | ||
1069 | + * Description: platform detection, and sharing of correct platform interface. | ||
1070 | + * | ||
1071 | + *----------------------------------------------------------------------------- | ||
1072 | + * Authors: | ||
1073 | + * Marcin Tomczyk | ||
1074 | + *----------------------------------------------------------------------------- | ||
1075 | + */ | ||
1076 | |||
1077 | #include "sysconfig.h" | ||
1078 | #include "systnc.h" | ||
1079 | @@ -47,4 +48,3 @@ SYS_PLATFORM_INTERFACE gpsSysPlatformInterfaceTnc = { | ||
1080 | SYS_SGX_CLOCK_SPEED_TNC, | ||
1081 | SYS_SGX_ACTIVE_POWER_LATENCY_MS_TNC | ||
1082 | }; | ||
1083 | - | ||
1084 | diff --git a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1085 | index 3f26d4c..7d5c2d6 100644 | ||
1086 | --- a/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1087 | +++ b/drivers/gpu/drm/emgd/pvr/services4/system/tnc/systnc.h | ||
1088 | @@ -1,40 +1,32 @@ | ||
1089 | /********************************************************************** | ||
1090 | - * | ||
1091 | - * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved. | ||
1092 | - * | ||
1093 | - * This program is free software; you can redistribute it and/or modify it | ||
1094 | - * under the terms and conditions of the GNU General Public License, | ||
1095 | - * version 2, as published by the Free Software Foundation. | ||
1096 | - * | ||
1097 | - * This program is distributed in the hope it will be useful but, except | ||
1098 | - * as otherwise stated in writing, without any warranty; without even the | ||
1099 | - * implied warranty of merchantability or fitness for a particular purpose. | ||
1100 | - * See the GNU General Public License for more details. | ||
1101 | - * | ||
1102 | - * You should have received a copy of the GNU General Public License along with | ||
1103 | - * this program; if not, write to the Free Software Foundation, Inc., | ||
1104 | - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
1105 | - * | ||
1106 | - * The full GNU General Public License is included in this distribution in | ||
1107 | - * the file called "COPYING". | ||
1108 | - * | ||
1109 | - * Contact Information: | ||
1110 | - * Imagination Technologies Ltd. <gpl-support@imgtec.com> | ||
1111 | - * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK | ||
1112 | - * | ||
1113 | + Copyright (c) Imagination Technologies Ltd. | ||
1114 | + | ||
1115 | + Permission is hereby granted, free of charge, to any person obtaining a copy | ||
1116 | + of this software and associated documentation files (the "Software"), to deal | ||
1117 | + in the Software without restriction, including without limitation the rights | ||
1118 | + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
1119 | + copies of the Software, and to permit persons to whom the Software is | ||
1120 | + furnished to do so, subject to the following conditions: | ||
1121 | + | ||
1122 | + The above copyright notice and this permission notice shall be included in | ||
1123 | + all copies or substantial portions of the Software. | ||
1124 | + | ||
1125 | + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
1126 | + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
1127 | + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
1128 | + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
1129 | + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
1130 | + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
1131 | + THE SOFTWARE. | ||
1132 | ******************************************************************************/ | ||
1133 | -/* INTEL CONFIDENTIAL | ||
1134 | - * Copyright 2010 Intel Corporation All Rights Reserved. | ||
1135 | - */ | ||
1136 | |||
1137 | #ifndef _SYSTNC_H | ||
1138 | #define _SYSTNC_H | ||
1139 | |||
1140 | -#define SYS_SGX_DEV_DEVICE_ID_TNC 0x4108 | ||
1141 | +#define SYS_SGX_DEV_DEVICE_ID_TNC 0x4108 | ||
1142 | #define VS_PRODUCT_NAME_TNC "SGX Atom E6xx" | ||
1143 | #define SGX_REGS_OFFSET_TNC 0x80000 | ||
1144 | #define MSVDX_REGS_OFFSET_TNC 0x90000 | ||
1145 | #define SYS_SGX_CLOCK_SPEED_TNC (400000000) | ||
1146 | #define SYS_SGX_ACTIVE_POWER_LATENCY_MS_TNC (50) | ||
1147 | #endif | ||
1148 | - | ||
1149 | -- | ||
1150 | 1.7.0.4 | ||
1151 | |||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend index 32bbd107..5694b5ad 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend | |||
@@ -1,3 +1,5 @@ | |||
1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" |
2 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 2 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
3 | KMACHINE_crownbay = "yocto/standard/crownbay" | 3 | KMACHINE_crownbay = "yocto/standard/crownbay" |
4 | |||
5 | SRC_URI += "file://0001-crownbay-update-a-handful-of-EMGD-licenses.patch" | ||