From 2c731a6a38093f13729ded3e95a4d3da4d2f9ccd Mon Sep 17 00:00:00 2001 From: Oak Zeng Date: Fri, 31 May 2019 15:07:42 -0500 Subject: [PATCH 2796/2940] drm/amdkfd: Only initialize sdma vm for sdma queues Don't do the same for compute queues Change-Id: Icf785f2ab1a6be8da3197c8de2c291d7b12f67b3 Signed-off-by: Oak Zeng Reviewed-by: Felix Kuehling --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 497d449fc6d0..1b95be774e74 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -1288,7 +1288,9 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, */ q->properties.is_evicted = !!qpd->evicted; q->properties.is_suspended = false; - dqm->asic_ops.init_sdma_vm(dqm, q, qpd); + if (q->properties.type == KFD_QUEUE_TYPE_SDMA || + q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI) + dqm->asic_ops.init_sdma_vm(dqm, q, qpd); q->properties.tba_addr = qpd->tba_addr; q->properties.tma_addr = qpd->tma_addr; retval = mqd_mgr->init_mqd(mqd_mgr, &q->mqd, &q->mqd_mem_obj, -- 2.17.1