From 23efbfea6d2d70eadcd0abbd75219888795ba9d1 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 ibiza but required on newer devices. This conditionally reverts commit 4fbb1700efdee1ce0e6ed27e7ca777d65148dfda. Change-Id: Iec7e8d593bb37b637d1f876228bf73b0944e01ff --- techpack/camera/Makefile | 5 +++++ techpack/camera/config/legacycameraconf.h | 6 ++++++ techpack/camera/include/uapi/camera/media/cam_ope.h | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 techpack/camera/config/legacycameraconf.h diff --git a/techpack/camera/Makefile b/techpack/camera/Makefile index 2568ff61c873..81116b28ebb3 100644 --- a/techpack/camera/Makefile +++ b/techpack/camera/Makefile @@ -94,6 +94,11 @@ endif endif +ifeq ($(CONFIG_IBIZA_DTB), y) +LINUXINCLUDE += \ + -include $(srctree)/techpack/camera/config/legacycameraconf.h +endif + ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m)) # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ diff --git a/techpack/camera/config/legacycameraconf.h b/techpack/camera/config/legacycameraconf.h new file mode 100644 index 000000000000..6a17cb1ff12f --- /dev/null +++ b/techpack/camera/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/include/uapi/camera/media/cam_ope.h b/techpack/camera/include/uapi/camera/media/cam_ope.h index b6a9a41d8dfe..ee6c3423860f 100644 --- a/techpack/camera/include/uapi/camera/media/cam_ope.h +++ b/techpack/camera/include/uapi/camera/media/cam_ope.h @@ -73,7 +73,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 /**