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

Unverified Commit 3087c412 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.15.r1-07400-KAMORTA.QSSI13.0' of... 

Merge tag 'LA.UM.9.15.r1-07400-KAMORTA.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel into android13-4.19-kona

"LA.UM.9.15.r1-07400-KAMORTA.QSSI13.0"

* tag 'LA.UM.9.15.r1-07400-KAMORTA.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel:
  msm: camera: smmu: Use get_file to increase ref count

Change-Id: Ie6f243e0a0dfc1ff927d4b4b3594ee3b357661ce
parents 08a5b230 3187db7c

techpack/camera-bengal/drivers/cam_req_mgr/cam_mem_mgr.c

+7 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -402,7 +402,6 @@ static int cam_mem_util_get_dma_buf_fd(size_t len, 
	struct dma_buf **buf,

	int *fd)

{

	struct dma_buf *dmabuf = NULL;

	int rc = 0;

	struct timespec64 ts1, ts2;

	long microsec = 0;
@@ -418,23 +417,18 @@ static int cam_mem_util_get_dma_buf_fd(size_t len, 
	*buf = ion_alloc(len, heap_id_mask, flags);

	if (IS_ERR_OR_NULL(*buf))

		return -ENOMEM;



	*fd = dma_buf_fd(*buf, O_CLOEXEC);

	if (*fd < 0) {

		CAM_ERR(CAM_MEM, "get fd fail, *fd=%d", *fd);

		rc = -EINVAL;

		goto get_fd_fail;

	}



	/*

	 * increment the ref count so that ref count becomes 2 here

	 * when we close fd, refcount becomes 1 and when we do

	 * dmap_put_buf, ref count becomes 0 and memory will be freed.

	 */

	dmabuf = dma_buf_get(*fd);

	if (IS_ERR_OR_NULL(dmabuf)) {

		CAM_ERR(CAM_MEM, "dma_buf_get failed, *fd=%d", *fd);

	get_dma_buf(*buf);



	*fd = dma_buf_fd(*buf, O_CLOEXEC);

	if (*fd < 0) {

		CAM_ERR(CAM_MEM, "get fd fail, *fd=%d", *fd);

		rc = -EINVAL;

		goto get_fd_fail;

	}



	if (tbl.alloc_profile_enable) {