<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:st1="urn:schemas-microsoft-com:office:smarttags" xmlns="http://www.w3.org/TR/REC-html40"> <head> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii"> <meta name=Generator content="Microsoft Word 11 (filtered medium)"> <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="chsdate"/> <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="chmetcnv"/> <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="PersonName"/>  <style>  </style> </head> <body lang=ZH-TW link=blue vlink=blue> <div class=Section1> Hi Gaetan,<o:p></o:p> Do I need to send the correct patch again to <st1:PersonName w:st="on">xorg-devel@lists.x.org</st1:PersonName>?<o:p></o:p> Could you please help to check the attachment sent by xorg-devel?<o:p></o:p> Do I need to break it down to small ones and resend again?<o:p></o:p> <o:p> </o:p> <div> <div class=MsoNormal align=center style='text-align:center'> <hr size=2 width="100%" align=center tabindex=-1> </div> From: xorg-devel-bounces@lists.x.org [mailto:xorg-devel-bounces@lists.x.org] On Behalf Of Gaetan Nadon Sent: Wednesday, January 27, 2010 10:05 PM To: <st1:PersonName ProductID="Jong Lin" w:st="on">Jong Lin</st1:PersonName> Cc: <st1:PersonName w:st="on">xorg-devel@lists.x.org</st1:PersonName> Subject: RE: [PATCH video-xgi] Add Support-ARM, EXA acceleration,EDID,Custom Modes, Bugs fixed, ...<o:p></o:p> </div> <o:p> </o:p> On Wed, <st1:chsdate IsROCDate="False" IsLunarDate="False" Day="27" Month="1" Year="2010" w:st="on">2010-01-27</st1:chsdate> at 15:55 +0800, <st1:PersonName ProductID="Jong Lin" w:st="on">Jong Lin</st1:PersonName> wrote: <o:p></o:p> Could you please try on the attachment? <o:p></o:p> It applies without error. On Linux it shows a ^M character at the end of each line, which was there before. The XGI team may want to investigate further more and adopt common development practises. Some files are in one format and other files are in another. <o:p></o:p> <o:p> </o:p> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE> <div class=MsoNormal align=center style='text-align:center'> <hr size=2 width="100%" align=center> </div> </blockquote> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE> From:<st1:PersonName ProductID="Jong Lin" w:st="on">Jong Lin</st1:PersonName> Sent: Wednesday, January 27, 2010 11:26 AM To: <st1:PersonName w:st="on">'memsize@videotron.ca'</st1:PersonName> Cc: <st1:PersonName w:st="on">xorg-devel@lists.x.org</st1:PersonName> Subject: RE: [PATCH video-xgi] Add Support-ARM, EXA acceleration, EDID,Custom Modes, Bugs fixed, ... <o:p></o:p> </blockquote> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE>   Hi Gaetan, It might be caused by our editing source code on Windows platform. It might be fixed by convert files by dos2unix. How about your comment?  <o:p></o:p> </blockquote> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE> <div class=MsoNormal align=center style='text-align:center'> <hr size=2 width="100%" align=center> </div> </blockquote> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE> From:xorg-devel-bounces@lists.x.org [mailto:xorg-devel-bounces@lists.x.org] On Behalf Of Gaetan Nadon Sent: Monday, January 25, 2010 9:43 PM To: <st1:PersonName ProductID="Jong Lin" w:st="on">Jong Lin</st1:PersonName> Cc: <st1:PersonName w:st="on">xorg-devel@lists.x.org</st1:PersonName> Subject: Re: [PATCH video-xgi] Add Support-ARM, EXA acceleration, EDID,Custom Modes, Bugs fixed, ... <o:p></o:p> </blockquote> <blockquote style='margin-top:5.0pt;margin-bottom:5.0pt' TYPE=CITE>   On Mon, <st1:chsdate IsROCDate="False" IsLunarDate="False" Day="25" Month="1" Year="2010" w:st="on">2010-01-25</st1:chsdate> at 16:29 +0800, <st1:PersonName ProductID="Jong Lin" w:st="on">Jong Lin</st1:PersonName> wrote: This patch includes the following enhancements and some bug fixings. (1). Support ARM (2). Support EXA acceleration (3). Support EDID with I<st1:chmetcnv TCSC="0" NumberType="1" Negative="False" HasSpace="False" SourceValue="2" UnitName="C" w:st="on">2C</st1:chmetcnv> function (4). Support Custom Modes of modeline (5). Unify code for x86, PowerPC, ARM I used 'git apply --check' to verify the patch would apply but it doesn't I get errors like: error: patch failed: src/init.c:1 <o:p></o:p> <pre><o:p> </o:p></pre><pre> <o:p></o:p></pre><pre>error: src/init.c: patch does not apply<o:p></o:p></pre> The patch shows that the whole content of the init.c file has changed, but I can't see any real code difference. Then I remembered about code page issues when translators worked from different platforms (Unix, Windows...). I checked the file with the 'file' command:<o:p></o:p> <pre><o:p> </o:p></pre><pre> <o:p></o:p></pre><pre>init.c:        ASCII C program text, with CRLF line terminators<o:p></o:p></pre><pre>vb_ext.c:      ASCII C program text<o:p></o:p></pre><pre>vb_init.c:     ASCII C program text, with CRLF line terminators<o:p></o:p></pre><pre>vb_setmode.c:  ASCII C program text, with CRLF line terminators<o:p></o:p></pre><pre>xgi_accel.c:   ASCII C program text, with CRLF line terminators<o:p></o:p></pre><pre>xgi_cursor.c:  ASCII C program text<o:p></o:p></pre><pre>xgi_dac.c:     ASCII C program text<o:p></o:p></pre><pre>xgi_dga.c:     ASCII C program text<o:p></o:p></pre><pre>xgi_dri.c:     ASCII C program text<o:p></o:p></pre><pre>xgi_driver.c:  ASCII C program text, with CRLF, LF line terminators<o:p></o:p></pre><pre>xgi_opt.c:     ASCII C program text<o:p></o:p></pre><pre>xgi_setup.c:   ASCII C program text, with CRLF, LF line terminators<o:p></o:p></pre><pre>xgi_vb.c:      ASCII C program text<o:p></o:p></pre><pre>xgi_vga.c:     ASCII C program text, with CRLF line terminators<o:p></o:p></pre><pre>xgi_video.c:   ASCII C program text<o:p></o:p></pre><pre>xgi_videohw.c: ASCII C program text<o:p></o:p></pre><pre> <o:p></o:p></pre> It just so happens that the files giving errors are the one with CRLF terminators. Most likely, xgi developers edit code on platforms having different file formats. I did a quick scan on other drivers and I have not seen files with CRLF terminators. It's just a theory for now, most likely others have seen this before and know of to fix it. <o:p></o:p> </blockquote> </div> </body> </html>