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

Commit 945d7468 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ce9b4b3f on remote branch 

Change-Id: I1a7b7fc87e5d535c6ec57f2baef2f8a25c874bc5
parents 0462ea5b ce9b4b3f

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ ifeq ($(CONFIG_ARCH_YUPIK), y) 
include $(srctree)/techpack/camera/config/yupikcamera.conf

endif



ifeq ($(CONFIG_ARCH_SM6150), y)

include $(srctree)/techpack/camera/config/sm6150camera.conf

endif



ifeq ($(CONFIG_ARCH_KONA), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/konacameraconf.h
@@ -83,6 +87,11 @@ LINUXINCLUDE += \ 
		-include $(srctree)/techpack/camera/config/yupikcameraconf.h

endif



ifeq ($(CONFIG_ARCH_SM6150), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/sm6150cameraconf.h

endif



endif



ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))

config/sm6150camera.conf

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Copyright (c) 2021, The Linux Foundation. All rights reserved.



ifeq ($(CONFIG_QGKI),y)

export CONFIG_SPECTRA_CAMERA=m

$(info "QGKI Spectra Camera Building as DLKM")

else

export CONFIG_SPECTRA_CAMERA=m

$(info "GKI Spectra Camera Building as DLKM")

endif



ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))

export CONFIG_SPECTRA_ISP=y

export CONFIG_SPECTRA_SENSOR=y

export CONFIG_SPECTRA_ICP=y

export CONFIG_SPECTRA_JPEG=y

export CONFIG_SPECTRA_CUSTOM=y

endif

config/sm6150cameraconf.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2021, The Linux Foundation. All rights reserved.

 */





#define CONFIG_SPECTRA_CAMERA 1

#define CONFIG_SPECTRA_ISP    1

#define CONFIG_SPECTRA_SENSOR 1

#define CONFIG_SPECTRA_ICP    1

#define CONFIG_SPECTRA_JPEG   1

#define CONFIG_SPECTRA_CUSTOM 1

drivers/cam_cdm/cam_cdm_hw_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1809,11 +1809,9 @@ int cam_hw_cdm_handle_error_info( 


	if (node != NULL) {

		if (node->request_type == CAM_HW_CDM_BL_CB_CLIENT) {

			mutex_lock(&cdm_hw->hw_mutex);

			cam_cdm_notify_clients(cdm_hw,

					CAM_CDM_CB_STATUS_HW_ERROR,

					(void *)node);

			mutex_unlock(&cdm_hw->hw_mutex);

		} else if (node->request_type == CAM_HW_CDM_BL_CB_INTERNAL) {

			CAM_ERR(CAM_CDM, "Invalid node=%pK %d", node,

					node->request_type);

drivers/cam_isp/cam_isp_context.c

+10 −0
Original line number Diff line number Diff line
@@ -4119,6 +4119,16 @@ static int __cam_isp_ctx_rdi_only_sof_in_bubble_state( 
				CAM_DBG(CAM_ISP,

					"CDM callback detected for req: %lld, possible buf_done delay, waiting for buf_done",

					req->request_id);

				if (req_isp->num_fence_map_out ==

					req_isp->num_deferred_acks) {

					__cam_isp_handle_deferred_buf_done(ctx_isp, req,

						true,

						CAM_SYNC_STATE_SIGNALED_ERROR,

						CAM_SYNC_ISP_EVENT_BUBBLE);



					__cam_isp_ctx_handle_buf_done_for_req_list(

						ctx_isp, req);

				}

				goto end;

			} else {

				CAM_WARN(CAM_ISP,