drm/amdkfd: Set correct doorbell packet type for Carrizo

Signed-off-by: Ben Goz <ben.goz@amd.com>
Reviewed-by: Yair Shachar <yair.shachar@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index c25728bc388a2be7134cb3e6b895a7a39d4189a2..74909e72a00929c8a87b73c9e25afb633fb50cf4 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1186,6 +1186,11 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
         * TODO: Retrieve max engine clock values from KGD
         */
 
+       if (dev->gpu->device_info->asic_family == CHIP_CARRIZO) {
+               dev->node_props.capability |= HSA_CAP_DOORBELL_PACKET_TYPE;
+               pr_info("amdkfd: adding doorbell packet type capability\n");
+       }
+
        res = 0;
 
 err:

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
index 989624b3cd14841422b004028df7cbda9ee5be86..c3ddb9b95ff8de6a52196f581d9eee1c1ccd3cb0 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
@@ -40,6 +40,7 @@
 #define HSA_CAP_WATCH_POINTS_TOTALBITS_MASK    0x00000f00
 #define HSA_CAP_WATCH_POINTS_TOTALBITS_SHIFT   8
 #define HSA_CAP_RESERVED                       0xfffff000
+#define HSA_CAP_DOORBELL_PACKET_TYPE           0x00001000
 
 struct kfd_node_properties {
        uint32_t cpu_cores_count;