stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dptx: Streams now start at index 1 instead of 0.

Browse source 
To follow the IP documentation.

Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
This commit is contained in:
Andrei-Liviu Simion 2015-01-22 23:10:41 -08:00 • committed by Nava kishore Manne
parent f06d5e04dc
commit 6001213d68
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
XilinxProcessorIPLib/drivers/dptx/examples/xdptx_example_common.c
View file

@ -269,24 +269,24 @@ static void Dptx_StartVideoStream(XDptx *InstancePtr)
u8 Edid[XDPTX_EDID_BLOCK_SIZE]; u8 Edid[XDPTX_EDID_BLOCK_SIZE];
/* Set the bits per color. If not set, the default is 6. */ /* Set the bits per color. If not set, the default is 6. */
XDptx_CfgMsaSetBpc(InstancePtr, XDPTX_STREAM_ID0, 8); XDptx_CfgMsaSetBpc(InstancePtr, XDPTX_STREAM_ID1, 8);
/* Set synchronous clock mode. */ /* Set synchronous clock mode. */
XDptx_CfgMsaEnSynchClkMode(InstancePtr, XDPTX_STREAM_ID0, 1); XDptx_CfgMsaEnSynchClkMode(InstancePtr, XDPTX_STREAM_ID1, 1);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID0);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID1); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID1);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID2); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID2);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID3); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID3);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID4);
/* Choose a method for selecting the video mode. There are 3 ways to do this: /* Choose a method for selecting the video mode. There are 3 ways to do this:
* 1) Use the preferred timing from the monitor's EDID: * 1) Use the preferred timing from the monitor's EDID:
* u8 Edid[XDPTX_EDID_BLOCK_SIZE]; * u8 Edid[XDPTX_EDID_BLOCK_SIZE];
* XDptx_GetEdid(InstancePtr, Edid); * XDptx_GetEdid(InstancePtr, Edid);
* XDptx_CfgMsaUseEdidPreferredTiming(InstancePtr, XDPTX_STREAM_ID0, Edid); * XDptx_CfgMsaUseEdidPreferredTiming(InstancePtr, XDPTX_STREAM_ID1, Edid);
* *
* 2) Use a standard video timing mode (see mode_table.h): * 2) Use a standard video timing mode (see mode_table.h):
* XDptx_CfgMsaUseStandardVideoMode(InstancePtr, XDPTX_STREAM_ID0, * XDptx_CfgMsaUseStandardVideoMode(InstancePtr, XDPTX_STREAM_ID1,
XVIDC_VM_640x480_60_P); XVIDC_VM_640x480_60_P);
* *
* 3) Use a custom configuration for the main stream attributes (MSA): * 3) Use a custom configuration for the main stream attributes (MSA):
@ -302,7 +302,7 @@ static void Dptx_StartVideoStream(XDptx *InstancePtr)
* MsaConfigCustom.Dmt.VFrontPorch = 1; * MsaConfigCustom.Dmt.VFrontPorch = 1;
* MsaConfigCustom.Dmt.VSyncPulseWidth = 3; * MsaConfigCustom.Dmt.VSyncPulseWidth = 3;
* MsaConfigCustom.Dmt.VBackPorch = 38; * MsaConfigCustom.Dmt.VBackPorch = 38;
* XDptx_CfgMsaUseCustom(InstancePtr, XDPTX_STREAM_ID0, * XDptx_CfgMsaUseCustom(InstancePtr, XDPTX_STREAM_ID1,
* &MsaConfigCustom, 1); * &MsaConfigCustom, 1);
* *
* To override the user pixel width: * To override the user pixel width:
@ -313,10 +313,10 @@ static void Dptx_StartVideoStream(XDptx *InstancePtr)
Status = XDptx_GetEdid(InstancePtr, Edid); Status = XDptx_GetEdid(InstancePtr, Edid);
if (Status == XST_SUCCESS) { if (Status == XST_SUCCESS) {
XDptx_CfgMsaUseEdidPreferredTiming(InstancePtr, XDptx_CfgMsaUseEdidPreferredTiming(InstancePtr,
XDPTX_STREAM_ID0, Edid); XDPTX_STREAM_ID1, Edid);
} }
else { else {
XDptx_CfgMsaUseStandardVideoMode(InstancePtr, XDPTX_STREAM_ID0, XDptx_CfgMsaUseStandardVideoMode(InstancePtr, XDPTX_STREAM_ID1,
XVIDC_VM_640x480_60_P); XVIDC_VM_640x480_60_P);
} }
@ -332,7 +332,7 @@ static void Dptx_StartVideoStream(XDptx *InstancePtr)
XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_SOFT_RESET, 0x0); XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_SOFT_RESET, 0x0);
/* Set the DisplayPort TX video mode. */ /* Set the DisplayPort TX video mode. */
XDptx_SetVideoMode(InstancePtr, XDPTX_STREAM_ID0); XDptx_SetVideoMode(InstancePtr, XDPTX_STREAM_ID1);
/* Configure video stream source or generator here. These function need /* Configure video stream source or generator here. These function need
* to be implemented in order for video to be displayed and is hardware * to be implemented in order for video to be displayed and is hardware

48
XilinxProcessorIPLib/drivers/dptx/examples/xdptx_mst_example.c
View file

@ -77,10 +77,10 @@
/* Define the mapping between sinks and streams. The sink numbers are in the /* Define the mapping between sinks and streams. The sink numbers are in the
* order that they are discovered by the XDptx_FindAccessibleDpDevices driver * order that they are discovered by the XDptx_FindAccessibleDpDevices driver
* function. */ * function. */
#define STREAM0_USE_SINKNUM 0 #define STREAM1_USE_SINKNUM 0
#define STREAM1_USE_SINKNUM 1 #define STREAM2_USE_SINKNUM 1
#define STREAM2_USE_SINKNUM 2 #define STREAM3_USE_SINKNUM 2
#define STREAM3_USE_SINKNUM 3 #define STREAM4_USE_SINKNUM 3
#endif #endif
/* The video resolution from the display mode timings (DMT) table to use for /* The video resolution from the display mode timings (DMT) table to use for
@ -204,7 +204,7 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
u32 Status; u32 Status;
u32 MaskVal; u32 MaskVal;
u8 StreamIndex; u8 StreamIndex;
XDptx_VideoMode VideoMode = USE_VIDEO_MODE; XVidC_VideoMode VideoMode = USE_VIDEO_MODE;
u8 Bpc = USE_BPC; u8 Bpc = USE_BPC;
u8 NumStreams = NUM_STREAMS; u8 NumStreams = NUM_STREAMS;
@ -233,10 +233,10 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
InstancePtr->SbMsgDelayUs = 0; InstancePtr->SbMsgDelayUs = 0;
#endif #endif
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID0);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID1); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID1);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID2); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID2);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID3); XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID3);
XDptx_ClearMsaValues(InstancePtr, XDPTX_STREAM_ID4);
#ifdef ALLOCATE_FROM_SINKLIST #ifdef ALLOCATE_FROM_SINKLIST
/* Run topology discovery to determine what devices are accessible to /* Run topology discovery to determine what devices are accessible to
@ -263,11 +263,11 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
/* Enable multi-stream transport (MST) mode for this example. */ /* Enable multi-stream transport (MST) mode for this example. */
XDptx_MstCfgModeEnable(InstancePtr); XDptx_MstCfgModeEnable(InstancePtr);
for (StreamIndex = 0; StreamIndex < NumStreams; StreamIndex++) { for (StreamIndex = 0; StreamIndex < NumStreams; StreamIndex++) {
XDptx_MstCfgStreamEnable(InstancePtr, XDPTX_STREAM_ID0 + XDptx_MstCfgStreamEnable(InstancePtr, XDPTX_STREAM_ID1 +
StreamIndex); StreamIndex);
} }
for (StreamIndex = NumStreams; StreamIndex < 4; StreamIndex++) { for (StreamIndex = NumStreams; StreamIndex < 4; StreamIndex++) {
XDptx_MstCfgStreamDisable(InstancePtr, XDPTX_STREAM_ID0 + XDptx_MstCfgStreamDisable(InstancePtr, XDPTX_STREAM_ID1 +
StreamIndex); StreamIndex);
} }
@ -279,31 +279,27 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
u8 Lct; u8 Lct;
u8 Rad[15]; u8 Rad[15];
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID0)) {
Lct = 2; Rad[0] = 8;
XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID0, Lct, Rad);
}
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID1)) { if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID1)) {
Lct = 3; Rad[0] = 1; Rad[1] = 8; Lct = 2; Rad[0] = 8;
XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID1, Lct, Rad); XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID1, Lct, Rad);
} }
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID2)) { if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID2)) {
Lct = 4; Rad[0] = 1; Rad[1] = 1; Rad[2] = 8; Lct = 3; Rad[0] = 1; Rad[1] = 8;
XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID2, Lct, Rad); XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID2, Lct, Rad);
} }
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID3)) { if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID3)) {
Lct = 4; Rad[0] = 1; Rad[1] = 1; Rad[2] = 9; Lct = 4; Rad[0] = 1; Rad[1] = 1; Rad[2] = 8;
XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID3, Lct, Rad); XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID3, Lct, Rad);
} }
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID4)) {
Lct = 4; Rad[0] = 1; Rad[1] = 1; Rad[2] = 9;
XDptx_SetStreamSinkRad(InstancePtr, XDPTX_STREAM_ID4, Lct, Rad);
}
#else #else
/* If topology discovery is used, associate a stream number with a sink /* If topology discovery is used, associate a stream number with a sink
* number from the sink list obtained during topology discovery. The * number from the sink list obtained during topology discovery. The
* sinks are numbered in the order that they were found during topology * sinks are numbered in the order that they were found during topology
* discovery. */ * discovery. */
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID0)) {
XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID0,
STREAM0_USE_SINKNUM);
}
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID1)) { if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID1)) {
XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID1, XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID1,
STREAM1_USE_SINKNUM); STREAM1_USE_SINKNUM);
@ -316,6 +312,10 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID3, XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID3,
STREAM3_USE_SINKNUM); STREAM3_USE_SINKNUM);
} }
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID4)) {
XDptx_SetStreamSelectFromSinkList(InstancePtr, XDPTX_STREAM_ID4,
STREAM4_USE_SINKNUM);
}
#endif #endif
/* Reset MST mode in both the RX and TX. */ /* Reset MST mode in both the RX and TX. */
@ -326,16 +326,16 @@ u32 Dptx_MstExampleRun(XDptx *InstancePtr)
* stream has an identical configuration). Then, set the configuration * stream has an identical configuration). Then, set the configuration
* for that stream in the corresponding DisplayPort TX registers. */ * for that stream in the corresponding DisplayPort TX registers. */
for (StreamIndex = 0; StreamIndex < 4; StreamIndex++) { for (StreamIndex = 0; StreamIndex < 4; StreamIndex++) {
if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID0 + if (XDptx_MstStreamIsEnabled(InstancePtr, XDPTX_STREAM_ID1 +
StreamIndex)) { StreamIndex)) {
XDptx_CfgMsaSetBpc(InstancePtr, XDPTX_STREAM_ID0 + XDptx_CfgMsaSetBpc(InstancePtr, XDPTX_STREAM_ID1 +
StreamIndex, Bpc); StreamIndex, Bpc);
XDptx_CfgMsaEnSynchClkMode(InstancePtr, XDptx_CfgMsaEnSynchClkMode(InstancePtr,
XDPTX_STREAM_ID0 + StreamIndex, 1); XDPTX_STREAM_ID1 + StreamIndex, 1);
XDptx_CfgMsaUseStandardVideoMode(InstancePtr, XDptx_CfgMsaUseStandardVideoMode(InstancePtr,
XDPTX_STREAM_ID0 + StreamIndex, VideoMode); XDPTX_STREAM_ID1 + StreamIndex, VideoMode);
XDptx_SetVideoMode(InstancePtr, XDPTX_STREAM_ID0 + XDptx_SetVideoMode(InstancePtr, XDPTX_STREAM_ID1 +
StreamIndex); StreamIndex);
} }
} }