diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index 6eb98503df..7d853be7f6 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -624,8 +624,11 @@ void Device::fillDeviceInfo(
 
     info_.executionCapabilities_     = CL_EXEC_KERNEL;
     if (settings().oclVersion_ >= OpenCL20) {
-        info_.svmCapabilities_       = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER;
-
+        info_.svmCapabilities_       = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER
+                                     | CL_DEVICE_SVM_FINE_GRAIN_BUFFER;
+        if (settings().svmAtomics_) {
+            info_.svmCapabilities_ |= CL_DEVICE_SVM_ATOMICS;
+        }
     }
     info_.preferredPlatformAtomicAlignment_ = 0;
     info_.preferredGlobalAtomicAlignment_ = 0;