Skip to content

Commit

Permalink
Merge branch 'fix/fix_csi_c2m_cache_ops' into 'master'
Browse files Browse the repository at this point in the history
camera: fixed csi and isp_dvp c2m cache ops

See merge request espressif/esp-idf!32279
  • Loading branch information
Icarus113 committed Jul 23, 2024
2 parents 18d9ac4 + e06d013 commit a22a60c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion components/esp_driver_cam/csi/src/esp_cam_ctlr_csi.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ IRAM_ATTR static bool csi_dma_trans_done_callback(dw_gdma_channel_handle_t chan,
dw_gdma_channel_enable_ctrl(chan, true);

if ((ctlr->trans.buffer != ctlr->backup_buffer) || ctlr->bk_buffer_exposed) {
esp_err_t ret = esp_cache_msync((void *)(ctlr->trans.buffer), ctlr->trans.received_size, ESP_CACHE_MSYNC_FLAG_INVALIDATE);
esp_err_t ret = esp_cache_msync((void *)(ctlr->trans.buffer), ctlr->trans.received_size, ESP_CACHE_MSYNC_FLAG_DIR_M2C);
assert(ret == ESP_OK);
assert(ctlr->cbs.on_trans_finished);
if (ctlr->cbs.on_trans_finished) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ IRAM_ATTR static bool s_dvp_dma_trans_done_callback(dw_gdma_channel_handle_t cha
dw_gdma_channel_enable_ctrl(chan, true);

if ((dvp_ctlr->trans.buffer != dvp_ctlr->backup_buffer) || dvp_ctlr->bk_buffer_exposed) {
esp_err_t ret = esp_cache_msync((void *)(dvp_ctlr->trans.buffer), dvp_ctlr->trans.received_size, ESP_CACHE_MSYNC_FLAG_INVALIDATE);
esp_err_t ret = esp_cache_msync((void *)(dvp_ctlr->trans.buffer), dvp_ctlr->trans.received_size, ESP_CACHE_MSYNC_FLAG_DIR_M2C);
assert(ret == ESP_OK);
assert(dvp_ctlr->cbs.on_trans_finished);
if (dvp_ctlr->cbs.on_trans_finished) {
Expand Down

0 comments on commit a22a60c

Please sign in to comment.