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

Commit 5315abee authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c7011c03 on remote branch 

Change-Id: I41a88e0cc6228fa27474645ceb10b56e60e35027
parents b9d5e89e c7011c03

drivers/cam_cpas/cam_cpas_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1860,10 +1860,10 @@ int cam_cpas_hw_probe(struct platform_device *pdev, 
	cam_cpas_util_unregister_bus_client(&cpas_core->ahb_bus_client);

client_cleanup:

	cam_cpas_util_client_cleanup(cpas_hw);

	cam_cpas_node_tree_cleanup(cpas_core, cpas_hw->soc_info.soc_private);

deinit_platform_res:

	cam_cpas_soc_deinit_resources(&cpas_hw->soc_info);

release_workq:

	cam_cpas_node_tree_cleanup(cpas_core, cpas_hw->soc_info.soc_private);

	flush_workqueue(cpas_core->work_queue);

	destroy_workqueue(cpas_core->work_queue);

release_mem:

drivers/cam_jpeg/cam_jpeg_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int cam_jpeg_dev_remove(struct platform_device *pdev) 
	int rc;

	int i;



	for (i = 0; i < CAM_CTX_MAX; i++) {

	for (i = 0; i < CAM_JPEG_CTX_MAX; i++) {

		rc = cam_jpeg_context_deinit(&g_jpeg_dev.ctx_jpeg[i]);

		if (rc)

			CAM_ERR(CAM_JPEG, "JPEG context %d deinit failed %d",
@@ -135,7 +135,7 @@ static int cam_jpeg_dev_probe(struct platform_device *pdev) 
		goto unregister;

	}



	for (i = 0; i < CAM_CTX_MAX; i++) {

	for (i = 0; i < CAM_JPEG_CTX_MAX; i++) {

		rc = cam_jpeg_context_init(&g_jpeg_dev.ctx_jpeg[i],

			&g_jpeg_dev.ctx[i],

			&node->hw_mgr_intf,
@@ -147,7 +147,7 @@ static int cam_jpeg_dev_probe(struct platform_device *pdev) 
		}

	}



	rc = cam_node_init(node, &hw_mgr_intf, g_jpeg_dev.ctx, CAM_CTX_MAX,

	rc = cam_node_init(node, &hw_mgr_intf, g_jpeg_dev.ctx, CAM_JPEG_CTX_MAX,

		CAM_JPEG_DEV_NAME);

	if (rc) {

		CAM_ERR(CAM_JPEG, "JPEG node init failed %d", rc);

drivers/cam_jpeg/cam_jpeg_dev.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#ifndef _CAM_JPEG_DEV_H_
@@ -24,8 +24,8 @@ 
struct cam_jpeg_dev {

	struct cam_subdev sd;

	struct cam_node *node;

	struct cam_context ctx[CAM_CTX_MAX];

	struct cam_jpeg_context ctx_jpeg[CAM_CTX_MAX];

	struct cam_context ctx[CAM_JPEG_CTX_MAX];

	struct cam_jpeg_context ctx_jpeg[CAM_JPEG_CTX_MAX];

	struct mutex jpeg_mutex;

	int32_t open_cnt;

};

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+2 −0
Original line number Diff line number Diff line
@@ -177,7 +177,9 @@ static int cam_jpeg_mgr_process_irq(void *priv, void *data) 
		PTR_TO_U64(p_cfg_req->hw_cfg_args.priv);

	ctx_data->ctxt_event_cb(ctx_data->context_priv, 0, &buf_data);



	mutex_lock(&g_jpeg_hw_mgr.hw_mgr_mutex);

	list_add_tail(&p_cfg_req->list, &hw_mgr->free_req_list);

	mutex_unlock(&g_jpeg_hw_mgr.hw_mgr_mutex);

	return rc;

}

drivers/cam_jpeg/jpeg_hw/include/cam_jpeg_hw_intf.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#ifndef CAM_JPEG_HW_INTF_H
@@ -8,7 +8,6 @@ 


#include "cam_cpas_api.h"



#define CAM_JPEG_CTX_MAX              8

#define CAM_JPEG_DEV_PER_TYPE_MAX     1



#define CAM_JPEG_CMD_BUF_MAX_SIZE     128