@@ -46,6 +46,9 @@ AUBCommandStreamReceiverHw<GfxFamily>::AUBCommandStreamReceiverHw(const Hardware
4646 ppgtt = std::make_unique<TypeSelector<PML4, PDPE, sizeof (void *) == 8 >::type>(physicalAddressAllocator);
4747 ggtt = std::make_unique<PDPE>(physicalAddressAllocator);
4848
49+ gttRemap = aubCenter->getAddressMapper ();
50+ UNRECOVERABLE_IF (nullptr == gttRemap);
51+
4952 auto streamProvider = aubCenter->getStreamProvider ();
5053 UNRECOVERABLE_IF (nullptr == streamProvider);
5154
@@ -143,7 +146,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::closeFile() {
143146}
144147
145148template <typename GfxFamily>
146- bool AUBCommandStreamReceiverHw<GfxFamily>::isFileOpen() {
149+ bool AUBCommandStreamReceiverHw<GfxFamily>::isFileOpen() const {
147150 return stream->isOpen ();
148151}
149152
@@ -165,7 +168,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine(EngineType engineTy
165168 const size_t sizeHWSP = 0x1000 ;
166169 const size_t alignHWSP = 0x1000 ;
167170 engineInfo.pGlobalHWStatusPage = alignedMalloc (sizeHWSP, alignHWSP);
168- engineInfo.ggttHWSP = gttRemap. map (engineInfo.pGlobalHWStatusPage , sizeHWSP);
171+ engineInfo.ggttHWSP = gttRemap-> map (engineInfo.pGlobalHWStatusPage , sizeHWSP);
169172
170173 auto physHWSP = ggtt->map (engineInfo.ggttHWSP , sizeHWSP, this ->getGTTBits (), getMemoryBankForGtt ());
171174
@@ -197,7 +200,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine(EngineType engineTy
197200 {
198201 const size_t alignRingBuffer = 0x1000 ;
199202 engineInfo.pRingBuffer = alignedMalloc (engineInfo.sizeRingBuffer , alignRingBuffer);
200- engineInfo.ggttRingBuffer = gttRemap. map (engineInfo.pRingBuffer , engineInfo.sizeRingBuffer );
203+ engineInfo.ggttRingBuffer = gttRemap-> map (engineInfo.pRingBuffer , engineInfo.sizeRingBuffer );
201204 auto physRingBuffer = ggtt->map (engineInfo.ggttRingBuffer , engineInfo.sizeRingBuffer , this ->getGTTBits (), getMemoryBankForGtt ());
202205
203206 {
@@ -225,7 +228,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine(EngineType engineTy
225228
226229 // Write our LRCA
227230 {
228- engineInfo.ggttLRCA = gttRemap. map (engineInfo.pLRCA , sizeLRCA);
231+ engineInfo.ggttLRCA = gttRemap-> map (engineInfo.pLRCA , sizeLRCA);
229232 auto lrcAddressPhys = ggtt->map (engineInfo.ggttLRCA , sizeLRCA, this ->getGTTBits (), getMemoryBankForGtt ());
230233
231234 {
@@ -254,15 +257,15 @@ template <typename GfxFamily>
254257void AUBCommandStreamReceiverHw<GfxFamily>::freeEngineInfoTable() {
255258 for (auto &engineInfo : engineInfoTable) {
256259 alignedFree (engineInfo.pLRCA );
257- gttRemap. unmap (engineInfo.pLRCA );
260+ gttRemap-> unmap (engineInfo.pLRCA );
258261 engineInfo.pLRCA = nullptr ;
259262
260263 alignedFree (engineInfo.pGlobalHWStatusPage );
261- gttRemap. unmap (engineInfo.pGlobalHWStatusPage );
264+ gttRemap-> unmap (engineInfo.pGlobalHWStatusPage );
262265 engineInfo.pGlobalHWStatusPage = nullptr ;
263266
264267 alignedFree (engineInfo.pRingBuffer );
265- gttRemap. unmap (engineInfo.pRingBuffer );
268+ gttRemap-> unmap (engineInfo.pRingBuffer );
266269 engineInfo.pRingBuffer = nullptr ;
267270 }
268271}
0 commit comments