Skip to content

Commit 3fff202

Browse files
Icarus113Icarus113
committed
fix(isp): use atomic fsm check
1 parent 703da8c commit 3fff202

File tree

11 files changed

+80
-53
lines changed

11 files changed

+80
-53
lines changed

‎components/esp_driver_isp/include/esp_private/isp_private.h‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -9,6 +9,7 @@
99
#include <stdint.h>
1010
#include <stdbool.h>
1111
#include <esp_types.h>
12+
#include <stdatomic.h>
1213
#include "sdkconfig.h"
1314
#include "esp_attr.h"
1415
#include "esp_log.h"
@@ -27,8 +28,12 @@
2728
#include "soc/isp_periph.h"
2829
#endif
2930

31+
// Helper macros for atomic operations to ensure Clang compatibility
3032
#ifdef __cplusplus
31-
extern "C" {
33+
#include <atomic>
34+
#define ISP_ATOMIC_TYPE(T) std::atomic<T>
35+
#else
36+
#define ISP_ATOMIC_TYPE(T) _Atomic T
3237
#endif
3338

3439
#if CONFIG_ISP_ISR_IRAM_SAFE || CONFIG_ISP_CTRL_FUNC_IN_IRAM
@@ -39,6 +44,10 @@ extern "C" {
3944
#define ISP_MEM_ALLOC_CAPS MALLOC_CAP_DEFAULT
4045
#endif
4146

47+
#ifdef __cplusplus
48+
extern "C" {
49+
#endif
50+
4251
typedef enum {
4352
ISP_FSM_INIT, // Controller is initialized, but not enabled
4453
ISP_FSM_ENABLE, // Controller is enabled, but is not running
@@ -59,7 +68,7 @@ typedef struct isp_processor_t {
5968
int csi_brg_id;
6069
void *csi_brg_hw;
6170
#endif
62-
isp_fsm_t isp_fsm;
71+
ISP_ATOMIC_TYPE(isp_fsm_t) isp_fsm;
6372
portMUX_TYPE spinlock;
6473
color_space_pixel_format_t in_color_format;
6574
color_space_pixel_format_t out_color_format;
@@ -72,13 +81,15 @@ typedef struct isp_processor_t {
7281
isp_awb_ctlr_t awb_ctlr;
7382
isp_ae_ctlr_t ae_ctlr;
7483
isp_hist_ctlr_t hist_ctlr;
75-
isp_fsm_t bf_fsm;
76-
isp_fsm_t demosaic_fsm;
77-
isp_fsm_t sharpen_fsm;
78-
isp_fsm_t color_fsm;
79-
isp_fsm_t lsc_fsm;
80-
isp_fsm_t blc_fsm;
81-
isp_fsm_t wbg_fsm;
84+
ISP_ATOMIC_TYPE(isp_fsm_t) bf_fsm;
85+
ISP_ATOMIC_TYPE(isp_fsm_t) blc_fsm;
86+
ISP_ATOMIC_TYPE(isp_fsm_t) ccm_fsm;
87+
ISP_ATOMIC_TYPE(isp_fsm_t) color_fsm;
88+
ISP_ATOMIC_TYPE(isp_fsm_t) demosaic_fsm;
89+
ISP_ATOMIC_TYPE(isp_fsm_t) gamma_fsm;
90+
ISP_ATOMIC_TYPE(isp_fsm_t) lsc_fsm;
91+
ISP_ATOMIC_TYPE(isp_fsm_t) sharpen_fsm;
92+
ISP_ATOMIC_TYPE(isp_fsm_t) wbg_fsm;
8293
esp_isp_evt_cbs_t cbs;
8394
void *user_data;
8495

‎components/esp_driver_isp/src/isp_bf.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -49,21 +49,21 @@ esp_err_t esp_isp_bf_configure(isp_proc_handle_t proc, const esp_isp_bf_config_t
4949
esp_err_t esp_isp_bf_enable(isp_proc_handle_t proc)
5050
{
5151
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
52-
ESP_RETURN_ON_FALSE(proc->bf_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "bf is enabled already");
52+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
53+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->bf_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "bf is enabled already");
5354

5455
isp_ll_bf_enable(proc->hal.hw, true);
55-
proc->bf_fsm = ISP_FSM_ENABLE;
5656

5757
return ESP_OK;
5858
}
5959

6060
esp_err_t esp_isp_bf_disable(isp_proc_handle_t proc)
6161
{
6262
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
63-
ESP_RETURN_ON_FALSE(proc->bf_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "bf isn't enabled yet");
63+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
64+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->bf_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "bf isn't enabled yet");
6465

6566
isp_ll_bf_enable(proc->hal.hw, false);
66-
proc->bf_fsm = ISP_FSM_INIT;
6767

6868
return ESP_OK;
6969
}

‎components/esp_driver_isp/src/isp_blc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ esp_err_t esp_isp_blc_configure(isp_proc_handle_t isp_proc, const esp_isp_blc_co
6464
esp_err_t esp_isp_blc_enable(isp_proc_handle_t isp_proc)
6565
{
6666
ESP_RETURN_ON_FALSE(isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
67-
ESP_RETURN_ON_FALSE(isp_proc->blc_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "blc is enabled already");
67+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
68+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&isp_proc->blc_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "blc is enabled already");
6869

6970
// Enable BLC module
7071
isp_ll_blc_enable(isp_proc->hal.hw, true);
71-
isp_proc->blc_fsm = ISP_FSM_ENABLE;
7272

7373
ESP_LOGD(TAG, "BLC enabled");
7474
return ESP_OK;
@@ -77,7 +77,7 @@ esp_err_t esp_isp_blc_enable(isp_proc_handle_t isp_proc)
7777
esp_err_t esp_isp_blc_set_correction_offset(isp_proc_handle_t isp_proc, esp_isp_blc_offset_t *offset)
7878
{
7979
ESP_RETURN_ON_FALSE(isp_proc && offset, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
80-
ESP_RETURN_ON_FALSE(isp_proc->blc_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "blc isn't enabled yet");
80+
ESP_RETURN_ON_FALSE(atomic_load(&isp_proc->blc_fsm) == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "blc isn't enabled yet");
8181

8282
// Set correction offset for each channel
8383
isp_ll_blc_set_correction_offset(isp_proc->hal.hw, offset->top_left_chan_offset, offset->top_right_chan_offset, offset->bottom_left_chan_offset, offset->bottom_right_chan_offset);
@@ -92,11 +92,11 @@ esp_err_t esp_isp_blc_set_correction_offset(isp_proc_handle_t isp_proc, esp_isp_
9292
esp_err_t esp_isp_blc_disable(isp_proc_handle_t isp_proc)
9393
{
9494
ESP_RETURN_ON_FALSE(isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
95-
ESP_RETURN_ON_FALSE(isp_proc->blc_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "blc isn't enabled yet");
95+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
96+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&isp_proc->blc_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "blc isn't enabled yet");
9697

9798
// Disable BLC module
9899
isp_ll_blc_enable(isp_proc->hal.hw, false);
99-
isp_proc->blc_fsm = ISP_FSM_INIT;
100100

101101
ESP_LOGD(TAG, "BLC disabled");
102102
return ESP_OK;

‎components/esp_driver_isp/src/isp_ccm.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ esp_err_t esp_isp_ccm_configure(isp_proc_handle_t proc, const esp_isp_ccm_config
3434
esp_err_t esp_isp_ccm_enable(isp_proc_handle_t proc)
3535
{
3636
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
37+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
38+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->ccm_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "ccm is enabled already");
3739

3840
portENTER_CRITICAL(&proc->spinlock);
3941
isp_ll_ccm_enable(proc->hal.hw, true);
@@ -45,6 +47,8 @@ esp_err_t esp_isp_ccm_enable(isp_proc_handle_t proc)
4547
esp_err_t esp_isp_ccm_disable(isp_proc_handle_t proc)
4648
{
4749
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
50+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
51+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->ccm_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "ccm isn't enabled yet");
4852

4953
portENTER_CRITICAL(&proc->spinlock);
5054
isp_ll_ccm_enable(proc->hal.hw, false);

‎components/esp_driver_isp/src/isp_color.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -49,21 +49,21 @@ esp_err_t esp_isp_color_configure(isp_proc_handle_t proc, const esp_isp_color_co
4949
esp_err_t esp_isp_color_enable(isp_proc_handle_t proc)
5050
{
5151
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
52-
ESP_RETURN_ON_FALSE(proc->color_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "color is enabled already");
52+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
53+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->color_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "color is enabled already");
5354

5455
isp_ll_color_enable(proc->hal.hw, true);
55-
proc->color_fsm = ISP_FSM_ENABLE;
5656

5757
return ESP_OK;
5858
}
5959

6060
esp_err_t esp_isp_color_disable(isp_proc_handle_t proc)
6161
{
6262
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
63-
ESP_RETURN_ON_FALSE(proc->color_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "color isn't enabled yet");
63+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
64+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->color_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "color isn't enabled yet");
6465

6566
isp_ll_color_enable(proc->hal.hw, false);
66-
proc->color_fsm = ISP_FSM_INIT;
6767

6868
return ESP_OK;
6969
}

‎components/esp_driver_isp/src/isp_core.c‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,16 @@ esp_err_t esp_isp_new_processor(const esp_isp_processor_cfg_t *proc_config, isp_
119119
isp_ll_set_clock_div(proc->hal.hw, &clk_div);
120120
}
121121
proc->clk_src = clk_src;
122-
proc->isp_fsm = ISP_FSM_INIT;
122+
atomic_init(&proc->isp_fsm, ISP_FSM_INIT);
123+
atomic_init(&proc->bf_fsm, ISP_FSM_INIT);
124+
atomic_init(&proc->blc_fsm, ISP_FSM_INIT);
125+
atomic_init(&proc->ccm_fsm, ISP_FSM_INIT);
126+
atomic_init(&proc->color_fsm, ISP_FSM_INIT);
127+
atomic_init(&proc->demosaic_fsm, ISP_FSM_INIT);
128+
atomic_init(&proc->gamma_fsm, ISP_FSM_INIT);
129+
atomic_init(&proc->lsc_fsm, ISP_FSM_INIT);
130+
atomic_init(&proc->sharpen_fsm, ISP_FSM_INIT);
131+
atomic_init(&proc->wbg_fsm, ISP_FSM_INIT);
123132
proc->spinlock = (portMUX_TYPE)portMUX_INITIALIZER_UNLOCKED;
124133

125134
//Input & Output color format
@@ -189,7 +198,7 @@ esp_err_t esp_isp_new_processor(const esp_isp_processor_cfg_t *proc_config, isp_
189198
esp_err_t esp_isp_del_processor(isp_proc_handle_t proc)
190199
{
191200
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
192-
ESP_RETURN_ON_FALSE(proc->isp_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "processor isn't in init state");
201+
ESP_RETURN_ON_FALSE(atomic_load(&proc->isp_fsm) == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "processor isn't in init state");
193202

194203
//declaim first, then do free
195204
ESP_RETURN_ON_ERROR(s_isp_declaim_processor(proc), TAG, "declaim processor fail");
@@ -205,7 +214,7 @@ esp_err_t esp_isp_del_processor(isp_proc_handle_t proc)
205214
esp_err_t esp_isp_register_event_callbacks(isp_proc_handle_t proc, const esp_isp_evt_cbs_t *cbs, void *user_data)
206215
{
207216
ESP_RETURN_ON_FALSE(proc && cbs, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
208-
ESP_RETURN_ON_FALSE(proc->isp_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "processor isn't in the init state");
217+
ESP_RETURN_ON_FALSE(atomic_load(&proc->isp_fsm) == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "processor isn't in the init state");
209218

210219
#if CONFIG_ISP_ISR_IRAM_SAFE
211220
if (cbs->on_sharpen_frame_done) {
@@ -230,22 +239,22 @@ esp_err_t esp_isp_register_event_callbacks(isp_proc_handle_t proc, const esp_isp
230239
esp_err_t esp_isp_enable(isp_proc_handle_t proc)
231240
{
232241
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
233-
ESP_RETURN_ON_FALSE(proc->isp_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "processor isn't in init state");
242+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
243+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->isp_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "processor isn't in init state");
234244
ESP_RETURN_ON_FALSE(proc->bypass_isp == false, ESP_ERR_INVALID_STATE, TAG, "processor is configured to be bypassed");
235245

236246
isp_ll_enable(proc->hal.hw, true);
237-
proc->isp_fsm = ISP_FSM_ENABLE;
238247

239248
return ESP_OK;
240249
}
241250

242251
esp_err_t esp_isp_disable(isp_proc_handle_t proc)
243252
{
244253
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
245-
ESP_RETURN_ON_FALSE(proc->isp_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "processor isn't in enable state");
254+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
255+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->isp_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "processor isn't in enable state");
246256

247257
isp_ll_enable(proc->hal.hw, false);
248-
proc->isp_fsm = ISP_FSM_INIT;
249258

250259
return ESP_OK;
251260
}

‎components/esp_driver_isp/src/isp_demosaic.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -46,24 +46,24 @@ esp_err_t esp_isp_demosaic_configure(isp_proc_handle_t proc, const esp_isp_demos
4646
esp_err_t esp_isp_demosaic_enable(isp_proc_handle_t proc)
4747
{
4848
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
49-
ESP_RETURN_ON_FALSE(proc->demosaic_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "demosaic is enabled already");
49+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
50+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->demosaic_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "demosaic is enabled already");
5051

5152
isp_ll_demosaic_enable(proc->hal.hw, true);
52-
proc->demosaic_fsm = ISP_FSM_ENABLE;
5353

5454
return ESP_OK;
5555
}
5656

5757
esp_err_t esp_isp_demosaic_disable(isp_proc_handle_t proc)
5858
{
5959
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
60-
ESP_RETURN_ON_FALSE(proc->demosaic_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "demosaic isn't enabled yet");
60+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
61+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->demosaic_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "demosaic isn't enabled yet");
6162

6263
if (proc->out_color_format.color_space == (uint32_t)COLOR_SPACE_RAW) {
6364
// for other out_color_format, demosaic module is needed for rgb interpolation algorithm
6465
isp_ll_demosaic_enable(proc->hal.hw, false);
6566
}
66-
proc->demosaic_fsm = ISP_FSM_INIT;
6767

6868
return ESP_OK;
6969
}

‎components/esp_driver_isp/src/isp_gamma.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ esp_err_t esp_isp_gamma_configure(isp_proc_handle_t proc, color_component_t comp
5858
esp_err_t esp_isp_gamma_enable(isp_proc_handle_t proc)
5959
{
6060
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
61+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
62+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->gamma_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "gamma is enabled already");
6163

6264
portENTER_CRITICAL(&proc->spinlock);
6365
isp_ll_gamma_enable(proc->hal.hw, true);
@@ -69,6 +71,8 @@ esp_err_t esp_isp_gamma_enable(isp_proc_handle_t proc)
6971
esp_err_t esp_isp_gamma_disable(isp_proc_handle_t proc)
7072
{
7173
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
74+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
75+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->gamma_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "gamma is disabled already");
7276

7377
portENTER_CRITICAL(&proc->spinlock);
7478
isp_ll_gamma_enable(proc->hal.hw, false);

‎components/esp_driver_isp/src/isp_lsc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const char *TAG = "ISP_LSC";
2828
esp_err_t esp_isp_lsc_allocate_gain_array(isp_proc_handle_t isp_proc, esp_isp_lsc_gain_array_t *gain_array, size_t *out_array_size_per_channel)
2929
{
3030
ESP_RETURN_ON_FALSE(isp_proc && gain_array && out_array_size_per_channel, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
31-
ESP_RETURN_ON_FALSE(isp_proc->lsc_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "lsc is enabled already");
31+
ESP_RETURN_ON_FALSE(atomic_load(&isp_proc->lsc_fsm) == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "lsc is enabled already");
3232

3333
int num_grids_x_max = ISP_LSC_GET_GRIDS(ISP_LL_HSIZE_MAX);
3434
int num_grids_y_max = ISP_LSC_GET_GRIDS(ISP_LL_VSIZE_MAX);
@@ -89,21 +89,21 @@ esp_err_t esp_isp_lsc_configure(isp_proc_handle_t isp_proc, const esp_isp_lsc_co
8989
esp_err_t esp_isp_lsc_enable(isp_proc_handle_t isp_proc)
9090
{
9191
ESP_RETURN_ON_FALSE(isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
92-
ESP_RETURN_ON_FALSE(isp_proc->lsc_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "lsc is enabled already");
92+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
93+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&isp_proc->lsc_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "lsc is enabled already");
9394

9495
isp_ll_lsc_enable(isp_proc->hal.hw, true);
95-
isp_proc->lsc_fsm = ISP_FSM_ENABLE;
9696

9797
return ESP_OK;
9898
}
9999

100100
esp_err_t esp_isp_lsc_disable(isp_proc_handle_t isp_proc)
101101
{
102102
ESP_RETURN_ON_FALSE(isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
103-
ESP_RETURN_ON_FALSE(isp_proc->lsc_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "lsc isn't enabled yet");
103+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
104+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&isp_proc->lsc_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "lsc isn't enabled yet");
104105

105106
isp_ll_lsc_enable(isp_proc->hal.hw, false);
106-
isp_proc->lsc_fsm = ISP_FSM_INIT;
107107

108108
return ESP_OK;
109109
}

‎components/esp_driver_isp/src/isp_sharpen.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -51,23 +51,23 @@ esp_err_t esp_isp_sharpen_configure(isp_proc_handle_t proc, const esp_isp_sharpe
5151
esp_err_t esp_isp_sharpen_enable(isp_proc_handle_t proc)
5252
{
5353
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
54-
ESP_RETURN_ON_FALSE(proc->sharpen_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "sharpen is enabled already");
54+
isp_fsm_t expected_fsm = ISP_FSM_INIT;
55+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->sharpen_fsm, &expected_fsm, ISP_FSM_ENABLE), ESP_ERR_INVALID_STATE, TAG, "sharpen is enabled already");
5556

5657
isp_ll_enable_intr(proc->hal.hw, ISP_LL_EVENT_SHARP_FRAME, true);
5758
isp_ll_sharp_enable(proc->hal.hw, true);
58-
proc->sharpen_fsm = ISP_FSM_ENABLE;
5959

6060
return ESP_OK;
6161
}
6262

6363
esp_err_t esp_isp_sharpen_disable(isp_proc_handle_t proc)
6464
{
6565
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
66-
ESP_RETURN_ON_FALSE(proc->sharpen_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "sharpen isn't enabled yet");
66+
isp_fsm_t expected_fsm = ISP_FSM_ENABLE;
67+
ESP_RETURN_ON_FALSE(atomic_compare_exchange_strong(&proc->sharpen_fsm, &expected_fsm, ISP_FSM_INIT), ESP_ERR_INVALID_STATE, TAG, "sharpen isn't enabled yet");
6768

6869
isp_ll_sharp_enable(proc->hal.hw, false);
6970
isp_ll_enable_intr(proc->hal.hw, ISP_LL_EVENT_SHARP_FRAME, false);
70-
proc->sharpen_fsm = ISP_FSM_INIT;
7171

7272
return ESP_OK;
7373
}

0 commit comments

Comments
 (0)