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

Commit 3d6b9df5 authored by Carter Cooper's avatar Carter Cooper
Browse files

msm: kgsl: Write a cookie into HFI write buffer remainder 



HFI commands can be any number of dwords in length. But commands
are required to start at 4 dword alignemnt. Instead of skipping
any remainder dwords at the end of a command (and possibly leaving
junk in them), write a cookie into the unused dwords up to the
next alignment.

Change-Id: I12f3f1c37aa09fe57f08f6a1d0bd2cf122e93ee1
Signed-off-by: default avatarCarter Cooper <ccooper@codeaurora.org>
parent 452becbf

drivers/gpu/msm/kgsl_hfi.c

+11 −18
Original line number Diff line number Diff line
@@ -45,22 +45,6 @@ 
	 (((minor) & 0x7FFFFF) << 5) | \

	 ((branch) & 0x1F))



/*

 * hfi_align_idx() - Update index based on HFI version

 * @gmu: Pointer to a GMU device

 * @idx: Integer that is either a read or write index

 * @boundary: boundary of adjusted ptr value. Exceeding the boundary

 *	will reset ptr to 0

 */

static int hfi_align_idx(struct gmu_device *gmu, int idx, int boundary)

{

	if (HFI_VER_MAJOR(&gmu->hfi) >= 2) {

		idx = ALIGN(idx, SZ_4);

		return (idx < boundary) ? idx : 0;

	}

	return idx;

}



/* Size in below functions are in unit of dwords */

static int hfi_queue_read(struct gmu_device *gmu, uint32_t queue_idx,

		unsigned int *output, unsigned int max_size)
@@ -109,7 +93,10 @@ static int hfi_queue_read(struct gmu_device *gmu, uint32_t queue_idx, 
		result = -ENODATA;

	}



	hdr->read_index = hfi_align_idx(gmu, read, hdr->queue_size);

	if (HFI_VER_MAJOR(&gmu->hfi) >= 2)

		read = ALIGN(read, SZ_4) % hdr->queue_size;



	hdr->read_index = read;



	return result;

}
@@ -164,7 +151,13 @@ static int hfi_queue_write(struct gmu_device *gmu, uint32_t queue_idx, 
		write = (write + 1) % hdr->queue_size;

	}



	hdr->write_index = hfi_align_idx(gmu, write, hdr->queue_size);

	/* Cookify any non used data at the end of the write buffer */

	if (HFI_VER_MAJOR(&gmu->hfi) >= 2) {

		for (; write % 4; write = (write + 1) % hdr->queue_size)

			queue[write] = 0xFAFAFAFA;

	}



	hdr->write_index = write;



	mutex_unlock(&hfi->cmdq_mutex);