Fix reserved size in shared BOs

Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>

Author: LukaszJobczyk

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -2007,7 +2007,6 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemory
 
     EXPECT_NE(nullptr, graphicsAllocation->getUnderlyingBuffer());
     EXPECT_EQ(size, graphicsAllocation->getUnderlyingBufferSize());
-    EXPECT_EQ(alignUp(size, 2 * MemoryConstants::megaByte), graphicsAllocation->getReservedAddressSize());
     EXPECT_EQ(MemoryPool::SystemCpuInaccessible, graphicsAllocation->getMemoryPool());
     EXPECT_EQ(this->mock->inputFd, static_cast<int32_t>(handle));
 
@@ -2020,6 +2019,7 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemory
     EXPECT_EQ(this->mock->outputHandle, static_cast<uint32_t>(bo->peekHandle()));
     EXPECT_EQ(gpuAddress, bo->peekAddress());
     EXPECT_EQ(size, bo->peekSize());
+    EXPECT_EQ(alignUp(size, 2 * MemoryConstants::megaByte), bo->peekUnmapSize());
 
     EXPECT_EQ(handle, graphicsAllocation->peekSharedHandle());
 

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -580,9 +580,6 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
     auto boHandle = openFd.handle;
     auto bo = findAndReferenceSharedBufferObject(boHandle);
 
-    uint64_t gpuRange = 0llu;
-    size_t reservedRange = 0u;
-
     if (bo == nullptr) {
         size_t size = lseekFunction(handle, 0, SEEK_END);
 
@@ -596,11 +593,10 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
         if (requireSpecificBitness && this->force32bitAllocations) {
             heapIndex = HeapIndex::HEAP_EXTERNAL;
         }
-        gpuRange = acquireGpuRange(size, properties.rootDeviceIndex, heapIndex);
+        auto gpuRange = acquireGpuRange(size, properties.rootDeviceIndex, heapIndex);
 
         bo->setAddress(gpuRange);
         bo->setUnmapSize(size);
-        reservedRange = size;
 
         pushSharedBufferObject(bo);
     }
@@ -609,9 +605,6 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
 
     auto drmAllocation = new DrmAllocation(properties.rootDeviceIndex, properties.allocationType, bo, reinterpret_cast<void *>(bo->gpuAddress), bo->size,
                                            handle, MemoryPool::SystemCpuInaccessible);
-    if (reservedRange) {
-        drmAllocation->setReservedAddressRange(reinterpret_cast<void *>(gpuRange), reservedRange);
-    }
 
     if (requireSpecificBitness && this->force32bitAllocations) {
         drmAllocation->set32BitAllocation(true);