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

Commit 14d50d70 authored by Surajit Podder's avatar Surajit Podder Committed by Gerrit - the friendly Code Review server
Browse files

msm: vidc: Perform cache operations only on filled length 



Perform cache operations on decoder input and encoder output
data plane only on filled length, rather than allocated length

Change-Id: I21e1bc3ce442e902dab97d0c661168dfb5507012
Signed-off-by: default avatarSurajit Podder <spodder@codeaurora.org>
parent 55a25be0

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

+11 −4
Original line number Diff line number Diff line
@@ -490,11 +490,13 @@ bool msm_smem_compare_buffers(void *clt, int fd, void *priv) 
}



static int ion_cache_operations(struct smem_client *client,

	struct msm_smem *mem, enum smem_cache_ops cache_op)

	struct msm_smem *mem, enum smem_cache_ops cache_op,

	int size)

{

	unsigned long ionflag = 0;

	int rc = 0;

	int msm_cache_ops = 0;

	int op_size = 0;

	if (!mem || !client) {

		dprintk(VIDC_ERR, "Invalid params: %pK, %pK\n",

			mem, client);
@@ -523,10 +525,15 @@ static int ion_cache_operations(struct smem_client *client, 
			rc = -EINVAL;

			goto cache_op_failed;

		}

		if (size <= 0)

			op_size = mem->size;

		else

			op_size = mem->size < size ? mem->size : size;



		rc = msm_ion_do_cache_offset_op(client->clnt,

				(struct ion_handle *)mem->smem_priv,

				0, mem->offset,

				(unsigned long)mem->size, msm_cache_ops);

				(unsigned long)op_size, msm_cache_ops);

		if (rc) {

			dprintk(VIDC_ERR,

					"cache operation failed %d\n", rc);
@@ -538,7 +545,7 @@ cache_op_failed: 
}



int msm_smem_cache_operations(void *clt, struct msm_smem *mem,

		enum smem_cache_ops cache_op)

		enum smem_cache_ops cache_op, int size)

{

	struct smem_client *client = clt;

	int rc = 0;
@@ -549,7 +556,7 @@ int msm_smem_cache_operations(void *clt, struct msm_smem *mem, 
	}

	switch (client->mem_type) {

	case SMEM_ION:

		rc = ion_cache_operations(client, mem, cache_op);

		rc = ion_cache_operations(client, mem, cache_op, size);

		if (rc)

			dprintk(VIDC_ERR,

			"Failed cache operations: %d\n", rc);

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

+38 −20
Original line number Diff line number Diff line
@@ -670,10 +670,11 @@ int qbuf_dynamic_buf(struct msm_vidc_inst *inst, 
}



int output_buffer_cache_invalidate(struct msm_vidc_inst *inst,

				struct buffer_info *binfo)

			struct buffer_info *binfo, struct v4l2_buffer *b)

{

	int i = 0;

	int rc = 0;

	int size = -1;



	if (!inst) {

		dprintk(VIDC_ERR, "%s: invalid inst: %pK\n", __func__, inst);
@@ -686,14 +687,23 @@ int output_buffer_cache_invalidate(struct msm_vidc_inst *inst, 
		return -EINVAL;

	}



	if (b->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		for (i = 0; i < binfo->num_planes; i++) {

			if (binfo->handle[i]) {

				struct msm_smem smem = *binfo->handle[i];



			smem.offset = (unsigned int)(binfo->buff_off[i]);

				if (inst->session_type == MSM_VIDC_ENCODER &&

					!i)

					size = b->m.planes[i].bytesused;

				else

					size = -1;



				smem.offset =

					(unsigned int)(binfo->buff_off[i]);

				smem.size   = binfo->size[i];

				rc = msm_comm_smem_cache_operations(inst,

				&smem, SMEM_CACHE_INVALIDATE);

					&smem, SMEM_CACHE_INVALIDATE,

					size);

				if (rc) {

					dprintk(VIDC_ERR,

						"%s: Failed to clean caches: %d\n",
@@ -701,9 +711,11 @@ int output_buffer_cache_invalidate(struct msm_vidc_inst *inst, 
					return -EINVAL;

				}

			} else

			dprintk(VIDC_DBG, "%s: NULL handle for plane %d\n",

				dprintk(VIDC_DBG,

					"%s: NULL handle for plane %d\n",

					__func__, i);

		}

	}

	return 0;

}
@@ -858,6 +870,7 @@ int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b) 
	int plane = 0;

	int rc = 0;

	int i;

	int size = -1;



	if (!inst || !inst->core || !b || !valid_v4l2_buffer(b, inst))

		return -EINVAL;
@@ -905,7 +918,7 @@ int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b) 
			V4L2_PIX_FMT_HEVC_HYBRID && binfo->handle[i] &&

			b->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

			rc = msm_comm_smem_cache_operations(inst,

				binfo->handle[i], SMEM_CACHE_INVALIDATE);

