From d8228b7900daa86e1fe17014104d2b3094c7dae8 Mon Sep 17 00:00:00 2001 From: Dohyun Kim Date: Mon, 8 Apr 2019 17:37:10 +0900 Subject: [PATCH] [HACK][9610] fimc-is2: add sensor interface that transmit crop value for Troika Change-Id: I2ab248a42145ff71f5194d1ef38c331ab7a19287 Signed-off-by: Dohyun Kim --- .../sensor/module_framework/fimc-is-interface-sensor.c | 4 ++++ .../sensor/module_framework/fimc-is-interface-sensor.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c index 19c80dcf9743..bcc05155793c 100755 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c @@ -1320,8 +1320,10 @@ int get_sensor_frame_timing(struct fimc_is_sensor_interface *itf, } int get_sensor_cur_size(struct fimc_is_sensor_interface *itf, +#ifdef CONFIG_CAMERA_CIS_12A10_OBJ u32 *cur_pos_x, u32 *cur_pos_y, +#endif u32 *cur_width, u32 *cur_height) { @@ -1336,8 +1338,10 @@ int get_sensor_cur_size(struct fimc_is_sensor_interface *itf, FIMC_BUG(!sensor_peri); FIMC_BUG(!sensor_peri->cis.cis_data); +#ifdef CONFIG_CAMERA_CIS_12A10_OBJ *cur_pos_x = sensor_peri->cis.cis_data->cur_pos_x; *cur_pos_y = sensor_peri->cis.cis_data->cur_pos_y; +#endif *cur_width = sensor_peri->cis.cis_data->cur_width; *cur_height = sensor_peri->cis.cis_data->cur_height; diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.h b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.h index 8f4a651de0da..7f9a4170649e 100755 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.h +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.h @@ -806,8 +806,10 @@ struct fimc_is_cis_interface_ops { u32 *max_margin_cit); int (*get_sensor_cur_size)(struct fimc_is_sensor_interface *itf, +#ifdef CONFIG_CAMERA_CIS_12A10_OBJ u32 *cur_pos_x, u32 *cur_pos_y, +#endif u32 *cur_width, u32 *cur_height); -- 2.20.1