diff options
Diffstat (limited to 'drivers/gpu/pvr/services4/srvkm/hwdefs')
16 files changed, 50 insertions, 86 deletions
diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/mnemedefs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/mnemedefs.h index 83a65f563fb..83a65f563fb 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/mnemedefs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/mnemedefs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/ocpdefs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/ocpdefs.h index 07a64122935..07a64122935 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/ocpdefs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/ocpdefs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx520defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx520defs.h index 80c33638d85..80c33638d85 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx520defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx520defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx530defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx530defs.h index 3223feb7a65..3223feb7a65 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx530defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx530defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx531defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx531defs.h index 3295d890e89..3295d890e89 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx531defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx531defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx535defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx535defs.h index 8039da4a73e..8039da4a73e 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx535defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx535defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx540defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx540defs.h index 47080c71af4..47080c71af4 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx540defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx540defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543_v1.164defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543_v1.164defs.h index 8c8b3531f2d..8c8b3531f2d 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543_v1.164defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543_v1.164defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543defs.h index 0d3568d045c..0d3568d045c 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx543defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx544defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx544defs.h index 79efcbcaf03..79efcbcaf03 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx544defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx544defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx545defs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx545defs.h index c5adee2c0c8..c5adee2c0c8 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx545defs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgx545defs.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxdefs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxdefs.h index ed24647e3c4..ed24647e3c4 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxdefs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxdefs.h 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 diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxfeaturedefs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxfeaturedefs.h index 3e3a1169a39..9efce89ff3f 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxfeaturedefs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxfeaturedefs.h @@ -44,6 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_ADDRESS_SPACE_SIZE					(28)  	#define SGX_FEATURE_NUM_USE_PIPES						(1)  	#define SGX_FEATURE_AUTOCLOCKGATING +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(1)  #else  #if defined(SGX530)  	#define SGX_CORE_FRIENDLY_NAME							"SGX530" @@ -51,6 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_ADDRESS_SPACE_SIZE					(28)  	#define SGX_FEATURE_NUM_USE_PIPES						(2)  	#define SGX_FEATURE_AUTOCLOCKGATING +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(1)  #else  #if defined(SGX531)  	#define SGX_CORE_FRIENDLY_NAME							"SGX531" @@ -59,6 +61,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_NUM_USE_PIPES						(2)  	#define SGX_FEATURE_AUTOCLOCKGATING  	#define SGX_FEATURE_MULTI_EVENT_KICK +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(1)  #else  #if defined(SGX535)  	#define SGX_CORE_FRIENDLY_NAME							"SGX535" @@ -71,6 +74,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_AUTOCLOCKGATING  	#define SUPPORT_SGX_GENERAL_MAPPING_HEAP  	#define SGX_FEATURE_EDM_VERTEX_PDSADDR_FULL_RANGE +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(1)  #else  #if defined(SGX540)  	#define SGX_CORE_FRIENDLY_NAME							"SGX540" @@ -79,6 +83,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_NUM_USE_PIPES						(4)  	#define SGX_FEATURE_AUTOCLOCKGATING  	#define SGX_FEATURE_MULTI_EVENT_KICK +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(1)  #else  #if defined(SGX543)  	#define SGX_CORE_FRIENDLY_NAME							"SGX543" @@ -104,8 +109,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_FEATURE_MASTER_VDM_CONTEXT_SWITCH  		#endif  		#define SGX_FEATURE_SLAVE_VDM_CONTEXT_SWITCH -		#define SGX_FEATURE_SW_ISP_CONTEXT_SWITCH  	#endif +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(4)  #else  #if defined(SGX544)  	#define SGX_CORE_FRIENDLY_NAME							"SGX544" @@ -122,8 +127,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  //	#define SGX_FEATURE_DATA_BREAKPOINTS  //    #define SGX_FEATURE_PERPIPE_BKPT_REGS  //    #define SGX_FEATURE_PERPIPE_BKPT_REGS_NUMPIPES          (2) -//	#define SGX_FEATURE_2D_HARDWARE -//	#define SGX_FEATURE_PTLA +	#if defined(SGX_FEATURE_MP) +		#define SGX_FEATURE_2D_HARDWARE +		#define SGX_FEATURE_PTLA +	#endif  	#define SGX_FEATURE_EXTENDED_PERF_COUNTERS  	#define SGX_FEATURE_EDM_VERTEX_PDSADDR_FULL_RANGE  	#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) @@ -131,8 +138,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_FEATURE_MASTER_VDM_CONTEXT_SWITCH  		#define SGX_FEATURE_SLAVE_VDM_CONTEXT_SWITCH  		#endif -		#define SGX_FEATURE_SW_ISP_CONTEXT_SWITCH  	#endif +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(4)  #else  #if defined(SGX545)  	#define SGX_CORE_FRIENDLY_NAME							"SGX545" @@ -160,9 +167,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  	#define SGX_FEATURE_BIF_WIDE_TILING_AND_4K_ADDRESS  	#define SGX_FEATURE_MULTI_EVENT_KICK  	#define SGX_FEATURE_EDM_VERTEX_PDSADDR_FULL_RANGE -	#if defined(SUPPORT_SGX_LOW_LATENCY_SCHEDULING) -		#define SGX_FEATURE_SW_ISP_CONTEXT_SWITCH -	#endif +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(4)  #else  #if defined(SGX554)  	#define SGX_CORE_FRIENDLY_NAME							"SGX554" @@ -188,8 +193,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  		#define SGX_FEATURE_MASTER_VDM_CONTEXT_SWITCH  		#endif  		#define SGX_FEATURE_SLAVE_VDM_CONTEXT_SWITCH -		#define SGX_FEATURE_SW_ISP_CONTEXT_SWITCH  	#endif +	#define SGX_FEATURE_PT_CACHE_ENTRIES_PER_LINE			(4)  #endif  #endif  #endif diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmmu.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmmu.h index a6a907aecb6..a6a907aecb6 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmmu.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmmu.h diff --git a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmpdefs.h b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmpdefs.h index 4b9649f9f88..a4cd81ec819 100644..100755 --- a/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmpdefs.h +++ b/drivers/gpu/pvr/services4/srvkm/hwdefs/sgxmpdefs.h @@ -65,6 +65,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #define EUR_CR_MASTER_BIF_CTRL_MMU_BYPASS_MASTER_DPM_MASK 0x00080000U  #define EUR_CR_MASTER_BIF_CTRL_MMU_BYPASS_MASTER_DPM_SHIFT 19  #define EUR_CR_MASTER_BIF_CTRL_MMU_BYPASS_MASTER_DPM_SIGNED 0 +/* Register EUR_CR_MASTER_BIF_INT_STAT */ +#define EUR_CR_MASTER_BIF_INT_STAT          0x4C04 +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_REQ_MASK 0x00003FFFU +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_REQ_SHIFT 0 +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_REQ_SIGNED 0 +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_TYPE_MASK 0x00070000U +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_TYPE_SHIFT 16 +#define EUR_CR_MASTER_BIF_INT_STAT_FAULT_TYPE_SIGNED 0 +#define EUR_CR_MASTER_BIF_INT_STAT_FLUSH_COMPLETE_MASK 0x00080000U +#define EUR_CR_MASTER_BIF_INT_STAT_FLUSH_COMPLETE_SHIFT 19 +#define EUR_CR_MASTER_BIF_INT_STAT_FLUSH_COMPLETE_SIGNED 0 +/* Register EUR_CR_MASTER_BIF_FAULT */ +#define EUR_CR_MASTER_BIF_FAULT             0x4C08 +#define EUR_CR_MASTER_BIF_FAULT_CID_MASK    0x0000000FU +#define EUR_CR_MASTER_BIF_FAULT_CID_SHIFT   0 +#define EUR_CR_MASTER_BIF_FAULT_CID_SIGNED  0 +#define EUR_CR_MASTER_BIF_FAULT_SB_MASK     0x000001F0U +#define EUR_CR_MASTER_BIF_FAULT_SB_SHIFT    4 +#define EUR_CR_MASTER_BIF_FAULT_SB_SIGNED   0 +#define EUR_CR_MASTER_BIF_FAULT_ADDR_MASK   0xFFFFF000U +#define EUR_CR_MASTER_BIF_FAULT_ADDR_SHIFT  12 +#define EUR_CR_MASTER_BIF_FAULT_ADDR_SIGNED 0  /* Register EUR_CR_MASTER_BIF_CTRL_INVAL */  #define EUR_CR_MASTER_BIF_CTRL_INVAL        0x4C34  #define EUR_CR_MASTER_BIF_CTRL_INVAL_PTE_MASK 0x00000004U  |