diff options
Diffstat (limited to 'drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h')
| -rwxr-xr-x[-rw-r--r--] | drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h | 93 | 
1 files changed, 15 insertions, 78 deletions
diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h index 711e356c2d9..52b13bb5766 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxerrata.h @@ -112,11 +112,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_CORE_REV	SGX_CORE_REV_HEAD  	#endif -	#if SGX_CORE_REV == 101 -		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */ -	#else  	#if SGX_CORE_REV == 110  		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */  	#else @@ -126,7 +121,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#error "sgxerrata.h: SGX531 Core Revision unspecified"  	#endif  	#endif -	#endif  	/* signal that the Core Version has a valid definition */  	#define SGX_CORE_DEFINED  #endif @@ -167,19 +161,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_CORE_REV	SGX_CORE_REV_HEAD  	#endif -	#if SGX_CORE_REV == 101 -		#define FIX_HW_BRN_25499/* Workaround in sgx featuredefs */ -		#define FIX_HW_BRN_25503/* Workaround in code (services) */ -		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */ -	#else -	#if SGX_CORE_REV == 110 -		#define FIX_HW_BRN_25503/* Workaround in code (services) */ -		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */ -		#define FIX_HW_BRN_34028/* Workaround in services (srvkm) */ -	#else  	#if SGX_CORE_REV == 120  		#define FIX_HW_BRN_26620/* Workaround in services (srvkm) */  		#define FIX_HW_BRN_28011/* Workaround in services (srvkm) */ @@ -200,8 +181,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#endif  	#endif  	#endif -	#endif -	#endif  	/* signal that the Core Version has a valid definition */  	#define SGX_CORE_DEFINED  #endif @@ -224,9 +203,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */  		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */  		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif  		#define FIX_HW_BRN_31620/* workaround in services */  		#define FIX_HW_BRN_31780/* workaround in uKernel */  		#define FIX_HW_BRN_32044 /* workaround in uKernel, services and client drivers */ @@ -243,9 +219,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.          #define FIX_HW_BRN_31195/* workaround in services */  		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */  		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif  		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */  		#define FIX_HW_BRN_31671/* workaround in uKernel */		   		#define FIX_HW_BRN_31780/* workaround in uKernel */ @@ -260,9 +233,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#else  	#if SGX_CORE_REV == 141  		#define FIX_HW_BRN_29954/* turns off regbank split feature */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif  		#define FIX_HW_BRN_31671 /* workaround in uKernel */   		#define FIX_HW_BRN_31780/* workaround in uKernel */  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) @@ -273,9 +243,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#else  	#if SGX_CORE_REV == 142  		#define FIX_HW_BRN_29954/* turns off regbank split feature */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif  		#define FIX_HW_BRN_31671 /* workaround in uKernel */   		#define FIX_HW_BRN_31780/* workaround in uKernel */  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) @@ -284,32 +251,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */  			/* add BRNs here */  	#else -	#if SGX_CORE_REV == 2111 -		#define FIX_HW_BRN_30982 /* workaround in uKernel and services */ -		#define FIX_HW_BRN_31093/* workaround in services */ -		#define FIX_HW_BRN_31195/* workaround in services */ -		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */ -		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */ -		#define FIX_HW_BRN_31542/* workaround in uKernel and Services */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif -		#define FIX_HW_BRN_31620/* workaround in services */ - 		#define FIX_HW_BRN_31780/* workaround in uKernel */ -		#define FIX_HW_BRN_32044 /* workaround in uKernel, services and client drivers */ -		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */ -		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_33657/* workaround in ukernel*/ -		#endif -		#define FIX_HW_BRN_33920/* workaround in ukernel */ -		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */ -			/* add BRNs here */ -	#else  	#if SGX_CORE_REV == 213  		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */ - 		#if defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ -		#endif  		#define FIX_HW_BRN_31671 /* workaround in uKernel */   		#define FIX_HW_BRN_31780/* workaround in uKernel */  		#define FIX_HW_BRN_32085 /* workaround in services: prefetch fix applied, investigating PT based fix */ @@ -326,17 +269,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#endif  		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */  	#else -	#if SGX_CORE_REV == 302 -		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) -			#define FIX_HW_BRN_33657/* workaround in ukernel*/ -		#endif -	#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */ -	#else  	#if SGX_CORE_REV == 303  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)  			#define FIX_HW_BRN_33657/* workaround in ukernel*/  		#endif -	#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */ +		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */ +		#if defined(SGX_FEATURE_MP) +			#define FIX_HW_BRN_43863 /* Workaround in ukernel */ +		#endif  	#else  	#if SGX_CORE_REV == SGX_CORE_REV_HEAD  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) @@ -352,8 +292,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#endif  	#endif  	#endif -	#endif -	#endif  	/* signal that the Core Version has a valid definition */  	#define SGX_CORE_DEFINED  #endif @@ -372,9 +310,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define FIX_HW_BRN_31195/* workaround in services */  		#define FIX_HW_BRN_31272/* workaround in services (srvclient) and uKernel */  		#define FIX_HW_BRN_31278/* disabled prefetching in MMU */ - 		#if defined(SGX_FEATURE_MP) - 			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ - 		#endif  		#define FIX_HW_BRN_31542 /* workaround in uKernel and Services */   		#define FIX_HW_BRN_31620/* workaround in services */  		#define FIX_HW_BRN_31671 /* workaround in uKernel */ @@ -388,9 +323,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */  	#else	  	#if SGX_CORE_REV == 105 - 		#if defined(SGX_FEATURE_MP) - 			#define FIX_HW_BRN_31559/* workaround in services and uKernel */ - 		#endif   		#define FIX_HW_BRN_31780/* workaround in uKernel */  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)  			#define FIX_HW_BRN_33657/* workaround in ukernel*/ @@ -421,9 +353,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)  			#define FIX_HW_BRN_33657/* workaround in ukernel */  		#endif +		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */ +	#else +	#if SGX_CORE_REV == 117 +		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP) +			#define FIX_HW_BRN_33657/* workaround in ukernel */ +		#endif  		#define FIX_HW_BRN_33809/* workaround in kernel (enable burst combiner) */  		#define FIX_HW_BRN_36513 /* workaround in uKernel and Services */  	#else +	#if SGX_CORE_REV == 118 +		#define FIX_HW_BRN_33920/* workaround in ukernel */ +	#else  	#if SGX_CORE_REV == SGX_CORE_REV_HEAD  		#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) && defined(SGX_FEATURE_MP)  			#define FIX_HW_BRN_33657/* workaround in ukernel*/ @@ -437,6 +378,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#endif  	#endif  	#endif +	#endif +	#endif  	/* signal that the Core Version has a valid definition */  	#define SGX_CORE_DEFINED  #endif @@ -449,11 +392,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_CORE_REV	SGX_CORE_REV_HEAD  	#endif -	#if SGX_CORE_REV == 109 -		#define FIX_HW_BRN_29702/* Workaround in services */ -		#define FIX_HW_BRN_29823/* Workaround in services */ -		#define FIX_HW_BRN_31939/* workaround in uKernel */ -	#else  	#if SGX_CORE_REV == 10131  	#else  	#if SGX_CORE_REV == 1014 @@ -468,7 +406,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#endif  	#endif  	#endif -	#endif  	/* signal that the Core Version has a valid definition */  	#define SGX_CORE_DEFINED  #endif  |