From: Xihan Zhang Date: Tue, 28 Apr 2015 15:48:40 +0000 (+0800) Subject: drm/amdkfd: Initialize sdma vm when creating sdma queue X-Git-Tag: v4.0.4~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac7e07c8a83db4e9744ea976d405981256b1fddf;p=thirdparty%2Fkernel%2Fstable.git drm/amdkfd: Initialize sdma vm when creating sdma queue commit 79b066bd76d501cfe8328142153da301f5ca11d1 upstream. This patch fixes a bug where sdma vm wasn't initialized when an sdma queue was created in HWS mode. This caused GPUVM faults to appear on dmesg and it is one of the causes that SDMA queues are not working. Signed-off-by: Xihan Zhang Reviewed-by: Ben Goz Signed-off-by: Oded Gabbay Reviewed-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- 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 0ebca862683c3..39762a7d2ec7a 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -879,6 +879,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, return -ENOMEM; } + init_sdma_vm(dqm, q, qpd); + retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj, &q->gart_mqd_addr, &q->properties); if (retval != 0)