Update mdp5_pipe to incorporate SSPP_NONE and SSPP_CURSORx pipes
Signed-off-by: Archit Taneja architt@codeaurora.org --- rnndb/mdp/mdp5.xml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/rnndb/mdp/mdp5.xml b/rnndb/mdp/mdp5.xml index 49aa207..a5ae1e3 100644 --- a/rnndb/mdp/mdp5.xml +++ b/rnndb/mdp/mdp5.xml @@ -47,16 +47,19 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd"> </enum>
<enum name="mdp5_pipe"> - <value name="SSPP_VIG0" value="0"/> - <value name="SSPP_VIG1" value="1"/> - <value name="SSPP_VIG2" value="2"/> - <value name="SSPP_RGB0" value="3"/> - <value name="SSPP_RGB1" value="4"/> - <value name="SSPP_RGB2" value="5"/> - <value name="SSPP_DMA0" value="6"/> - <value name="SSPP_DMA1" value="7"/> - <value name="SSPP_VIG3" value="8"/> - <value name="SSPP_RGB3" value="9"/> + <value name="SSPP_NONE" value="0"/> + <value name="SSPP_VIG0" value="1"/> + <value name="SSPP_VIG1" value="2"/> + <value name="SSPP_VIG2" value="3"/> + <value name="SSPP_RGB0" value="4"/> + <value name="SSPP_RGB1" value="5"/> + <value name="SSPP_RGB2" value="6"/> + <value name="SSPP_DMA0" value="7"/> + <value name="SSPP_DMA1" value="8"/> + <value name="SSPP_VIG3" value="9"/> + <value name="SSPP_RGB3" value="10"/> + <value name="SSPP_CURSOR0" value="11"/> + <value name="SSPP_CURSOR1" value="12"/> </enum>
<enum name="mdp5_format"> @@ -291,7 +294,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd"> <value name="DATA_FORMAT_YUV" value="1"/> </enum>
- <array doffsets="mdp5_cfg->pipe_vig.base[0],mdp5_cfg->pipe_vig.base[1],mdp5_cfg->pipe_vig.base[2],mdp5_cfg->pipe_rgb.base[0],mdp5_cfg->pipe_rgb.base[1],mdp5_cfg->pipe_rgb.base[2],mdp5_cfg->pipe_dma.base[0],mdp5_cfg->pipe_dma.base[1],mdp5_cfg->pipe_vig.base[3],mdp5_cfg->pipe_rgb.base[3]" name="PIPE" length="10" stride="0x400" index="mdp5_pipe"> + <array doffsets="INVALID_IDX(idx),mdp5_cfg->pipe_vig.base[0],mdp5_cfg->pipe_vig.base[1],mdp5_cfg->pipe_vig.base[2],mdp5_cfg->pipe_rgb.base[0],mdp5_cfg->pipe_rgb.base[1],mdp5_cfg->pipe_rgb.base[2],mdp5_cfg->pipe_dma.base[0],mdp5_cfg->pipe_dma.base[1],mdp5_cfg->pipe_vig.base[3],mdp5_cfg->pipe_rgb.base[3],mdp5_cfg->pipe_cursor.base[0],mdp5_cfg->pipe_cursor.base[1]" name="PIPE" length="10" stride="0x400" index="mdp5_pipe"> <reg32 offset="0x200" name="OP_MODE"> <bitfield name="CSC_DST_DATA_FORMAT" pos="19" type="mdp5_data_format"/> <bitfield name="CSC_SRC_DATA_FORMAT" pos="18" type="mdp5_data_format"/>