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

Commit 363d6732 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 367074bf on remote branch 

Change-Id: I403b54374e4604dc3f42713c7e887f7bcc9a4dd0
parents 80b3310a 367074bf

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ CONFIG_DUMMY=y 
CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_AQFWD=y

CONFIG_IGB=y

CONFIG_SKY2=y

CONFIG_RMNET=y

CONFIG_SMSC911X=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ CONFIG_DUMMY=y 
CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_AQFWD=y

CONFIG_IGB=y

CONFIG_RMNET=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

drivers/char/adsprpc.c

+4 −4
Original line number Diff line number Diff line
@@ -3091,7 +3091,7 @@ static int fastrpc_unmap_on_dsp(struct fastrpc_file *fl, 


static int fastrpc_mmap_on_dsp(struct fastrpc_file *fl, uint32_t flags,

					uintptr_t va, uint64_t phys,

					size_t size, uintptr_t *raddr)

					size_t size, int refs, uintptr_t *raddr)

{

	struct fastrpc_ioctl_invoke_crc ioctl;

	struct fastrpc_apps *me = &gfa;
@@ -3153,7 +3153,7 @@ static int fastrpc_mmap_on_dsp(struct fastrpc_file *fl, uint32_t flags, 
		}

	}

	if (flags == ADSP_MMAP_REMOTE_HEAP_ADDR

				&& me->channel[cid].rhvm.vmid) {

				&& me->channel[cid].rhvm.vmid && refs == 1) {

		err = hyp_assign_phys(phys, (uint64_t)size,

				hlosvm, 1, me->channel[cid].rhvm.vmid,

				me->channel[cid].rhvm.vmperm,
@@ -3527,7 +3527,7 @@ static int fastrpc_internal_mmap(struct fastrpc_file *fl, 
		if (err)

			goto bail;

		err = fastrpc_mmap_on_dsp(fl, ud->flags, 0,

				rbuf->phys, rbuf->size, &raddr);

				rbuf->phys, rbuf->size, 0, &raddr);

		if (err)

			goto bail;

		rbuf->raddr = raddr;
@@ -3548,7 +3548,7 @@ static int fastrpc_internal_mmap(struct fastrpc_file *fl, 
		else

			va_to_dsp = (uintptr_t)map->va;

		VERIFY(err, 0 == fastrpc_mmap_on_dsp(fl, ud->flags, va_to_dsp,

				map->phys, map->size, &raddr));

				map->phys, map->size, map->refs, &raddr));

		if (err)

			goto bail;

		map->raddr = raddr;

drivers/gpu/msm/adreno_ringbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	if (gpudev->ccu_invalidate)

		dwords += 4;



	link = kcalloc(dwords, sizeof(unsigned int), GFP_KERNEL);

	link = kvcalloc(dwords, sizeof(unsigned int), GFP_KERNEL);

	if (!link) {

		ret = -ENOMEM;

		goto done;
@@ -1206,7 +1206,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	trace_kgsl_issueibcmds(device, context->id, numibs, drawobj->timestamp,

			drawobj->flags, ret, drawctxt->type);



	kfree(link);

	kvfree(link);

	return ret;

}

drivers/misc/kxrctrl/aphost.c

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ static int js_thread(void *data) 
			num = spi_client->rxbuffer[5];



			if (num == 0 || pksz != 30) {

				pr_err("invalid joystick data\n");

				skiprport = true;

			}

			memcpy(&hosttime, &spi_client->rxbuffer[6], 4);