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

Commit c59c961c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "This feels larger than I'd like but its for three reasons.

   a) amdkfd finalising the API more, this is a new feature introduced
      last merge window, and I'd prefer to make the tweaks to the API
      before it first gets into a stable release.

   b) radeon regression required splitting an internal API to fix
      properly, so it just changed a few more lines

   c) vmwgfx fix changes a lock from a mutex->spin lock, this is fallout
      from the new sleep checking.

  Otherwise there is just some tda998x fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: Remove rdev->gart.pages_addr array
  drm/radeon: Restore GART table contents after pinning it in VRAM v3
  drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
  drm/amdkfd: Fix bug in call to init_pipelines()
  drm/amdkfd: Fix bug in pipelines initialization
  drm/radeon: Don't increment pipe_id in kgd_init_pipeline
  drm/i2c: tda998x: set the CEC I2C address based on the slave I2C address
  drm/vmwgfx: Replace the hw mutex with a hw spinlock
  drm/amdkfd: Allow user to limit only queues per device
  drm/amdkfd: PQM handle queue creation fault
  drm: tda998x: Fix EDID read timeout on HDMI connect
  drm: tda998x: Protect the page register
parents 59343cd7 5159571c

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

+3 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/slab.h>

#include "kfd_priv.h"

#include "kfd_device_queue_manager.h"

#include "kfd_pm4_headers.h"



#define MQD_SIZE_ALIGNED 768
@@ -169,8 +170,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	kfd->shared_resources = *gpu_resources;



	/* calculate max size of mqds needed for queues */

	size = max_num_of_processes *

		max_num_of_queues_per_process *

	size = max_num_of_queues_per_device *

			kfd->device_info->mqd_size_aligned;



	/* add another 512KB for all other allocations on gart */

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

+76 −2
Original line number Diff line number Diff line
@@ -183,6 +183,13 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm, 


	mutex_lock(&dqm->lock);



	if (dqm->total_queue_count >= max_num_of_queues_per_device) {

		pr_warn("amdkfd: Can't create new usermode queue because %d queues were already created\n",

				dqm->total_queue_count);

		mutex_unlock(&dqm->lock);

		return -EPERM;

	}



	if (list_empty(&qpd->queues_list)) {

		retval = allocate_vmid(dqm, qpd, q);

		if (retval != 0) {
@@ -207,6 +214,14 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm, 
	list_add(&q->list, &qpd->queues_list);

	dqm->queue_count++;



	/*

	 * Unconditionally increment this counter, regardless of the queue's

	 * type or whether the queue is active.

	 */

	dqm->total_queue_count++;

	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



	mutex_unlock(&dqm->lock);

	return 0;

}
@@ -326,6 +341,15 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm, 
	if (list_empty(&qpd->queues_list))

		deallocate_vmid(dqm, qpd, q);

	dqm->queue_count--;



	/*

	 * Unconditionally decrement this counter, regardless of the queue's

	 * type

	 */

	dqm->total_queue_count--;

	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



out:

	mutex_unlock(&dqm->lock);

	return retval;
@@ -541,10 +565,14 @@ static int init_pipelines(struct device_queue_manager *dqm, 


	for (i = 0; i < pipes_num; i++) {

		inx = i + first_pipe;

		/*

		 * HPD buffer on GTT is allocated by amdkfd, no need to waste

		 * space in GTT for pipelines we don't initialize

		 */

		pipe_hpd_addr = dqm->pipelines_addr + i * CIK_HPD_EOP_BYTES;

		pr_debug("kfd: pipeline address %llX\n", pipe_hpd_addr);

		/* = log2(bytes/4)-1 */

		kfd2kgd->init_pipeline(dqm->dev->kgd, i,

		kfd2kgd->init_pipeline(dqm->dev->kgd, inx,

				CIK_HPD_EOP_BYTES_LOG2 - 3, pipe_hpd_addr);

	}
@@ -560,7 +588,7 @@ static int init_scheduler(struct device_queue_manager *dqm) 


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



	retval = init_pipelines(dqm, get_pipes_num(dqm), KFD_DQM_FIRST_PIPE);

	retval = init_pipelines(dqm, get_pipes_num(dqm), get_first_pipe(dqm));

	if (retval != 0)

		return retval;
@@ -752,6 +780,21 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm, 
	pr_debug("kfd: In func %s\n", __func__);



	mutex_lock(&dqm->lock);

	if (dqm->total_queue_count >= max_num_of_queues_per_device) {

		pr_warn("amdkfd: Can't create new kernel queue because %d queues were already created\n",

				dqm->total_queue_count);

		mutex_unlock(&dqm->lock);

		return -EPERM;

	}



	/*

	 * Unconditionally increment this counter, regardless of the queue's

	 * type or whether the queue is active.

	 */

	dqm->total_queue_count++;

	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



	list_add(&kq->list, &qpd->priv_queue_list);

	dqm->queue_count++;

	qpd->is_debug = true;
@@ -775,6 +818,13 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm, 
	dqm->queue_count--;

	qpd->is_debug = false;

	execute_queues_cpsch(dqm, false);

	/*

	 * Unconditionally decrement this counter, regardless of the queue's

	 * type.

	 */

	dqm->total_queue_count++;

	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);

	mutex_unlock(&dqm->lock);

}
@@ -793,6 +843,13 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 


	mutex_lock(&dqm->lock);



	if (dqm->total_queue_count >= max_num_of_queues_per_device) {

		pr_warn("amdkfd: Can't create new usermode queue because %d queues were already created\n",

				dqm->total_queue_count);

		retval = -EPERM;

		goto out;

	}



	mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_CP);

	if (mqd == NULL) {

		mutex_unlock(&dqm->lock);
@@ -810,6 +867,15 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
		retval = execute_queues_cpsch(dqm, false);

	}



	/*

	 * Unconditionally increment this counter, regardless of the queue's

	 * type or whether the queue is active.

	 */

	dqm->total_queue_count++;



	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



