Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpu: ipu-v3: Rename and add IDMAC channels

Rename the ENC/VF/PP rotation channel names, to be more consistent
with the convention that *_MEM is write-to-memory channels and
MEM_* is read-from-memory channels. Also add the channels who's
source and destination is the IC.

Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

authored by

Steve Longerbeam and committed by
Philipp Zabel
c2d670fd ba07975f

+14 -6
+14 -6
drivers/gpu/ipu-v3/ipu-prv.h
··· 28 28 #define IPUV3_CHANNEL_CSI1 1 29 29 #define IPUV3_CHANNEL_CSI2 2 30 30 #define IPUV3_CHANNEL_CSI3 3 31 + #define IPUV3_CHANNEL_VDI_MEM_IC_VF 5 32 + #define IPUV3_CHANNEL_MEM_IC_PP 11 33 + #define IPUV3_CHANNEL_MEM_IC_PRP_VF 12 34 + #define IPUV3_CHANNEL_G_MEM_IC_PRP_VF 14 35 + #define IPUV3_CHANNEL_G_MEM_IC_PP 15 36 + #define IPUV3_CHANNEL_IC_PRP_ENC_MEM 20 37 + #define IPUV3_CHANNEL_IC_PRP_VF_MEM 21 38 + #define IPUV3_CHANNEL_IC_PP_MEM 22 31 39 #define IPUV3_CHANNEL_MEM_BG_SYNC 23 32 40 #define IPUV3_CHANNEL_MEM_FG_SYNC 27 33 41 #define IPUV3_CHANNEL_MEM_DC_SYNC 28 34 42 #define IPUV3_CHANNEL_MEM_FG_SYNC_ALPHA 31 35 43 #define IPUV3_CHANNEL_MEM_DC_ASYNC 41 36 - #define IPUV3_CHANNEL_ROT_ENC_MEM 45 37 - #define IPUV3_CHANNEL_ROT_VF_MEM 46 38 - #define IPUV3_CHANNEL_ROT_PP_MEM 47 39 - #define IPUV3_CHANNEL_ROT_ENC_MEM_OUT 48 40 - #define IPUV3_CHANNEL_ROT_VF_MEM_OUT 49 41 - #define IPUV3_CHANNEL_ROT_PP_MEM_OUT 50 44 + #define IPUV3_CHANNEL_MEM_ROT_ENC 45 45 + #define IPUV3_CHANNEL_MEM_ROT_VF 46 46 + #define IPUV3_CHANNEL_MEM_ROT_PP 47 47 + #define IPUV3_CHANNEL_ROT_ENC_MEM 48 48 + #define IPUV3_CHANNEL_ROT_VF_MEM 49 49 + #define IPUV3_CHANNEL_ROT_PP_MEM 50 42 50 #define IPUV3_CHANNEL_MEM_BG_SYNC_ALPHA 51 43 51 44 52 #define IPU_MCU_T_DEFAULT 8