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

Commit bdf800c6 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



- Fix an ordering issue in DC with respect to atomic flips that could result
  in a crash
- Fix incorrect use of process->mm in KFD

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1538668374-22334-1-git-send-email-alexander.deucher@amd.com
parents 3a9df1e9 11b29c9e

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

+29 −8
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm, 
					struct queue *q,

					struct qcm_process_device *qpd)

{

	int retval;

	struct mqd_manager *mqd_mgr;

	int retval;



	mqd_mgr = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);

	if (!mqd_mgr)
@@ -387,8 +387,12 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm, 
	if (!q->properties.is_active)

		return 0;



	if (WARN(q->process->mm != current->mm,

		 "should only run in user thread"))

		retval = -EFAULT;

	else

		retval = mqd_mgr->load_mqd(mqd_mgr, q->mqd, q->pipe, q->queue,

			&q->properties, q->process->mm);

					   &q->properties, current->mm);

	if (retval)

		goto out_uninit_mqd;
@@ -545,9 +549,15 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q) 
		retval = map_queues_cpsch(dqm);

	else if (q->properties.is_active &&

		 (q->properties.type == KFD_QUEUE_TYPE_COMPUTE ||

		  q->properties.type == KFD_QUEUE_TYPE_SDMA))

		retval = mqd_mgr->load_mqd(mqd_mgr, q->mqd, q->pipe, q->queue,

				       &q->properties, q->process->mm);

		  q->properties.type == KFD_QUEUE_TYPE_SDMA)) {

		if (WARN(q->process->mm != current->mm,

			 "should only run in user thread"))

			retval = -EFAULT;

		else

			retval = mqd_mgr->load_mqd(mqd_mgr, q->mqd,

						   q->pipe, q->queue,

						   &q->properties, current->mm);

	}



out_unlock:

	dqm_unlock(dqm);
@@ -653,6 +663,7 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm, 
static int restore_process_queues_nocpsch(struct device_queue_manager *dqm,

					  struct qcm_process_device *qpd)

{

	struct mm_struct *mm = NULL;

	struct queue *q;

	struct mqd_manager *mqd_mgr;

	struct kfd_process_device *pdd;
@@ -686,6 +697,15 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, 
		kfd_flush_tlb(pdd);

	}



	/* Take a safe reference to the mm_struct, which may otherwise

	 * disappear even while the kfd_process is still referenced.

	 */

	mm = get_task_mm(pdd->process->lead_thread);

	if (!mm) {

		retval = -EFAULT;

		goto out;

	}



	/* activate all active queues on the qpd */

	list_for_each_entry(q, &qpd->queues_list, list) {

		if (!q->properties.is_evicted)
@@ -700,14 +720,15 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, 
		q->properties.is_evicted = false;

		q->properties.is_active = true;

		retval = mqd_mgr->load_mqd(mqd_mgr, q->mqd, q->pipe,

				       q->queue, &q->properties,

				       q->process->mm);

				       q->queue, &q->properties, mm);

		if (retval)

			goto out;

		dqm->queue_count++;

	}

	qpd->evicted = 0;

out:

	if (mm)

		mmput(mm);

	dqm_unlock(dqm);

	return retval;

}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+8 −2
Original line number Diff line number Diff line
@@ -4633,12 +4633,18 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
	}

	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);



	/* Signal HW programming completion */

	drm_atomic_helper_commit_hw_done(state);



	if (wait_for_vblank)

		drm_atomic_helper_wait_for_flip_done(dev, state);



	/*

	 * FIXME:

	 * Delay hw_done() until flip_done() is signaled. This is to block

	 * another commit from freeing the CRTC state while we're still

	 * waiting on flip_done.

	 */

	drm_atomic_helper_commit_hw_done(state);



	drm_atomic_helper_cleanup_planes(dev, state);



	/* Finally, drop a runtime PM reference for each newly disabled CRTC,