Use GmmResGetAuxSurfaceOffset64 to get Surface Offset

johnmach · web-flow · commit 9d24a199fd7c · 2023-06-02T21:25:54.000+05:30
diff --git a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
@@ -522,7 +522,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE
             {
                 GMM_UNIFIED_AUX_TYPE AuxType = GMM_AUX_CCS;
                 AuxType                      = (UpdateReq->BaseResInfo->GetResFlags().Gpu.Depth && UpdateReq->BaseResInfo->GetResFlags().Gpu.CCS) ? GMM_AUX_ZCS : AuxType;
-                AuxVA                        = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, AuxType);
+                AuxVA                        = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, AuxType);
             }
 
         }
@@ -541,7 +541,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE
                           GMM_AUX_ZCS :
                           AuxType;
 
-                AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, AuxType);
+                AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, AuxType);
 
                 //For UV Packed, Gen12 e2e compr supported formats have 2 planes per surface
                 //Each has distinct Aux surface, Y-plane/UV-plane must be mapped to respective Y/UV Aux surface
@@ -555,7 +555,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE
                     UpdateReq->BaseResInfo->GetOffset(ReqInfo);
                     YPlaneSize = ReqInfo.Render.Offset64;
 
-                    UVAuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, GMM_AUX_UV_CCS);
+                    UVAuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, GMM_AUX_UV_CCS);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE`
`522`	`522`	`{`
`523`	`523`	`GMM_UNIFIED_AUX_TYPE AuxType = GMM_AUX_CCS;`
`524`	`524`	`AuxType = (UpdateReq->BaseResInfo->GetResFlags().Gpu.Depth && UpdateReq->BaseResInfo->GetResFlags().Gpu.CCS) ? GMM_AUX_ZCS : AuxType;`
`525`		`- AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, AuxType);`
	`525`	`+ AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, AuxType);`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`}`
`@@ -541,7 +541,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE`
`541`	`541`	`GMM_AUX_ZCS :`
`542`	`542`	`AuxType;`
`543`	`543`
`544`		`- AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, AuxType);`
	`544`	`+ AuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, AuxType);`
`545`	`545`
`546`	`546`	`//For UV Packed, Gen12 e2e compr supported formats have 2 planes per surface`
`547`	`547`	`//Each has distinct Aux surface, Y-plane/UV-plane must be mapped to respective Y/UV Aux surface`
`@@ -555,7 +555,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE`
`555`	`555`	`UpdateReq->BaseResInfo->GetOffset(ReqInfo);`
`556`	`556`	`YPlaneSize = ReqInfo.Render.Offset64;`
`557`	`557`
`558`		`- UVAuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset(UpdateReq->BaseResInfo, GMM_AUX_UV_CCS);`
	`558`	`+ UVAuxVA = UpdateReq->BaseGpuVA + GmmResGetAuxSurfaceOffset64(UpdateReq->BaseResInfo, GMM_AUX_UV_CCS);`
`559`	`559`	`}`
`560`	`560`	`}`
`561`	`561`