Module Name:    xsrc
Committed By:   mrg
Date:           Tue Aug 10 02:57:44 UTC 2010

Modified Files:
        xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c

Log Message:
pull across a patch from git 11005146d6defa876a988daad587ae558f04ecbb:

From: Alex Deucher <[email protected]>
Date: Tue, 10 Aug 2010 02:18:53 +0000
Subject: atom: upstream parser update

fixes digital output problems on evergreen asics


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
    xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.1.1.3 xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.1.1.3	Sun May 23 06:09:26 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c	Tue Aug 10 02:57:44 2010
@@ -505,13 +505,16 @@
 
 VOID ProcessMask(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
 {
+    UINT8 src;
 
     pParserTempData->DestData32=GetDestination[pParserTempData->ParametersType.Destination](pParserTempData);
+    src = pParserTempData->CD_Mask.SrcAlignment;
     pParserTempData->SourceData32=GetParametersDirect(pParserTempData);
     pParserTempData->Index=GetSource[pParserTempData->ParametersType.Source](pParserTempData);
     pParserTempData->SourceData32 <<= DestinationAlignmentShift[pParserTempData->CD_Mask.DestAlignment];
     pParserTempData->SourceData32 |= ~(AlignmentMask[pParserTempData->CD_Mask.SrcAlignment] << DestinationAlignmentShift[pParserTempData->CD_Mask.DestAlignment]);
     pParserTempData->DestData32   &= pParserTempData->SourceData32;
+    pParserTempData->Index        >>= SourceAlignmentShift[src];
     pParserTempData->Index        &= AlignmentMask[pParserTempData->CD_Mask.SrcAlignment];
     pParserTempData->Index        <<= DestinationAlignmentShift[pParserTempData->CD_Mask.DestAlignment];
     pParserTempData->DestData32   |= pParserTempData->Index;

Reply via email to