Merge branch 'fix/fix_async_color_convert_csc_v6.1' into 'release/v6.1'

fix(dma2d): fix async color convert csc check (v6.1)

See merge request espressif/esp-idf!50238
This commit is contained in:
Jiang Jiang Jian
2026-07-16 10:43:55 +08:00
2 changed files with 22 additions and 4 deletions
@@ -135,7 +135,8 @@ typedef enum {
* Assuming the original pixel byte order (from MSB to LSB) is 2-1-0 .
*/
typedef enum {
DMA2D_SCRAMBLE_ORDER_BYTE2_1_0, /*!< 2D-DMA pixel data scrambled as BYTE2-1-0 (no scramble) */
DMA2D_SCRAMBLE_ORDER_NONE, /*!< 2D-DMA pixel data not scrambled */
DMA2D_SCRAMBLE_ORDER_BYTE2_1_0 = DMA2D_SCRAMBLE_ORDER_NONE, /*!< 2D-DMA pixel data scrambled as BYTE2-1-0 (no scramble) */
DMA2D_SCRAMBLE_ORDER_BYTE2_0_1, /*!< 2D-DMA pixel data scrambled as BYTE2-0-1 */
DMA2D_SCRAMBLE_ORDER_BYTE1_0_2, /*!< 2D-DMA pixel data scrambled as BYTE1-0-2 */
DMA2D_SCRAMBLE_ORDER_BYTE1_2_0, /*!< 2D-DMA pixel data scrambled as BYTE1-2-0 */