out:

	mutex_unlock(&dqm->lock);

	return retval;
@@ -930,6 +996,14 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm, 


	mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);



	/*

	 * Unconditionally decrement this counter, regardless of the queue's

	 * type

	 */

	dqm->total_queue_count--;

	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



	mutex_unlock(&dqm->lock);



	return 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct device_queue_manager { 
	struct list_head	queues;

	unsigned int		processes_count;

	unsigned int		queue_count;

	unsigned int		total_queue_count;

	unsigned int		next_pipe_to_allocate;

	unsigned int		*allocated_queues;

	unsigned int		vmid_bitmap;

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

+8 −19
Original line number Diff line number Diff line
@@ -50,15 +50,10 @@ module_param(sched_policy, int, 0444); 
MODULE_PARM_DESC(sched_policy,

	"Kernel cmdline parameter that defines the amdkfd scheduling policy");



int max_num_of_processes = KFD_MAX_NUM_OF_PROCESSES_DEFAULT;

module_param(max_num_of_processes, int, 0444);

MODULE_PARM_DESC(max_num_of_processes,

	"Kernel cmdline parameter that defines the amdkfd maximum number of supported processes");



int max_num_of_queues_per_process = KFD_MAX_NUM_OF_QUEUES_PER_PROCESS_DEFAULT;

module_param(max_num_of_queues_per_process, int, 0444);

MODULE_PARM_DESC(max_num_of_queues_per_process,

	"Kernel cmdline parameter that defines the amdkfd maximum number of supported queues per process");

int max_num_of_queues_per_device = KFD_MAX_NUM_OF_QUEUES_PER_DEVICE_DEFAULT;

module_param(max_num_of_queues_per_device, int, 0444);

MODULE_PARM_DESC(max_num_of_queues_per_device,

	"Maximum number of supported queues per device (1 = Minimum, 4096 = default)");



bool kgd2kfd_init(unsigned interface_version,

		  const struct kfd2kgd_calls *f2g,
@@ -100,16 +95,10 @@ static int __init kfd_module_init(void) 
	}



	/* Verify module parameters */

	if ((max_num_of_processes < 0) ||

		(max_num_of_processes > KFD_MAX_NUM_OF_PROCESSES)) {

		pr_err("kfd: max_num_of_processes must be between 0 to KFD_MAX_NUM_OF_PROCESSES\n");

		return -1;

	}



	if ((max_num_of_queues_per_process < 0) ||

		(max_num_of_queues_per_process >

			KFD_MAX_NUM_OF_QUEUES_PER_PROCESS)) {

		pr_err("kfd: max_num_of_queues_per_process must be between 0 to KFD_MAX_NUM_OF_QUEUES_PER_PROCESS\n");

	if ((max_num_of_queues_per_device < 0) ||

		(max_num_of_queues_per_device >

			KFD_MAX_NUM_OF_QUEUES_PER_DEVICE)) {

		pr_err("kfd: max_num_of_queues_per_device must be between 0 to KFD_MAX_NUM_OF_QUEUES_PER_DEVICE\n");

		return -1;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static DEFINE_MUTEX(pasid_mutex); 


int kfd_pasid_init(void)

{

	pasid_limit = max_num_of_processes;

	pasid_limit = KFD_MAX_NUM_OF_PROCESSES;



	pasid_bitmap = kcalloc(BITS_TO_LONGS(pasid_limit), sizeof(long), GFP_KERNEL);

	if (!pasid_bitmap)