				binfo->handle[i], SMEM_CACHE_INVALIDATE, -1);

			if (rc) {

				dprintk(VIDC_ERR,

					"Failed to inv caches: %d\n", rc);
@@ -915,8 +928,13 @@ int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b) 


		if (binfo->handle[i] &&

			(b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) {

			if (inst->session_type == MSM_VIDC_DECODER && !i)

				size = b->m.planes[i].bytesused;

			else

				size = -1;

			rc = msm_comm_smem_cache_operations(inst,

					binfo->handle[i], SMEM_CACHE_CLEAN);

					binfo->handle[i], SMEM_CACHE_CLEAN,

					size);

			if (rc) {

				dprintk(VIDC_ERR,

					"Failed to clean caches: %d\n", rc);
@@ -985,7 +1003,7 @@ int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b) 
		return -EINVAL;

	}



	rc = output_buffer_cache_invalidate(inst, buffer_info);

	rc = output_buffer_cache_invalidate(inst, buffer_info, b);

	if (rc)

		return rc;

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

+6 −4
Original line number Diff line number Diff line
@@ -3174,7 +3174,7 @@ static int set_output_buffers(struct msm_vidc_inst *inst, 
				goto err_no_mem;

			}

			rc = msm_comm_smem_cache_operations(inst,

					handle, SMEM_CACHE_CLEAN);

					handle, SMEM_CACHE_CLEAN, -1);

			if (rc) {

				dprintk(VIDC_WARN,

					"Failed to clean cache may cause undefined behavior\n");
@@ -3265,7 +3265,7 @@ static int set_internal_buf_on_fw(struct msm_vidc_inst *inst, 
	hdev = inst->core->device;



	rc = msm_comm_smem_cache_operations(inst,

					handle, SMEM_CACHE_CLEAN);

					handle, SMEM_CACHE_CLEAN, -1);

	if (rc) {

		dprintk(VIDC_WARN,

			"Failed to clean cache. Undefined behavior\n");
@@ -5154,14 +5154,16 @@ void msm_comm_smem_free(struct msm_vidc_inst *inst, struct msm_smem *mem) 
}



int msm_comm_smem_cache_operations(struct msm_vidc_inst *inst,

		struct msm_smem *mem, enum smem_cache_ops cache_ops)

		struct msm_smem *mem, enum smem_cache_ops cache_ops,

		int size)

{

	if (!inst || !mem) {

		dprintk(VIDC_ERR,

			"%s: invalid params: %pK %pK\n", __func__, inst, mem);

		return -EINVAL;

	}

	return msm_smem_cache_operations(inst->mem_client, mem, cache_ops);

	return msm_smem_cache_operations(inst->mem_client, mem,

						cache_ops, size);

}



struct msm_smem *msm_comm_smem_user_to_kernel(struct msm_vidc_inst *inst,

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -76,7 +76,7 @@ struct msm_smem *msm_comm_smem_alloc(struct msm_vidc_inst *inst, 
			enum hal_buffer buffer_type, int map_kernel);

void msm_comm_smem_free(struct msm_vidc_inst *inst, struct msm_smem *mem);

int msm_comm_smem_cache_operations(struct msm_vidc_inst *inst,

		struct msm_smem *mem, enum smem_cache_ops cache_ops);

		struct msm_smem *mem, enum smem_cache_ops cache_ops, int size);

struct msm_smem *msm_comm_smem_user_to_kernel(struct msm_vidc_inst *inst,

			int fd, u32 offset, enum hal_buffer buffer_type);

enum hal_video_codec get_hal_codec(int fourcc);

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ struct buffer_info *device_to_uvaddr(struct msm_vidc_list *buf_list, 
int buf_ref_get(struct msm_vidc_inst *inst, struct buffer_info *binfo);

int buf_ref_put(struct msm_vidc_inst *inst, struct buffer_info *binfo);

int output_buffer_cache_invalidate(struct msm_vidc_inst *inst,

				struct buffer_info *binfo);

		struct buffer_info *binfo, struct v4l2_buffer *b);

int qbuf_dynamic_buf(struct msm_vidc_inst *inst,

			struct buffer_info *binfo);

int unmap_and_deregister_buf(struct msm_vidc_inst *inst,
@@ -369,7 +369,7 @@ struct msm_smem *msm_smem_alloc(void *clt, size_t size, u32 align, u32 flags, 
void msm_smem_free(void *clt, struct msm_smem *mem);

void msm_smem_delete_client(void *clt);

int msm_smem_cache_operations(void *clt, struct msm_smem *mem,

		enum smem_cache_ops);

		enum smem_cache_ops, int size);

struct msm_smem *msm_smem_user_to_kernel(void *clt, int fd, u32 offset,

				enum hal_buffer buffer_type);

struct context_bank_info *msm_smem_get_context_bank(void *clt,