From: Hitesh K. Patel <[email protected]> IMG ED3977 ------------------------------- IPGear 10556 and IPGear 10559: Measdemos - deriv and skinning. IPGear 10555: Mesademos: fbo_firecube. IPGear 110801: OpenGLES 1.1 conformance test mustpass.c fails depth test.
IMG ED3999 ------------------------------- IPGear 10557: OpenGL Mesa "arbocclude" demo does not render correctly. Miscellaneous build data and std header cleanup. Signed-off-by: Ajit Kamat <[email protected]> Signed-off-by: Hitesh K. Patel <[email protected]> --- drivers/staging/mrst/pvr/include4/pvrversion.h | 4 ++-- .../mrst/pvr/services4/srvkm/common/queue.c | 3 --- .../mrst/pvr/services4/srvkm/hwdefs/sgxerrata.h | 7 +++++++ .../tools/intern/debug/dbgdriv/linux/hostfunc.c | 3 ++- .../pvr/tools/intern/debug/dbgdriv/linux/main.c | 9 +++++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/staging/mrst/pvr/include4/pvrversion.h b/drivers/staging/mrst/pvr/include4/pvrversion.h index 6f5ada5..dafdcc0 100644 --- a/drivers/staging/mrst/pvr/include4/pvrversion.h +++ b/drivers/staging/mrst/pvr/include4/pvrversion.h @@ -30,8 +30,8 @@ #define PVRVERSION_MAJ 1 #define PVRVERSION_MIN 6 #define PVRVERSION_BRANCH 16 -#define PVRVERSION_BUILD 3947 -#define PVRVERSION_STRING "1.6.16.3947" +#define PVRVERSION_BUILD 3999 +#define PVRVERSION_STRING "1.6.16.3999" #define PVRVERSION_FILE "eurasiacon.pj" #endif diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/queue.c b/drivers/staging/mrst/pvr/services4/srvkm/common/queue.c index adb4ef9..be028ff 100644 --- a/drivers/staging/mrst/pvr/services4/srvkm/common/queue.c +++ b/drivers/staging/mrst/pvr/services4/srvkm/common/queue.c @@ -822,10 +822,7 @@ PVRSRV_ERROR PVRSRVProcessQueues(IMG_UINT32 ui32CallerID, UPDATE_QUEUE_ROFF(psQueue, psCommand->ui32CmdSize) - if (bFlush) - { continue; - } } break; diff --git a/drivers/staging/mrst/pvr/services4/srvkm/hwdefs/sgxerrata.h b/drivers/staging/mrst/pvr/services4/srvkm/hwdefs/sgxerrata.h index 4d6cc9e..e898939 100644 --- a/drivers/staging/mrst/pvr/services4/srvkm/hwdefs/sgxerrata.h +++ b/drivers/staging/mrst/pvr/services4/srvkm/hwdefs/sgxerrata.h @@ -240,15 +240,22 @@ #endif #if SGX_CORE_REV == 113 + #define FIX_HW_BRN_29997 #define FIX_HW_BRN_30954 + #define FIX_HW_BRN_31093 + #define FIX_HW_BRN_31195 #else #if SGX_CORE_REV == 122 + #define FIX_HW_BRN_29997 #define FIX_HW_BRN_30954 + #define FIX_HW_BRN_31093 + #define FIX_HW_BRN_31195 #else #if SGX_CORE_REV == 140 #define FIX_HW_BRN_30954 + #define FIX_HW_BRN_31195 #else #if SGX_CORE_REV == SGX_CORE_REV_HEAD diff --git a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c index 365f38a..a78f60a 100644 --- a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c +++ b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c @@ -29,6 +29,7 @@ #include <linux/module.h> #include <linux/fs.h> #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/string.h> #include <asm/page.h> @@ -54,7 +55,7 @@ #include "hostfunc.h" #include "dbgdriv.h" -#if defined(DEBUG) && !defined(SUPPORT_DRI_DRM) +#if defined(MODULE) && defined(DEBUG) && !defined(SUPPORT_DRI_DRM) IMG_UINT32 gPVRDebugLevel = (DBGPRIV_FATAL | DBGPRIV_ERROR | DBGPRIV_WARNING); #define PVR_STRING_TERMINATOR '\0' diff --git a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/main.c b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/main.c index 9fadbc4..a3f7abb 100644 --- a/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/main.c +++ b/drivers/staging/mrst/pvr/tools/intern/debug/dbgdriv/linux/main.c @@ -115,7 +115,7 @@ IMG_VOID DBGDrvGetServiceTable(IMG_VOID **fn_table) #if defined(SUPPORT_DRI_DRM) void dbgdrv_cleanup(void) #else -void cleanup_module(void) +static void __exit dbgdrv_cleanup(void) #endif { #if !defined(SUPPORT_DRI_DRM) @@ -135,7 +135,7 @@ void cleanup_module(void) #if defined(SUPPORT_DRI_DRM) IMG_INT dbgdrv_init(void) #else -int init_module(void) +static int __init dbgdrv_init(void) #endif { #if (defined(LDM_PLATFORM) || defined(LDM_PCI)) && !defined(SUPPORT_DRI_DRM) @@ -308,3 +308,8 @@ IMG_VOID DefineHotKey (IMG_UINT32 ui32ScanCode, IMG_UINT32 ui32ShiftState, PHOTK } /*EXPORT_SYMBOL(DBGDrvGetServiceTable); */ + +#if !defined(SUPPORT_DRI_DRM) +subsys_initcall(dbgdrv_init); +module_exit(dbgdrv_cleanup); +#endif -- 1.7.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
