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

Commit 196ebdcc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-2016-09-19' of git://people.freedesktop.org/~gabbayo/linux into drm-next 

This is amdkfd's pull request for kernel 4.9. It contains a fix to a possible
infinite loop bug and a couple of other minor "cleaning" patches.

* tag 'drm-amdkfd-next-2016-09-19' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Pass 'struct queue_propertices' by reference
  drm/amdkfd: Unify multiple calls to pr_debug() into one
  drm/amdkfd: Fix possible infinite loop
  drm/amdkfd: Reuse function to find a process through pasid
  drm/amdkfd: Add some missing memset zero'ing in queue init func
  drm/amdkfd: Tidy up kfd_generate_gpu_id() uint64_t bitshift unpack
parents 52f13a02 e88a614c

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

+9 −8
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, 
				uint32_t pipe_id, uint32_t queue_id);



static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,

				unsigned int timeout, uint32_t pipe_id,

				unsigned int utimeout, uint32_t pipe_id,

				uint32_t queue_id);

static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd);

static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int timeout);

				unsigned int utimeout);

static int kgd_address_watch_disable(struct kgd_dev *kgd);

static int kgd_address_watch_execute(struct kgd_dev *kgd,

					unsigned int watch_point_id,
@@ -437,11 +437,12 @@ static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd) 
}



static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,

				unsigned int timeout, uint32_t pipe_id,

				unsigned int utimeout, uint32_t pipe_id,

				uint32_t queue_id)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	uint32_t temp;

	int timeout = utimeout;



	acquire_queue(kgd, pipe_id, queue_id);

	WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL, 0);
@@ -452,9 +453,8 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, 
		temp = RREG32(mmCP_HQD_ACTIVE);

		if (temp & CP_HQD_ACTIVE__ACTIVE_MASK)

			break;

		if (timeout == 0) {

			pr_err("kfd: cp queue preemption time out (%dms)\n",

				temp);

		if (timeout <= 0) {

			pr_err("kfd: cp queue preemption time out.\n");

			release_queue(kgd);

			return -ETIME;

		}
@@ -467,12 +467,13 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, 
}



static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int timeout)

				unsigned int utimeout)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct cik_sdma_rlc_registers *m;

	uint32_t sdma_base_addr;

	uint32_t temp;

	int timeout = utimeout;



	m = get_sdma_mqd(mqd);

	sdma_base_addr = get_sdma_base_addr(m);
@@ -485,7 +486,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT)

			break;

		if (timeout == 0)

		if (timeout <= 0)

			return -ETIME;

		msleep(20);

		timeout -= 20;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

+9 −8
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, 
		uint32_t pipe_id, uint32_t queue_id);

static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd);

static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,

				unsigned int timeout, uint32_t pipe_id,

				unsigned int utimeout, uint32_t pipe_id,

				uint32_t queue_id);

static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int timeout);

				unsigned int utimeout);

static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);

static int kgd_address_watch_disable(struct kgd_dev *kgd);

static int kgd_address_watch_execute(struct kgd_dev *kgd,
@@ -349,11 +349,12 @@ static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd) 
}



static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,

				unsigned int timeout, uint32_t pipe_id,

				unsigned int utimeout, uint32_t pipe_id,

				uint32_t queue_id)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	uint32_t temp;

	int timeout = utimeout;



	acquire_queue(kgd, pipe_id, queue_id);
@@ -363,9 +364,8 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, 
		temp = RREG32(mmCP_HQD_ACTIVE);

		if (temp & CP_HQD_ACTIVE__ACTIVE_MASK)

			break;

		if (timeout == 0) {

			pr_err("kfd: cp queue preemption time out (%dms)\n",

				temp);

		if (timeout <= 0) {

			pr_err("kfd: cp queue preemption time out.\n");

			release_queue(kgd);

			return -ETIME;

		}
@@ -378,12 +378,13 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, 
}



static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int timeout)

				unsigned int utimeout)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct cik_sdma_rlc_registers *m;

	uint32_t sdma_base_addr;

	uint32_t temp;

	int timeout = utimeout;



	m = get_sdma_mqd(mqd);

	sdma_base_addr = get_sdma_base_addr(m);
@@ -396,7 +397,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT)

			break;

		if (timeout == 0)

		if (timeout <= 0)

			return -ETIME;

		msleep(20);

		timeout -= 20;

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

+9 −7
Original line number Diff line number Diff line
@@ -142,14 +142,16 @@ int kfd_doorbell_mmap(struct kfd_process *process, struct vm_area_struct *vma) 


	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);



	pr_debug("mapping doorbell page:\n");

	pr_debug("     target user address == 0x%08llX\n",

			(unsigned long long) vma->vm_start);

	pr_debug("     physical address    == 0x%08llX\n", address);

	pr_debug("     vm_flags            == 0x%04lX\n", vma->vm_flags);

	pr_debug("     size                == 0x%04lX\n",

	pr_debug("kfd: mapping doorbell page in %s\n"

		 "     target user address == 0x%08llX\n"

		 "     physical address    == 0x%08llX\n"

		 "     vm_flags            == 0x%04lX\n"

		 "     size                == 0x%04lX\n",

		 __func__,

		 (unsigned long long) vma->vm_start, address, vma->vm_flags,

		 doorbell_process_allocation());





	return io_remap_pfn_range(vma,

				vma->vm_start,

				address >> PAGE_SHIFT,

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

+4 −1
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev, 
	pr_debug("amdkfd: In func %s initializing queue type %d size %d\n",

			__func__, KFD_QUEUE_TYPE_HIQ, queue_size);



	memset(&prop, 0, sizeof(prop));

	memset(&nop, 0, sizeof(nop));



	nop.opcode = IT_NOP;

	nop.type = PM4_TYPE_3;

	nop.u32all |= PM4_COUNT_ZERO;
@@ -121,7 +124,7 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev, 
	prop.eop_ring_buffer_address = kq->eop_gpu_addr;

	prop.eop_ring_buffer_size = PAGE_SIZE;



	if (init_queue(&kq->queue, prop) != 0)

	if (init_queue(&kq->queue, &prop) != 0)

		goto err_init_queue;



	kq->queue->device = dev;

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

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ int kfd_init_apertures(struct kfd_process *process); 
/* Queue Context Management */

struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd);



int init_queue(struct queue **q, struct queue_properties properties);

int init_queue(struct queue **q, const struct queue_properties *properties);

void uninit_queue(struct queue *q);

void print_queue_properties(struct queue_properties *q);

void print_queue(struct queue *q);