From 9864ecb0f8a324acd938bb016f813d593dc3cf16 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 17 May 2023 00:54:56 +0300 Subject: [PATCH] Conditionally revert "msm: camera: ope: Increase max bl limit and max stripe to process" This breaks camera on caprip but required on newer devices. This conditionally reverts commit c4a3b49efc4cf171ba095683fd5e4962754d978a. Change-Id: Iec7e8d593bb37b637d1f876228bf73b0944e01ff --- techpack/camera-bengal/Makefile | 5 +++++ techpack/camera-bengal/config/legacycameraconf.h | 6 ++++++ techpack/camera-bengal/include/uapi/media/cam_ope.h | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 techpack/camera-bengal/config/legacycameraconf.h diff --git a/techpack/camera-bengal/Makefile b/techpack/camera-bengal/Makefile index 2c8115903a54..c50c7a0c43fb 100644 --- a/techpack/camera-bengal/Makefile +++ b/techpack/camera-bengal/Makefile @@ -19,6 +19,11 @@ LINUXINCLUDE += \ -include $(srctree)/techpack/camera-bengal/config/khajecameraconf.h endif +ifeq ($(CONFIG_CAPRIP_DTB), y) +LINUXINCLUDE += \ + -include $(srctree)/techpack/camera-bengal/config/legacycameraconf.h +endif + ifdef CONFIG_SPECTRA_CAMERA_BENGAL # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ diff --git a/techpack/camera-bengal/config/legacycameraconf.h b/techpack/camera-bengal/config/legacycameraconf.h new file mode 100644 index 000000000000..6a17cb1ff12f --- /dev/null +++ b/techpack/camera-bengal/config/legacycameraconf.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2020, The Linux Foundation. All rights reserved. + */ + +#define CONFIG_SPECTRA_CAMERA_LEGACY 1 diff --git a/techpack/camera-bengal/include/uapi/media/cam_ope.h b/techpack/camera-bengal/include/uapi/media/cam_ope.h index a2d9845430a2..f62e06a1ac59 100644 --- a/techpack/camera-bengal/include/uapi/media/cam_ope.h +++ b/techpack/camera-bengal/include/uapi/media/cam_ope.h @@ -74,7 +74,11 @@ #define OPE_MAX_IO_BUFS (OPE_OUT_RES_MAX + OPE_IN_RES_MAX) #define OPE_MAX_PASS 1 #define OPE_MAX_PLANES 2 +#ifdef CONFIG_SPECTRA_CAMERA_LEGACY +#define OPE_MAX_STRIPES 48 +#else #define OPE_MAX_STRIPES 64 +#endif #define OPE_MAX_BATCH_SIZE 16 /**