Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94754c18 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-fixes-2015-05-07' of... 

Merge tag 'drm-amdkfd-fixes-2015-05-07' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

- Add missing initialization of SDMA vm register when creating an SDMA queue
- Don't report local memory size, as we don't support local memory allocation
  yet.
- Allow to unregister process with exisiting queues. Until now we blocked
  it with BUG_ON, which was also an error by itself.

* tag 'drm-amdkfd-fixes-2015-05-07' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Initialize sdma vm when creating sdma queue
  drm/amdkfd: Don't report local memory size
  drm/amdkfd: allow unregister process with queues
parents 7122e505 79b066bd

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+5 −2
Original line number Diff line number Diff line
@@ -430,9 +430,10 @@ static int unregister_process_nocpsch(struct device_queue_manager *dqm, 


	BUG_ON(!dqm || !qpd);



	BUG_ON(!list_empty(&qpd->queues_list));

	pr_debug("In func %s\n", __func__);



	pr_debug("kfd: In func %s\n", __func__);

	pr_debug("qpd->queues_list is %s\n",

			list_empty(&qpd->queues_list) ? "empty" : "not empty");



	retval = 0;

	mutex_lock(&dqm->lock);
@@ -882,6 +883,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)

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+2 −2
Original line number Diff line number Diff line
@@ -728,9 +728,9 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, 
		sysfs_show_32bit_prop(buffer, "max_engine_clk_fcompute",

			dev->gpu->kfd2kgd->get_max_engine_clock_in_mhz(

					dev->gpu->kgd));



		sysfs_show_64bit_prop(buffer, "local_mem_size",

			dev->gpu->kfd2kgd->get_vmem_size(

					dev->gpu->kgd));

				(unsigned long long int) 0);



		sysfs_show_32bit_prop(buffer, "fw_version",

			dev->gpu->kfd2kgd->get_fw_version(