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

Commit a5014be7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: change cvp buffer add sequence"

parents 931b3a60 770620ff

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

+4 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018, 2020, 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
@@ -375,9 +375,6 @@ static int msm_cvp_register_buffer(struct msm_vidc_inst *inst, 
		dprintk(VIDC_ERR, "%s: cbuf alloc failed\n", __func__);

		return -ENOMEM;

	}

	mutex_lock(&inst->cvpbufs.lock);

	list_add_tail(&cbuf->list, &inst->cvpbufs.list);

	mutex_unlock(&inst->cvpbufs.lock);



	memcpy(&cbuf->buf, buf, sizeof(struct msm_cvp_buffer));

	cbuf->smem.buffer_type = get_hal_buftype(__func__, buf->type);
@@ -403,14 +400,14 @@ static int msm_cvp_register_buffer(struct msm_vidc_inst *inst, 
		print_cvp_buffer(VIDC_ERR, "register failed", inst, cbuf);

		goto exit;

	}

	mutex_lock(&inst->cvpbufs.lock);

	list_add_tail(&cbuf->list, &inst->cvpbufs.list);

	mutex_unlock(&inst->cvpbufs.lock);

	return rc;



exit:

	if (cbuf->smem.device_addr)

		msm_smem_unmap_dma_buf(inst, &cbuf->smem);

	mutex_lock(&inst->cvpbufs.lock);

	list_del(&cbuf->list);

	mutex_unlock(&inst->cvpbufs.lock);

	kfree(cbuf);

	cbuf = NULL;