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

Commit ecd72338 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Free up remaining memory in close session"

parents d7654878 af35ac1f

drivers/media/platform/msm/vidc/msm_smem.c

+7 −4
Original line number Diff line number Diff line
@@ -603,22 +603,25 @@ static int free_ion_mem(struct smem_client *client, struct msm_smem *mem) 
		__func__, mem->handle, mem->device_addr, mem->size,

		mem->kvaddr, mem->buffer_type);



	if (mem->device_addr)

	if (mem->device_addr) {

		msm_ion_put_device_address(client, mem->handle, mem->flags,

			&mem->mapping_info, mem->buffer_type);

		mem->device_addr = 0x0;

	}



	if (mem->kvaddr)

	if (mem->kvaddr) {

		ion_unmap_kernel(client->clnt, mem->handle);

		mem->kvaddr = NULL;

	}



	if (mem->handle) {

		trace_msm_smem_buffer_ion_op_start("FREE",

				(u32)mem->buffer_type, -1, mem->size, -1,

				mem->flags, -1);

		ion_free(client->clnt, mem->handle);

		mem->handle = NULL;

		trace_msm_smem_buffer_ion_op_end("FREE", (u32)mem->buffer_type,

			-1, mem->size, -1, mem->flags, -1);

	} else {

		dprintk(VIDC_ERR, "%s: invalid ion_handle\n", __func__);

	}



	return rc;

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −0
Original line number Diff line number Diff line
@@ -4777,6 +4777,7 @@ void msm_comm_release_eos_buffers(struct msm_vidc_inst *inst) 
	mutex_lock(&inst->eosbufs.lock);

	list_for_each_entry_safe(buf, next, &inst->eosbufs.list, list) {

		list_del(&buf->list);

		msm_comm_smem_free(inst, &buf->smem);

		kfree(buf);

	}

	INIT_LIST_HEAD(&inst->eosbufs.list);