drm/amdkfd: move CoherentHostAccess prop to HSA_CAPABILITY

CoherentHostAccess flag support has moved from HSA_MEMORYPROPERTY
to HSA_CAPABILITY struct. Proper changes have made also at the thunk
to support this change.

CoherentHostAccess: whether or not device memory can be coherently
accessed by the host CPU.

Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
index 6bd6380b0ee08961606d4ac7d117e761c840ad12..8b48c6692007fbbbea21cb819bcc32d8a1b42cc0 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
@@ -54,8 +54,8 @@
 #define HSA_CAP_ASIC_REVISION_SHIFT            22
 #define HSA_CAP_SRAM_EDCSUPPORTED              0x04000000
 #define HSA_CAP_SVMAPI_SUPPORTED               0x08000000
-
-#define HSA_CAP_RESERVED                       0xf00f8000
+#define HSA_CAP_FLAGS_COHERENTHOSTACCESS       0x10000000
+#define HSA_CAP_RESERVED                       0xe00f8000
 
 struct kfd_node_properties {
        uint64_t hive_id;
@@ -101,8 +101,7 @@ struct kfd_node_properties {
 
 #define HSA_MEM_FLAGS_HOT_PLUGGABLE            0x00000001
 #define HSA_MEM_FLAGS_NON_VOLATILE             0x00000002
-#define HSA_MEM_FLAGS_COHERENTHOSTACCESS       0x00000004
-#define HSA_MEM_FLAGS_RESERVED                 0xfffffff8
+#define HSA_MEM_FLAGS_RESERVED                 0xfffffffc
 
 struct kfd_mem_properties {
        struct list_head        list;