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

Commit 0b412605 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.16-rc8' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Nothing serious, two amdkfd and two tegra fixes"

* tag 'drm-fixes-for-v4.16-rc8' of git://people.freedesktop.org/~airlied/linux:
  drm/tegra: dc: Using NULL instead of plain integer
  drm/amdkfd: Deallocate SDMA queues correctly
  drm/amdkfd: Fix scratch memory with HWS enabled
  drm/tegra: dc: Use correct format array for Tegra124
parents 68b8dffc ef55d153

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

+14 −6
Original line number Diff line number Diff line
@@ -821,13 +821,13 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
		pr_warn("Can't create new usermode queue because %d queues were already created\n",

				dqm->total_queue_count);

		retval = -EPERM;

		goto out;

		goto out_unlock;

	}



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

		retval = allocate_sdma_queue(dqm, &q->sdma_id);

		if (retval)

			goto out;

			goto out_unlock;

		q->properties.sdma_queue_id =

			q->sdma_id / CIK_SDMA_QUEUES_PER_ENGINE;

		q->properties.sdma_engine_id =
@@ -838,7 +838,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 


	if (!mqd) {

		retval = -ENOMEM;

		goto out;

		goto out_deallocate_sdma_queue;

	}



	dqm->asic_ops.init_sdma_vm(dqm, q, qpd);
@@ -848,7 +848,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
	retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,

				&q->gart_mqd_addr, &q->properties);

	if (retval)

		goto out;

		goto out_deallocate_sdma_queue;



	list_add(&q->list, &qpd->queues_list);

	qpd->queue_count++;
@@ -869,7 +869,13 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
	pr_debug("Total of %d queues are accountable so far\n",

			dqm->total_queue_count);



out:

	mutex_unlock(&dqm->lock);

	return retval;



out_deallocate_sdma_queue:

	if (q->properties.type == KFD_QUEUE_TYPE_SDMA)

		deallocate_sdma_queue(dqm, q->sdma_id);

out_unlock:

	mutex_unlock(&dqm->lock);

	return retval;

}
@@ -1188,8 +1194,10 @@ static int process_termination_cpsch(struct device_queue_manager *dqm, 


	/* Clear all user mode queues */

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

		if (q->properties.type == KFD_QUEUE_TYPE_SDMA)

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

			dqm->sdma_queue_count--;

			deallocate_sdma_queue(dqm, q->sdma_id);

		}



		if (q->properties.is_active)

			dqm->queue_count--;

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

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ static int pm_create_map_process(struct packet_manager *pm, uint32_t *buffer, 
	packet->sh_mem_ape1_base = qpd->sh_mem_ape1_base;

	packet->sh_mem_ape1_limit = qpd->sh_mem_ape1_limit;



	/* TODO: scratch support */

	packet->sh_hidden_private_base_vmid = 0;

	packet->sh_hidden_private_base_vmid = qpd->sh_hidden_private_base;



	packet->gds_addr_lo = lower_32_bits(qpd->gds_context_area);

	packet->gds_addr_hi = upper_32_bits(qpd->gds_context_area);

drivers/gpu/drm/tegra/dc.c

+3 −3
Original line number Diff line number Diff line
@@ -2009,9 +2009,9 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { 
	.coupled_pm = false,

	.has_nvdisplay = false,

	.num_primary_formats = ARRAY_SIZE(tegra124_primary_formats),

	.primary_formats = tegra114_primary_formats,

	.primary_formats = tegra124_primary_formats,

	.num_overlay_formats = ARRAY_SIZE(tegra124_overlay_formats),

	.overlay_formats = tegra114_overlay_formats,

	.overlay_formats = tegra124_overlay_formats,

};



static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
@@ -2160,7 +2160,7 @@ static int tegra_dc_couple(struct tegra_dc *dc) 
		struct device_link *link;

		struct device *partner;



		partner = driver_find_device(dc->dev->driver, NULL, 0,

		partner = driver_find_device(dc->dev->driver, NULL, NULL,

					     tegra_dc_match_by_pipe);

		if (!partner)

			return -EPROBE_DEFER;