Produced by Araxis Merge on 2014/12/24 上午 02:01:45. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\Users\gcwang\Desktop | iii | Tue Dec 23 17:29:42 2014 UTC |
| 2 | C:\Users\gcwang\Desktop | iii2 | Tue Dec 23 17:33:34 2014 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 13 | 80 |
| Changed | 4 | 25 |
| Inserted | 4 | 16 |
| Removed | 4 | 4 |
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | [drm:intel _set_confi g_compute_ mode_chang es], compu ted change s for [CRT C:3], mode _changed=1 , fb_chang ed=0 | 1 | [drm:intel _set_confi g_compute_ mode_chang es], compu ted change s for [CRT C:3], mode _changed=1 , fb_chang ed=0 | |||
| 2 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR : 19 :DP- 1 ] to [NOCRTC] | 2 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR : 22 :DP- 2 ] to [NOCRTC] | |||
| 3 | [drm:intel _modeset_s tage_outpu t_state], encoder ch anged, ful l mode swi tch | 3 | [drm:intel _modeset_s tage_outpu t_state], encoder ch anged, ful l mode swi tch | |||
| 4 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR :10:eDP-1] to [CRTC: 5] | 4 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR :10:eDP-1] to [CRTC: 5] | |||
| 5 | [drm:intel _modeset_s tage_outpu t_state], crtc chang ed, full m ode switch | 5 | [drm:intel _modeset_s tage_outpu t_state], crtc chang ed, full m ode switch | |||
| 6 | [drm:intel _modeset_s tage_outpu t_state], crtc disab led, full mode switc h | 6 | [drm:intel _modeset_s tage_outpu t_state], crtc disab led, full mode switc h | |||
| 7 | [drm:intel _modeset_a ffected_pi pes], set mode pipe masks: mod eset: 0, p repare: 0, disable: 1 | 7 | [drm:intel _modeset_a ffected_pi pes], set mode pipe masks: mod eset: 0, p repare: 0, disable: 1 | |||
| 8 | [drm:intel _update_fb c], disabl ed per chi p default | 8 | [drm:intel _update_fb c], disabl ed per chi p default | |||
| 9 | [drm:intel _connector _check_sta te], [CONN ECTOR:10:e DP-1] | 9 | [drm:intel _connector _check_sta te], [CONN ECTOR:10:e DP-1] | |||
| 10 | [drm:intel _crtc_curs or_set], c ursor off | 10 | [drm:intel _crtc_curs or_set], c ursor off | |||
| 11 | [drm:intel _crtc_set_ config], [CRTC:5] [FB:2 8 ] #connector s=1 (x y) (0 0) | 11 | [drm:intel _hpd_irq_h andler], h otplug eve nt receive d, stat 0x 00400000 | |||
| 12 | [drm:intel _hpd_irq_h andler], R eceived HP D interrup t on PIN 5 - cnt: 0 | |||||
| 13 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||||
| 14 | [drm:intel _dp_get_dp cd], DPCD: 12 14 c4 01 00 15 0 1 83 02 00 00 00 00 00 01 | |||||
| 15 | [drm:intel _dp_get_dp cd], Displ ayport TPS 3 supporte d | |||||
| 16 | [drm:intel _dp_probe_ oui], Sink OUI: 0000 00 | |||||
| 17 | [drm:intel _dp_probe_ oui], Bran ch OUI: 90 cc24 | |||||
| 18 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||||
| 19 | [drm:intel _crtc_set_ config], [CRTC:5] [FB:2 6 ] #connector s=1 (x y) (0 0) | |||||
| 12 | [drm:intel _set_confi g_compute_ mode_chang es], compu ted change s for [CRT C:5], mode _changed=0 , fb_chang ed=1 | 20 | [drm:intel _set_confi g_compute_ mode_chang es], compu ted change s for [CRT C:5], mode _changed=0 , fb_chang ed=1 | |||
| 13 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR :10:eDP-1] to [CRTC: 5] | 21 | [drm:intel _modeset_s tage_outpu t_state], [CONNECTOR :10:eDP-1] to [CRTC: 5] | |||
| 14 | [drm:intel _edp_psr_m atch_condi tions], PS R disable by flag | 22 | [drm:intel _edp_psr_m atch_condi tions], PS R disable by flag | |||
| 15 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | 23 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | |||
| 16 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | 24 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | |||
| 17 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | 25 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | |||
| 18 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | 26 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | |||
| 19 | [drm:intel _dp_get_dp cd], DPCD: 11 0a 82 01 00 03 0 1 81 00 01 00 00 8f 00 00 | |||||
| 20 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | 27 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | |||
| 21 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | 28 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||
| 29 | [drm:intel _dp_get_dp cd], DPCD: 12 14 c4 01 00 15 0 1 83 02 00 00 00 00 00 01 | |||||
| 30 | [drm:intel _dp_get_dp cd], Displ ayport TPS 3 supporte d | |||||
| 31 | [drm:intel _dp_probe_ oui], Sink OUI: 0000 00 | |||||
| 32 | [drm:intel _dp_probe_ oui], Bran ch OUI: 90 cc24 | |||||
| 22 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | 33 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||
| 23 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | 34 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | |||
| 24 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | 35 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | |||
| 25 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | 36 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | |||
| 26 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | 37 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | |||
| 27 | [drm:intel _dp_get_dp cd], DPCD: 11 0a 82 01 00 03 0 1 81 00 01 00 00 8f 00 00 | |||||
| 28 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | 38 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | |||
| 29 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | 39 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||
| 40 | [drm:intel _dp_get_dp cd], DPCD: 12 14 c4 01 00 15 0 1 83 02 00 00 00 00 00 01 | |||||
| 41 | [drm:intel _dp_get_dp cd], Displ ayport TPS 3 supporte d | |||||
| 42 | [drm:intel _dp_probe_ oui], Sink OUI: 0000 00 | |||||
| 43 | [drm:intel _dp_probe_ oui], Bran ch OUI: 90 cc24 | |||||
| 30 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | 44 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||
| 31 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | 45 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | |||
| 32 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | 46 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | |||
| 33 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | 47 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | |||
| 34 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | 48 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | |||
| 35 | [drm:intel _dp_get_dp cd], DPCD: 11 0a 82 01 00 03 0 1 81 00 01 00 00 8f 00 00 | |||||
| 36 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | 49 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | |||
| 37 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | 50 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||
| 51 | [drm:intel _dp_get_dp cd], DPCD: 12 14 c4 01 00 15 0 1 83 02 00 00 00 00 00 01 | |||||
| 52 | [drm:intel _dp_get_dp cd], Displ ayport TPS 3 supporte d | |||||
| 53 | [drm:intel _dp_probe_ oui], Sink OUI: 0000 00 | |||||
| 54 | [drm:intel _dp_probe_ oui], Bran ch OUI: 90 cc24 | |||||
| 38 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | 55 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||
| 39 |
[drm:intel
_
crtc_curso
r
_
s
e
|
56 |
[drm:intel
_
dp
_
det
e
c
t],
|
|||
| 40 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | |||||
| 41 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | 57 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | |||
| 42 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | 58 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | |||
| 43 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | 59 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | |||
| 44 | [drm:intel _dp_get_dp cd], DPCD: 11 0a 82 01 00 03 0 1 81 00 01 00 00 8f 00 00 | |||||
| 45 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | 60 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | |||
| 46 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | 61 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||
| 62 | [drm:intel _dp_get_dp cd], DPCD: 12 14 c4 01 00 15 0 1 83 02 00 00 00 00 00 01 | |||||
| 63 | [drm:intel _dp_get_dp cd], Displ ayport TPS 3 supporte d | |||||
| 64 | [drm:intel _dp_probe_ oui], Sink OUI: 0000 00 | |||||
| 65 | [drm:intel _dp_probe_ oui], Bran ch OUI: 90 cc24 | |||||
| 47 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | 66 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||
| 48 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | 67 |
|
|||
| 49 | [drm:intel _dp_probe_ oui], Sink OUI: 0022 b9 | |||||
| 50 | [drm:intel _dp_probe_ oui], Bran ch OUI: 00 0000 | |||||
| 51 | [drm:intel _dp_detect ], [CONNEC TOR:19:DP- 1] | |||||
| 52 | [drm:intel _dp_get_dp cd], DPCD: 11 0a 82 01 00 03 0 1 81 00 01 00 00 8f 00 00 | |||||
| 53 | [drm:intel _hdmi_dete ct], [CONN ECTOR:20:H DMI-A-1] | |||||
| 54 | [drm:intel _dp_detect ], [CONNEC TOR:22:DP- 2] | |||||
| 55 | [drm:intel _hdmi_dete ct], [CONN ECTOR:23:H DMI-A-2] | |||||
| 56 | [drm:intel _dp_detect ], [CONNEC TOR:10:eDP -1] | |||||
| 57 |
|
68 |
|
Araxis Merge (but not the data content of this report) is Copyright © 1993-2013 Araxis Ltd (www.araxis.com). All rights reserved.