| <?xml version="1.0" encoding="utf-8"?><manifest revision="b709a9bc5b65e258c9bd060df43357b563a1a26a"> |
| <notice>Your sources have been sync'd successfully.</notice> |
| <remote fetch="https://android.googlesource.com" name="aosp" review="https://android-review.googlesource.com"/> |
| <remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/> |
| <remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/> |
| <default remote="cros" revision="refs/heads/master" sync-j="8"/> |
| <project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="0f36410cec3fe0c95afa666f17198706c7669656" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="d710b3bbaf7a8253830cbe9d2e720ac8bde16251" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="8263a04a1e4e6e40ed479f62ac529874eb7675ef" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="a9a4938a099d1bf1a87798e021791bbe2e467d00" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="6c34e5e144bc8e7f3769a9311d233533d99f8263" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="ebdd3bfbecea0e5396fe318c9f8ec27507c333a1" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="27d9d5399a0863949a995f631919d7745525644b" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="8f325b7f28a4b3042753fb006bdbe95db98768cc" upstream="refs/heads/master"/> |
| <project name="apps/libapps" path="src/third_party/libapps" revision="d7d69e976d9de665df79b38834a8a6da6f88bc07" upstream="refs/heads/master"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="4a93e2cfc133473ae58f17374c32669eea9a8912" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="f246a322b16c15723800ea6c6414af3a29d79ee9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="5702f0baefc0c1321374d838f8fc27c18d79a2ae"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="0e555c4822852e557219c5ee981a8e6cef92c0c3" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/docs" path="docs" revision="2e4d46ab32491f64aa29f40cbf6ae03c47cadd06" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="197d3841775d8d6dad43910b7e2d56c3489ab54d" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="6024a1b8244b5f81e8dc667d7395012cfb989104" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="704dbb824410432fcd5902ed41509f40735e7fd8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="5ebaa4c7b425aa4e6172348ca7a8cf6697264a83" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="7f98442107e2ffbffa0f3ceeb2f3fb9240bb4335" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="2fa65e6e5f2350e22d2bb2e6aa85f1daa613848a" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="ad5d44ff5879038eec0c01bc8f9a76bbe2638001" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="c62a118385b62467bf70af79bed878ccfb7a0e44" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="d3baf24c52f6dca9babed044aa6a8fe237d396e9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="07f5d5eb201c6f5c978df8f86e9e81907df54db1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="a2834cbe4e9cb85356e115afd4f4b2398745cf75" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="32463c6de8e8c98d4b1711937bc7678afc121a85" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="2f616acb24a31c40b9e47a2d2e001a0a3b6d159e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="50e26c0020940a88729ac3f2e194c5b5d475d8db" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="2f1ee8448a886ce1abad9c0e8741582244f8ab40" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="ea800d26846cc4bab2d5f3190062779dda49918b" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="3a4d23b50af09785d2eb94c152b7c4d3f42fe479" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="7e33f619c4f4e6addc757867bad3d109fb0549ee" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="c95ace2cc916bcba1597794e0c5c4391f21ca16c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="b066b06cbdfa25fa153353e0e1587ddbe382b35b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="5d5faf68cdb05e477f0637f517f4926a0db1394a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="99723f341f3ee479f74c1af440ff5fbb1a5e22ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="1444ace29f0b3455a606e685b50085cd6d777a61" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="0c9b56092424c370eff748b25d49caceb9a18dab" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="c3c9eb5084fbc254e5839f19ebaad543856eea2e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="4c05357cfa615d418097320df2f3c14ded5ddc2c" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="969149fc4ae6421006ab6f2b99eee2dd18ccdf39" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="da55e6cd18a13750b0fc417f8db6a310ad284231" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="43e38ba29ec1efeedca5fa72b68833b6199d1899" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="cc1deb44521d41125f5d617940a654c58c794325" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="a290471be8063ef1a1173d891e70ee6607d129ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="d53b90cb6b630eae60f1b24bfec54fb04552579c" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="c7ff5188fb31541c3c6173e8171155f965760883" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="989873c44c6dff1a28b10e4c0dfb13d3e3defaa9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="dca599879cab0dba8ed32ef3a5d1b82e26524732" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/monitor_reconfig" path="src/platform/monitor_reconfig" revision="f022d19d84f232290b596beeb26347f62442e7eb" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="b5e5dd108140db4d58816a2f87c6ce8156bc0ca6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="17cc088dc198f626513d4154644d57553b69fefd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtplot" path="src/platform/mtplot" revision="5e4f631e633384751f582bd9db5f4d6eb2112494" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="8e83b1936d92fa4992d6597862d10b801fbaa097" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="c7f05ef326c229b69453039ab467b65a03cb88d6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="c050715684a5dde3a4fc818f3de816a407fdb2de" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="0fed00b89ef09f5cafa1d4ed1f6c816b9710053e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="95a5fb7a1e4526ed8c8e641431f66f22f302cddc" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="2c5fd79b6efa11bac3347b5a5b676014e8336462" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="9546ffbb37d5fef191ad1607eeb0b76a6f3a9872" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="4a4e4cd4aae6f8b5fb5ca0f34b8e937835b08f08" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="fda130046407a8e83f9eec8ed66f80426692dc2d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="0ed732a09b5cd199e4741624437aa0a85866e3c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="e2b1fe70d712d2d8f32084ec1ab500e8e74c12f9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="15663c0cd1a82a38882fd5506d5eb7dcc533c87d" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="20532baaae557c9c75121bca7bbe93225600c46e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="2e14c232763ac89fd9d2fa5e9b3fdcf6581b2db8" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/android_mtdutils" path="src/third_party/android_mtdutils" revision="9bcfc3ee238f16925e9aaa4573129784ebb397e7" upstream="chromeos"/> |
| <project name="chromiumos/third_party/arm-trusted-firmware" path="src/third_party/arm-trusted-firmware" revision="4fd4af26cb650d34876c058a7142c91233ba5475" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="fd02c204de7962682fd6a4ae95dd1c62861e48fa" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="1c0fe8bb5099e9d9334420ec13bfaf5479857f7d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="534d81c399fee7b82d5beae4f455e5f1bfb0b466" upstream="refs/heads/chromeos-5.44"/> |
| <project name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="f18108d87f7f0b3bbd1d5bb9accbe4a0eb675b9b" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="f21d857fde838f7cb141f81c49070abbdf343fce" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="904f49fd770dd559800523edd91c1226e131655d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="3a5bcb9e977054cc61946fd2a10c742601220403" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/gdata" path="chromite/third_party/gdata" revision="fe7e5c90a9827feb66ed446b2d297a1618b25272" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/> |
| <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="1c6bd9041d7b7b5f553ebe8012a14d484d07c101" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="8601bb1a7c10425b150796a9d51a8cbf87639643" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="161c244c9ec418dee34bd4843c15f61e58bd86ae" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="b0a8a139832abc95077c6020842b8368f88fbf24" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="9fe1e7cecb2aefdce368a31050658fdc797eecf8" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="dabe8a339b59e048f79edaa1fc0733f002de39b4" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="e28e7eb40fad680445cb4dc207fb9e604765f695" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="c1d84581609df092e01971c921bb73795d6c61b7" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="9dc621e77e7e4f3c045831021b04d19997d3deb5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="0c7748b56694e9b00537f27bbe9edb11c78ce08f" upstream="refs/heads/chromeos-2.4.70"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="afc1b877083133dbb52958d1a9e1b621761c06ab" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="7b5fbfa86476ce1641891064b222a56bf24aff4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libresample" path="src/third_party/libresample" revision="cc9f20f439396b7d45e94b8301edd95d33f26a46" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="b45c53f9418a6eff2c8ed98703a55f96029304b1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="199fe31115c76231746f5953271795d58679561c" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="c9edfa218e5a5972531b6f4a3ece8d33a44ae1b5" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="3279c2825684c7009775b731d0a9e37815778282" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="e79d5093d0c93b9072f45415b29e12b2740db25e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="b9aa9932d0fe198195c852d3a31c650fce4d5d65" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="6f6a1b0463ea19bbc53bdbc4ca48718e5ffa407a" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="9baf1ff8fc06d8c986e55465f77427d416ecd710" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/> |
| <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="6ee0c34335fd6d5752ca35cb909ca8fc48415295" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="c3cded2efc1c82a18639ae4109d6dbc2d6a95502" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="3ccfed9fd25d8e3c01e5be7d737e8d478fb46f70" upstream="refs/heads/chromeos-2.2.12"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="b9b8f1de0ab9d4b0e1739d7c0dc4ec232b85a5c3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="3cd8fe58f994440d2e5e6238e45611b9f2dc709c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="8ccda0f645b65dc82f8676ce321406938a35d0b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="8ab698a91e101c218e58a67d810d1ae0691d7b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="cb2de5a810df1898cd3ae47d517603b8b12371c0" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="31f4933a54cce7b157619eb1dd14ea32bec39279" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="f6e2acc3f21e8b7c9eec4a8871a65f50381daacf" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="16985be90e5ef064858439380206656d75d7ad58" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" remote="chromium" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="3f6478ac95edf86cd3da300c2c0d34a438f5dbeb"/> |
| <project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="99e7216907e55ec6895e445190bb361fcfd437a7" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="47db46b45d266d4cb15040c3b6389a2c18f2ab59" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="1e705dad853445419ccc8d35d82de263e91de3f3" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="refs/heads/master"/> |
| <project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="b9a7b16859466043feeaf973e43c0efaba0de8c1" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="c80811581709b9346364e3229b888f9ad830cdf5" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="32c89c19b042a12b5a1bf0153299154ea5435c03"/> |
| <project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.18" change_id="Ia4923e5383da715967e9051002f499f6f2de51af" commit="e87a48748ec680857ef9724efc946dbcfc969f7d" commit_message="BACKPORT: drm/dp/mst: split connector registration into two parts (v2) In order to cache the EDID properly for tiled displays, we need to retrieve it before we register the connector with userspace, otherwise userspace can call get resources and try and get the edid before we've even cached it. This fixes some problems when hotplugging mst monitors, with X/mutter running. As mutter seems to get 0 modes for one of the monitors in the tile. v2: fix warning in radeon handle tile setting in cached path rather than get edid path. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit d9515c5ec1a20c77d83471e634ad9bb12deb0eac) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Skip applying patch for drivers/gpu/drm/radeon/radeon_dp_mst.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia4923e5383da715967e9051002f499f6f2de51af Reviewed-on: https://chromium-review.googlesource.com/421724 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421724" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/24/421724/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I1b5be82ac930a3162829f97618acd004c0875be0" commit="312fe855ee40524a093cfb8d875f323e3e623d3e" commit_message="UPSTREAM: drm/dp/mst: drop cancel work sync in the mstb destroy path (v2) Since 9eb1e57f564d4e6e10991402726cc83fe0b9172f drm/dp/mst: make sure mst_primary mstb is valid in work function we validate the mstb structs in the work function, and doing that takes a reference. So we should never get here with the work function running using the mstb device, only if the work function hasn't run yet or is running for another mstb. So we don't need to sync the work here, this was causing lockdep spew as below. [ +0.000160] ============================================= [ +0.000001] [ INFO: possible recursive locking detected ] [ +0.000002] 3.10.0-320.el7.rhel72.stable.backport.3.x86_64.debug #1 Tainted: G W ------------ [ +0.000001] --------------------------------------------- [ +0.000001] kworker/4:2/1262 is trying to acquire lock: [ +0.000001] ((&mgr->work)){+.+.+.}, at: [<ffffffff810b29a5>] flush_work+0x5/0x2e0 [ +0.000007] but task is already holding lock: [ +0.000001] ((&mgr->work)){+.+.+.}, at: [<ffffffff810b57e4>] process_one_work+0x1b4/0x710 [ +0.000004] other info that might help us debug this: [ +0.000001] Possible unsafe locking scenario: [ +0.000002] CPU0 [ +0.000000] ---- [ +0.000001] lock((&mgr->work)); [ +0.000002] lock((&mgr->work)); [ +0.000001] *** DEADLOCK *** [ +0.000001] May be due to missing lock nesting notation [ +0.000002] 2 locks held by kworker/4:2/1262: [ +0.000001] #0: (events_long){.+.+.+}, at: [<ffffffff810b57e4>] process_one_work+0x1b4/0x710 [ +0.000004] #1: ((&mgr->work)){+.+.+.}, at: [<ffffffff810b57e4>] process_one_work+0x1b4/0x710 [ +0.000003] stack backtrace: [ +0.000003] CPU: 4 PID: 1262 Comm: kworker/4:2 Tainted: G W ------------ 3.10.0-320.el7.rhel72.stable.backport.3.x86_64.debug #1 [ +0.000001] Hardware name: LENOVO 20EGS0R600/20EGS0R600, BIOS GNET71WW (2.19 ) 02/05/2015 [ +0.000008] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [ +0.000001] ffffffff82c26c90 00000000a527b914 ffff88046399bae8 ffffffff816fe04d [ +0.000004] ffff88046399bb58 ffffffff8110f47f ffff880461438000 0001009b840fc003 [ +0.000002] ffff880461438a98 0000000000000000 0000000804dc26e1 ffffffff824a2c00 [ +0.000003] Call Trace: [ +0.000004] [<ffffffff816fe04d>] dump_stack+0x19/0x1b [ +0.000004] [<ffffffff8110f47f>] __lock_acquire+0x115f/0x1250 [ +0.000002] [<ffffffff8110fd49>] lock_acquire+0x99/0x1e0 [ +0.000002] [<ffffffff810b29a5>] ? flush_work+0x5/0x2e0 [ +0.000002] [<ffffffff810b29ee>] flush_work+0x4e/0x2e0 [ +0.000002] [<ffffffff810b29a5>] ? flush_work+0x5/0x2e0 [ +0.000004] [<ffffffff81025905>] ? native_sched_clock+0x35/0x80 [ +0.000002] [<ffffffff81025959>] ? sched_clock+0x9/0x10 [ +0.000002] [<ffffffff810da1f5>] ? local_clock+0x25/0x30 [ +0.000002] [<ffffffff8110dca9>] ? mark_held_locks+0xb9/0x140 [ +0.000003] [<ffffffff810b4ed5>] ? __cancel_work_timer+0x95/0x160 [ +0.000002] [<ffffffff810b4ee8>] __cancel_work_timer+0xa8/0x160 [ +0.000002] [<ffffffff810b4fb0>] cancel_work_sync+0x10/0x20 [ +0.000007] [<ffffffffa0160d17>] drm_dp_destroy_mst_branch_device+0x27/0x120 [drm_kms_helper] [ +0.000006] [<ffffffffa0163968>] drm_dp_mst_link_probe_work+0x78/0xa0 [drm_kms_helper] [ +0.000002] [<ffffffff810b5850>] process_one_work+0x220/0x710 [ +0.000002] [<ffffffff810b57e4>] ? process_one_work+0x1b4/0x710 [ +0.000005] [<ffffffff810b5e5b>] worker_thread+0x11b/0x3a0 [ +0.000003] [<ffffffff810b5d40>] ? process_one_work+0x710/0x710 [ +0.000002] [<ffffffff810beced>] kthread+0xed/0x100 [ +0.000003] [<ffffffff810bec00>] ? insert_kthread_work+0x80/0x80 [ +0.000003] [<ffffffff817121d8>] ret_from_fork+0x58/0x90 v2: add flush_work. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 274d83524895fe41ca8debae4eec60ede7252bb5) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I1b5be82ac930a3162829f97618acd004c0875be0 Reviewed-on: https://chromium-review.googlesource.com/421725 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421725" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/25/421725/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I85c6dfab47b9e5244a53808fcbf971d23a700113" commit="1aa35822be20acbc12a7f05276b39a56578a0b60" commit_message="BACKPORT: drm/dp/mst: add some defines for logical/physical ports This just removes the magic number. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit ccf03d6995fa4b784f5b987726ba98f4859bf326) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in include/drm/drm_dp_helper.h BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I85c6dfab47b9e5244a53808fcbf971d23a700113 Reviewed-on: https://chromium-review.googlesource.com/421726 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421726" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/26/421726/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ic00894c43be368dd228f19cb1d1276706f131c42" commit="f57866b0c2e16b39659d4fb11d6df082ee886600" commit_message="UPSTREAM: drm/i915: Update Promotion timer for RC6 TO Mode When using RC6 timeout mode, the timeout value should be written to GEN6_RC6_THRESHOLD. v2: Updated commit message. (Tom) v3: Rebase over whitespace differences. (Daniel) Cc: Tom O'Rourke <Tom.O'Rourke@intel.com> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> Reviewed-by: Tom O'Rourke <Tom.O'Rourke@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 3e7732a05d3b14e2ae33013622ae9c691b419312) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ic00894c43be368dd228f19cb1d1276706f131c42 Reviewed-on: https://chromium-review.googlesource.com/421727 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421727" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/27/421727/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I9e4ab7e295dfbb30af7ea8be47dfe31fd14edb6f" commit="3fb288763ebe4eaf63fb525e77f46802c71f7979" commit_message="BACKPORT: drm/i915: Rename DP link training functions The link training functions had confusing names. The start function actually does the clock recovery phase of the link training, and the complete function does the channel equalization. So call them that instead. Also, every call to intel_dp_start_link_train() was followed by a call to intel_dp_complete_link_train(), so add a new start function that calls clock_recory and channel_equalization. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 2493f21f56316ad55508f173463ebf0b3f0a15bb) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Skip hunk in intel_dp_complete_link_train drivers/gpu/drm/i915/intel_dp.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I9e4ab7e295dfbb30af7ea8be47dfe31fd14edb6f Reviewed-on: https://chromium-review.googlesource.com/421728 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421728" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/28/421728/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I1d2d9be1334b55f79334568115db67b7114f6913" commit="23c6587dea852264c518649441c8b9de9ad1ae5e" commit_message="UPSTREAM: drm/i915: Move skl/bxt gt specific workarounds to ring init Some registers are, naturally, lost in gpu reset/suspend cycle. And some registers, for example in display domain, are not subject to gpu reset so they retain their contents. As hang recovery triggers a reset, recoverable gpu hang can currently flush out essential workarounds and cause havoc later on. When register GEN8_GARBNTL is missing the WaEnableGapsTsvCreditFix:skl, it can cause random system hangs [1]. This workaround was added in: commit 245d96670d26 ("drm/i915:skl: Add WaEnableGapsTsvCreditFix") But another set of system hangs were observed and the failure pattern indicated that there was random gpu hang preceding the system hang [2]. This lead to the realization that we lose this workaround and BDW_SCRATCH1 on reset. Add these workarounds setup in display init to skl/bxt ring init where LRI workarounds are also setup. This way their setup is not dependent on display side init. References: [1] https://bugs.freedesktop.org/show_bug.cgi?id=90854 References: [2] https://bugs.freedesktop.org/show_bug.cgi?id=92315 Reported-by: Tomi Sarvela <tomix.p.sarvela@intel.com> Cc: Tomi Sarvela <tomix.p.sarvela@intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Tested-by: Tomi Sarvela <tomix.p.sarvela@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 9c4cbf8212e8d8be4bc6e16cc2c21af2bbaab2c1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I1d2d9be1334b55f79334568115db67b7114f6913 Reviewed-on: https://chromium-review.googlesource.com/421729 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421729" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/421729/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I707c8d1071b04281b239e50d8481604e8c963016" commit="398df99cb1b1519222f6100d8bbe01da806a7381" commit_message="UPSTREAM: drm/dp/mst: make mst i2c transfer code more robust. This zeroes the msg so no random stack data ends up getting sent, it also limits the function to not accepting > 4 i2c msgs. Cc: stable@vger.kernel.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit ae491542cbbbcca0ec8938c37d4079a985e58440) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I707c8d1071b04281b239e50d8481604e8c963016 Reviewed-on: https://chromium-review.googlesource.com/421730 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421730" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/30/421730/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ia70ee5da1733081ccc0b8aff2683ed9d4f4f7ad4" commit="46529f9ef34d13080f7c5f8e29eca1940cbfa9cb" commit_message="UPSTREAM: drm: Fix return value of drm_framebuffer_init() In its original version, drm_framebuffer_init() returned a negative int if drm_mode_object_get() failed (f453ba046074, "DRM: add mode setting support"). This was accidentally disabled by commit 4b096ac10da0 ("drm: revamp locking around fb creation/destruction"). Thus, drm_framebuffer_init() pretends success if drm_mode_object_get() failed. Reinstate the original behaviour. Also fix erroneous kernel-doc of drm_mode_object_get(). Fixes: 4b096ac10da0 ("drm: revamp locking around fb creation/ destruction") Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 3c67d839b30c7d6d6ab5c6fddac0f58ec8095d50) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia70ee5da1733081ccc0b8aff2683ed9d4f4f7ad4 Reviewed-on: https://chromium-review.googlesource.com/421731 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421731" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/31/421731/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I29351907b234d4546cb1310845713b568a223551" commit="560d6b5518e3cf1360b5701f97df3a881422a834" commit_message="UPSTREAM: drm: fix mutex leak in drm_dp_get_mst_branch_device In Linux 4.3-rc5, there is an error case in drm_dp_get_branch_device that returns without releasing mgr->lock, resulting a spew of kernel messages about a kernel work function possibly having leaked a mutex and presumably more serious adverse consequences later. This patch changes the error to "goto out" to unlock the mutex before returning. [airlied: grabbed from drm-next as it fixes something we've seen] Signed-off-by: Adam J. Richter <adam_richter2004@yahoo.com> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 30730c7f5943b3beace1e29f7f1476e05de3da14) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I29351907b234d4546cb1310845713b568a223551 Reviewed-on: https://chromium-review.googlesource.com/421732 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421732" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/32/421732/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ie50d9e1acff117e9aaf76b83fe79a95b5af5ea65" commit="579c6bf2a3cd17c4b8680955f1d3a5c582209e2a" commit_message="UPSTREAM: drm/i915: remove an extra level of indirection in PCI ID list Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list. v2: drop the "aka" comment (Ville) Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446053589-21283-1-git-send-email-jani.nikula@intel.com (cherry picked from commit 3cb27f38f2075964bedc5cafb6b25518809180be) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ie50d9e1acff117e9aaf76b83fe79a95b5af5ea65 Reviewed-on: https://chromium-review.googlesource.com/421733 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421733" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/33/421733/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="If0358e471142d12b38125244a0c5c259fa9889fe" commit="68fc18ad6f25c6a0601eafdc9b167393324ad9bd" commit_message="BACKPORT: drm/i915/kbl: Introduce Kabylake platform defition. Kabylake is a Intel Processor containing Intel HD Graphics following Skylake. It is Gen9p5, so it inherits everything from Skylake. Let's start by adding the platform separated from Skylake but reusing most of all features, functions etc. Later we rebase the PCI-ID patch without is_skylake=1 so we don't replace what original Author did there. Few IS_SKYLAKEs if statements are not being covered by this patch on purpose: - Workarounds: Kabylake is derivated from Skylake H0 so no W/As apply here. - GuC: A following patch removes Kabylake support with an explanation: No firmware available yet. - DMC/CSR: Done in a separated patch since we need to be carefull and load the version for revision 7 since Kabylake is Skylake H0. v2: relative cleaner commit message and added the missed IS_KABYLAKE to intel_i2c.c as pointed out by Jani. Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit ef11bdb3e00a3f0b30018b0f5d74b9da1566ecb7) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Skip hunks related to intel_virt_detect_pch, skl_resume_prepare, skl_suspend_complete drivers/gpu/drm/i915/i915_drv.c Minor context change in IS_BROXTON definitions drivers/gpu/drm/i915/i915_drv.h Context change in intel_setup_outputs wrt DDI-A and DDI-E initialization drivers/gpu/drm/i915/intel_display.c Skip hunk applying onto find_compression_threshold drivers/gpu/drm/i915/intel_fbc.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: If0358e471142d12b38125244a0c5c259fa9889fe Reviewed-on: https://chromium-review.googlesource.com/421734 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421734" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/34/421734/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I1f9b54b9df676bd869dfc7eb3a154ff0318a55bc" commit="16ecb96afdb2312423b92a488c0f83f44179b49a" commit_message="UPSTREAM: drm/i915/kbl: Add Kabylake PCI ID v2: separate out device info into different GT (Damien) v3: Add is_kabylake to the KBL gt3 structuer (Damien) Sort the platforms in older -> newer order (Damien) v4: Split platform definition since is_skylake=1 on kabylake structure was Nacked. (Rodrigo) v5: (Rodrigo) Rebase after commit 3cb27f38f ("drm/i915: remove an extra level of indirection in PCI ID list") Cc: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Deepak S <deepak.s@intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446059991-17033-1-git-send-email-rodrigo.vivi@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit d97044b661d0d56b2a2ae9b2b95ab0b359b417dc) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I1f9b54b9df676bd869dfc7eb3a154ff0318a55bc Reviewed-on: https://chromium-review.googlesource.com/421735 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421735" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/421735/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I18b4fb0ba00764a4a6e2a251dab70a381b8098c2" commit="c674817fb4b2b92e5d17d4ef83042f2ed9dac56a" commit_message="UPSTREAM: drm/i915/kbl: Add Kabylake GT4 PCI ID v2: (Rodrigo) Rebase after commit 3cb27f38f ("drm/i915: remove an extra level of indirection in PCI ID list") Cc: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Deepak S <deepak.s@intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446060072-19489-1-git-send-email-rodrigo.vivi@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I18b4fb0ba00764a4a6e2a251dab70a381b8098c2 Reviewed-on: https://chromium-review.googlesource.com/421736 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421736" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/421736/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="If24f4c30c6989cea87eb47673ef32ebe0de70a49" commit="725ff0a4f10247e9aaa8126351e77c172c305109" commit_message="UPSTREAM: drm/i915: Add extra plane information in debugfs. Extends i915_display_info so that for each active crtc also print all planes associated with the pipe. This patch shows information about each plane wrt format, size, position, rotation, and scaling. This is very useful when debugging user space compositors that try to utilize several planes for a commit. V2: Fixed comments from Maarten, Ville, and Chris. Fixed printing of 16.16 fixpoint, better rotation bitmask management and some minor fixes V3: Corrected state->src_x & 0x00ff to state->src_x & 0xffff... Signed-off-by: Robert Fekete <robert.fekete@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445961512-25317-1-git-send-email-robert.fekete@linux.intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (cherry picked from commit 3abc4e09c620e3b53887d7add88158549eee021f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: If24f4c30c6989cea87eb47673ef32ebe0de70a49 Reviewed-on: https://chromium-review.googlesource.com/421737 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421737" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/37/421737/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I0c5772c0b919c35df513bc83d53c55c86c91fc65" commit="dabdbe4a106ec7e8f886b9b31515c013476bc970" commit_message="UPSTREAM: drm/i915: Don't pass *DP around to link training functions It just makes the code more confusing, so just reference intel_dp_>DP directly. Note that this also fix a bug where the value of intel_dp->DP could be different than the last value written to the hw, due to an early return that would skip the 'intel_dp->DP = DP' line. v2: Don't preserve old DP value on failure. (Sivakumar) - Don't call drm_dp_clock_recovery_ok() twice. (Sivakumar) - Keep return type of clock recovery and channel equalization functions as void. (Ander) v3: Remove DP parameter from intel_dp_set_signal_levels(). (Sivakumar) Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-2-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit f4eb692e8edc600d1b02ad2f1320ee7cae454711) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I0c5772c0b919c35df513bc83d53c55c86c91fc65 Reviewed-on: https://chromium-review.googlesource.com/421738 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421738" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/38/421738/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I436bb2a7c1c879ee22dfdd85fdaee944dbfa1071" commit="88e14d0e16110bd47b92416abf353b43c97098f6" commit_message="UPSTREAM: drm/i915: Split write of pattern to DP reg from intel_dp_set_link_train Split the register write with the new link training pattern out of intel_dp_set_link_train(), so that the i915 specific code is in a separate function. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-3-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit e9c176d511983d53092dffedc43fd5c176c5ae0f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I436bb2a7c1c879ee22dfdd85fdaee944dbfa1071 Reviewed-on: https://chromium-review.googlesource.com/421739 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421739" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/421739/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I82292ed04a54d2fc5c8e59592f349ba1842bfa24" commit="baf511142da375ee086692d75a97688d7d6aece8" commit_message="UPSTREAM: drm/i915 Call get_adjust_train() from clock recovery and channel eq Move the call to intel_dp_get_adjust_train() out of intel_dp_update_link_train() and call it instead from the clock recovery and channel equalization features. A follow up patch will remove the DP register write from that function, so that it handles only the DPCD write. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-4-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit c1a5e9f69a4048e9127f5e8b2887bc89c435f9a3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I82292ed04a54d2fc5c8e59592f349ba1842bfa24 Reviewed-on: https://chromium-review.googlesource.com/421740 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421740" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/421740/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I91a0d8db3f85a0f21685d72e03204d3c15d2eb22" commit="78ba40ede6094c6e80392fc49b9536e8de039f4f" commit_message="UPSTREAM: drm/i915: Move register write into intel_dp_set_signal_levels() Move register write from intel_dp_update_link_train() into intel_dp_set_signal_levels(). This creates a better split between the i915 specific code and the generic link training part. Note that this causes an extra register write in intel_dp_reset_link_train(), since both intel_dp_set_signal_levels() and intel_dp_set_link_train() write to the DP register. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-5-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit b905a9155db6fd51bfdb7625b7d0c5c3047d49f2) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I91a0d8db3f85a0f21685d72e03204d3c15d2eb22 Reviewed-on: https://chromium-review.googlesource.com/421741 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421741" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/421741/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I2358636075ca2bd31698a7144878a33bba955ab5" commit="2a0bddcaf17f49e5448391ff94308e3aaeb6faa9" commit_message="BACKPORT: drm/i915: Move generic link training code to a separate file No functional changes, just moving code around. v2: Rebase Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-6-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 94223d041b0716cee45240cdcd635357d7302021) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change drivers/gpu/drm/i915/Makefile BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I2358636075ca2bd31698a7144878a33bba955ab5 Reviewed-on: https://chromium-review.googlesource.com/421742 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421742" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/421742/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ie99d200c51c5c8a66a40651df8c0b7593b435eca" commit="343b667671abd36efbaf352c9c5f818c160b467d" commit_message="UPSTREAM: drm/i915: Create intel_dp->prepare_link_retrain() hook In order to prepare for a link training with DDI, the state machine would call intel_ddi_prepare_link_retrain(). To remove the dependency to the hardware information, replace that direct call with a callback. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-7-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit ad64217b030c6f7af3613577bcefeef8a5ad91be) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ie99d200c51c5c8a66a40651df8c0b7593b435eca Reviewed-on: https://chromium-review.googlesource.com/421743 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421743" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/421743/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Id00e02c7ea0bf18effe063231f85936c4835f250" commit="e977f24247709d51707840c8a97152d4177105dc" commit_message="UPSTREAM: drm/i915: Make intel_dp_source_supports_hbr2() take an intel_dp pointer The function name implies it should get intel_dp, and it mostly used where there is an intel_dp in the context. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1445594525-7174-8-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit e588fa18c1cc490fa75c0b4bd1d4f7758ccd33cf) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Id00e02c7ea0bf18effe063231f85936c4835f250 Reviewed-on: https://chromium-review.googlesource.com/421744 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421744" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/421744/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="If72c5f84886492f67704f5f88eb6ce536e0e59cb" commit="06dfc920952b21011a64df59bbf4a460fbc8ab76" commit_message="UPSTREAM: drm/i915: Re-enable PCH FIO underrun reporting after pipe has been disabled Some hardware (IVB/HSW and CPT/PPT) have a shared error interrupt for all the relevant underrun bits, so in order to keep the error interrupt enabled, we need to have underrun reporting enabled on all PCH transocders. Currently we leave the underrun reporting disabled when the pipe is off, which means we won't get any underrun interrupts when only a subset of the pipes are active. Fix the problem by re-enabling the underrun reporting after the pipe has been disabled. And to avoid the spurious underruns during pipe enable, disable the underrun reporting before embarking on the pipe enable sequence. So this way we have the error reporting disabled while running through the modeset sequence. v2: Re-enable PCH FIFO underrun reporting unconditionally on pre-HSW Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> (v1) Link: http://patchwork.freedesktop.org/patch/msgid/1446225691-10928-1-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit 81b088ca87d76d7edacd0f1e3468fd24e6434b2b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: If72c5f84886492f67704f5f88eb6ce536e0e59cb Reviewed-on: https://chromium-review.googlesource.com/421745 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421745" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/421745/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I53e64fe0e5a7098d7d543219b77260b4c4a1fd43" commit="29897398cfa83f5b9e4de8f02dc75678770664de" commit_message="UPSTREAM: drm/i915: Clean up eDP PLL state asserts Rewrite the eDP PLL state asserts to conform to our usual state assert style. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446146763-31821-13-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 64e1077a1f93d1f90e096e75232f7284a2b62ca6) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I53e64fe0e5a7098d7d543219b77260b4c4a1fd43 Reviewed-on: https://chromium-review.googlesource.com/421746 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421746" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/421746/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Icb01bee97cac3bc9af6d364acb58d552b6bdc2e7" commit="bc5552bd93a09254f8d90b7eb7635ac4c7dc8d01" commit_message="UPSTREAM: drm/i915: Setup DDI clk for MST on SKL Set up the DDI->PLL mapping on SKL also for MST links. Might help make MST operational on SKL. v2: Rebased due to KBL Improve the patch subject, Jesse provided the new one Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1439826380-18403-1-git-send-email-ville.syrjala@linux.intel.com References: https://bugs.freedesktop.org/show_bug.cgi?id=91791 Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> (cherry picked from commit e404ba8d06ff2a1bdb916a9e5d2c09cacd7e5ca3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Icb01bee97cac3bc9af6d364acb58d552b6bdc2e7 Reviewed-on: https://chromium-review.googlesource.com/421747 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421747" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/421747/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Iee7d878cbb3daa11e5f3d98c37fc83f220927024" commit="97edb8c0ce077651856af5111a1a1393d09093cf" commit_message="UPSTREAM: drm/i915: Do fbdev fini first during unload We set up fbdev last during load, so doing the fbdev cleanup should be first. We weren't supposed to drop the init power during driver unload, but since the fbdev teardown happened after intel_power_domains_fini() that could have happened due in one of two ways. First it could have happened during the modeset caused by normal fbdev cleanup. But in addition it could have happened already via the intel_fbdev_initial_config() since that is executed asynhronously, and the async_synchronize_full() was done during fbdev cleanup, after intel_power_domains_fini(). All of that got eliminated by commit 292b990e86abc ("drm/i915: Update power domains on readout.") since we now drop the init power synchronously during driver load. So there is no real bug wrt. the init power anymore, but still it seems better to do the fbdev cleanup first, before we've potentially cleaned up something else important. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446815313-9490-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 2013bfc0238b9a77f7e9223aed03b1cef1b5cc34) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Iee7d878cbb3daa11e5f3d98c37fc83f220927024 Reviewed-on: https://chromium-review.googlesource.com/421748 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421748" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/421748/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I092d0e3f505754056aa99b81edbd134c9ed0ad0e" commit="d4a96f849be11e9c64e7f195a1d6de215dbd9d44" commit_message="UPSTREAM: drm/i915: Replace aux_ch_ctl_reg check with port check Instead of checking what aux_ch_ctl_reg is, we can simply check the port when determining the right timeout value to program. v2: Reorder patches to reduce churn (Chris) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1) Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-2-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit f3c6a3a70d6768038fb005cb8d745e21b4511ca9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I092d0e3f505754056aa99b81edbd134c9ed0ad0e Reviewed-on: https://chromium-review.googlesource.com/421750 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421750" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/421750/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I2e843c9fd3a6f44bfd654209a4ad9681472fd28a" commit="edb57ed97ea08f1e3d6748f1d8f8c504608171e1" commit_message="UPSTREAM: drm/i915: Replace the aux ddc name switch statement with kasprintf() Use kasprintf() to generate the "DPDDC-<port>" name for the aux helper. To deal with errors properly make intel_dp_aux_init() return something, and adjust the caller to match. It seems we were also missing a intel_dp_mst_encoder_cleanup() call on edp (non-port A) init failures, so add that too. The whole error/cleanup ordering doesn't feel entirely sane to me, but I'll leave that part alone for now. v2: Use kasprintf() instead of a table, reorder patches (Chis) Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit a121f4e5fae5d7542e1c4158bc9a47de825547f3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I2e843c9fd3a6f44bfd654209a4ad9681472fd28a Reviewed-on: https://chromium-review.googlesource.com/421751 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421751" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/421751/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ie858f3ef74b2befacbd34894b320037858cff528" commit="3a737d045a16402ea60d67a922096d9435b33680" commit_message="UPSTREAM: drm/i915: Parametrize AUX registers v2: Keep some MISSING_CASE() stuff (Jani) s/-1/-PIPE_B/ in the register macro Fix typo in patch subject v3: Use PORT_B registers for invalid ports in g4x_aux_ctl_reg() (Jani) v4: Reorder patches (Chris) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> (v3) Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v3) Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-4-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit 750a951fd34808d8822abafccd0dfa479deef0a0) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ie858f3ef74b2befacbd34894b320037858cff528 Reviewed-on: https://chromium-review.googlesource.com/421752 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421752" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/421752/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I7e69847bceadc1dc16d1403b51ef3fa5af40bf62" commit="08925a3a7b5cbdd27d5e0adb153a1dd8baa330b1" commit_message="UPSTREAM: drm/i915: Remove the magic AUX_CTL is at DP + foo tricks Currently we determine the location of the AUX registers in a confusing way. First we assume the PCH registers are used always, but then we override it for everything but HSW/BDW to use DP+0x10. Very confusing. Let's just make it straightforward and simply add a few functions to pick the right AUX_CTL based on the DP port. To deal with VLV/CHV we'll include the display_mmio_offset into the AUX register defines. v2: Reorder patches (Chris) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1) Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-5-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit da00bdcfb25989afc025274fecbdcbfd9a24d3a1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I7e69847bceadc1dc16d1403b51ef3fa5af40bf62 Reviewed-on: https://chromium-review.googlesource.com/421753 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421753" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/421753/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I3f5505762d39cae7f12886e71194a2bf490fe3f2" commit="bfa306778c64dd15f045b6db0c893037d39d30dd" commit_message="UPSTREAM: drm/i915: Store aux data reg offsets in intel_dp->aux_ch_data_reg[] Rather than computing on demand, store also the aux data reg offsets under intel_dp. v2: Duplicate some code to make things less magic (Jani) v3: Use PORT_B registers for invalid ports in g4x_aux_data_reg() Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1447266856-30249-6-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit 330e20ec77307663f4db64ab769d849c0c6a4627) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I3f5505762d39cae7f12886e71194a2bf490fe3f2 Reviewed-on: https://chromium-review.googlesource.com/421754 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421754" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/421754/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="If0e84462a66e543922dc542e266dcde6da938299" commit="638a65d087db7bd6b386e4c6a281123777729292" commit_message="BACKPORT: drm/i915: Cleanup test data during long/short hotplug Automated test data that is updated when a test is requested is not cleared till next automated test request is recevied which can cause various problems. This patch fixes this by clearing this during the next short pulse and on hot unplug. For example, when TEST_LINK_TRAINING is requested it is updated to appropriate variable inside intel_dp_handle_test_request but is also cleared only inside the same function. if the next short pulse does not have the AUTOMATED_TEST_REQUEST bits set the variable will not be cleared resulting in carrying incorrect test status in local variables. v2: Added comments and moved nack and defer variables before set_edid (Sonika) Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Signed-off-by: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com> Reviewed-by: Sonika Jindal <sonika.jindal@intel.com Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 4df6960e0960387d4d3b5085f6639ec14a1f76b7) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in intel_dp_check_link_status intel_dp_long_pulse drivers/gpu/drm/i915/intel_dp.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: If0e84462a66e543922dc542e266dcde6da938299 Reviewed-on: https://chromium-review.googlesource.com/421755 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421755" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/421755/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="If6b50b787961025433f59d8ac9661a72555d65fe" commit="0b196beb7468957541e2715d76c1261b8f99bba8" commit_message="BACKPORT: drm/i915: s/PCH_DP_/PORT_/ in intel_trans_dp_port_sel() and move it next to its only user Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1446672017-24497-9-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit c48b53054cef3f87595bbad4ba7f5343a80fe5fd) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor conflict in comments drivers/gpu/drm/i915/intel_dp.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: If6b50b787961025433f59d8ac9661a72555d65fe Reviewed-on: https://chromium-review.googlesource.com/421756 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421756" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/421756/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Iadfe189c4e203df87455ff18eb1f2e3b5b44ff41" commit="f179a804f7477b9fe627a74bb4972d8f42fbba37" commit_message="UPSTREAM: drm/i915: Consider SPLL as another shared pll, v2. When diagnosing a unrelated bug for someone on irc, it would seem the hardware can be brought up by the BIOS with the embedded displayport using the SPLL for spread spectrum. Right now this is not handled well in i915, and it calculates the crtc needs to be reprogrammed on the first modeset without SSC, but the SPLL itself was kept active. Fix this by exposing SPLL as a shared pll that will not be returned by intel_get_shared_dpll; you have to know it exists to use it. Changes since v1: - Create a separate dpll_hw_state.spll for spll, and use separate pll functions for spll. Tested-by: Emil Renner Berthing <kernel@esmil.dk> Tested-by: Gabriel Feceoru <gabriel.feceoru@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447681332-6318-1-git-send-email-maarten.lankhorst@linux.intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 00490c22b1b59b168d89de798f0790bfd9541515) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Iadfe189c4e203df87455ff18eb1f2e3b5b44ff41 Reviewed-on: https://chromium-review.googlesource.com/421757 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421757" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/421757/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I3c66ac882319a59308f4ed865917fb70d18f6d81" commit="783d0d249ebecce9ac3606a14db30385d17022bb" commit_message="UPSTREAM: drm/i915: Don't do edp panel detection in g4x_dp_detect() That call was moved to intel_dp_detect() in commit d410b56d74bc706f414158cb0149e2a149ee1650 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Tue Sep 2 20:03:59 2014 +0100 drm/i915/dp: Refactor common eDP lid detection but it seem to have been resurrected in the following commit, probably due to a wrong merge conflict resolution. commit 2a592bec50994597716c633191ed6bf7af14defc Author: Dave Airlie <airlied@redhat.com> Date: Mon Sep 1 16:58:12 2014 +1000 drm/i915: handle G45/GM45 pulse detection connected state. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447859970-9546-1-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 51676d0e303c8d7c153ad702fd91f83374bc43e4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I3c66ac882319a59308f4ed865917fb70d18f6d81 Reviewed-on: https://chromium-review.googlesource.com/421758 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421758" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/421758/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ica3324e14291bee348d30ce6359272bfbbf278c8" commit="782b2cb95a524a7af4c1ac2646bb82ecdb235291" commit_message="UPSTREAM: drm/i915: Remove platform specific *_dp_detect() functions Their logic is exactly the same: check if the digital port is connected and then call intel_dp_detect_dpcd(). So just put that logic in their only caller: intel_dp_detect(). Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447859970-9546-2-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit c555a81ddf5e18780dde535234865f43da347e98) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ica3324e14291bee348d30ce6359272bfbbf278c8 Reviewed-on: https://chromium-review.googlesource.com/421759 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421759" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/421759/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I71f2e3d77bca74bbaf356d63fdd2b787e142fc59" commit="b2e353c288d678db004ac723ff23f788195f5997" commit_message="UPSTREAM: drm/i915: Fix oops caused by fbdev initialization failure intelfb_create() is called once on driver initialization. If it fails, ifbdev->helper.fbdev, ifbdev->fb or ifbdev->fb->obj may be NULL. Further up in the call stack, intel_fbdev_initial_config() calls intel_fbdev_fini() to tear down the ifbdev on failure. This calls intel_fbdev_destroy() which dereferences ifbdev->fb. Fix the ensuing oops. Also check in these functions if ifbdev is not NULL to avoid oops: i915_gem_framebuffer_info() is called on access to debugfs file "i915_gem_framebuffer" and dereferences ifbdev, ifbdev->helper.fb and ifbdev->helper.fb->obj. intel_connector_add_to_fbdev() / intel_connector_remove_from_fbdev() are called when registering / unregistering an mst connector and dereference ifbdev. v3: Drop additional null pointer checks in intel_fbdev_set_suspend(), intel_fbdev_output_poll_changed() and intel_fbdev_restore_mode() since they already check if ifbdev is not NULL, which is sufficient now that intel_fbdev_fini() is called on initialization failure. (Requested by Daniel Vetter <daniel.vetter@ffwll.ch>) Signed-off-by: Lukas Wunner <lukas@wunner.de> Link: http://patchwork.freedesktop.org/patch/msgid/d05f0edf121264a9d0adb8ca713fd8cc4ae068bf.1447938059.git.lukas@wunner.de Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 54632abe8ca3db8621673b186c7cc0e869c0032f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I71f2e3d77bca74bbaf356d63fdd2b787e142fc59 Reviewed-on: https://chromium-review.googlesource.com/421760 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421760" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/421760/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I4f3205cf0ea4f0c4593a7af17997cde15831b2d6" commit="35f1eb4ea1e25e9b66c7f637ab60d0c546545275" commit_message="UPSTREAM: drm/i915: Add "missing" break to haswell_get_ddi_pll() While not technically needed on the last case in the switch statement, the 'break' makes it look better IMO. v2: Fixed a typo in the commit message (Paulo) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449005527-15617-1-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit 79bd23dadf613fb5ebc1d9aa178fd7129c3e059c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I4f3205cf0ea4f0c4593a7af17997cde15831b2d6 Reviewed-on: https://chromium-review.googlesource.com/421762 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421762" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/421762/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I8ad0c61b62cef5d011c85bb913935dbf465ad9bd" commit="35d5495ae6022dd30af4ba9d692e6fb7c5350246" commit_message="UPSTREAM: drm/atomic-helper: Reject attempts at re-stealing encoders This can happen when we run out of encoders for a multi-crtc modeset, or also when userspace is silly and tries to clone multiple connectors that need the same encoder on the same crtc. Reported-and-Tested-and-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449136154-11588-1-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 97ac3204ab9552ab0b4529fa80f072bdad073339) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I8ad0c61b62cef5d011c85bb913935dbf465ad9bd Reviewed-on: https://chromium-review.googlesource.com/421763 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421763" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/421763/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I2ce8d9e6c1107faf21560e4e5bbdd0eaa4f306a9" commit="6ae8f735f2e36adaa4d83f05fd5d15958d2f075f" commit_message="UPSTREAM: drm/i915: Round to closest when computing the VGA dotclock for LPT-H Bspec says we should round to closest when computing the LPT-H VGA dotclock, so let's do that. v2: Fix typo in commit message (Paulo) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449260421-14243-1-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit a2572f5cfb6c373cd4bc0acbd9f25f0af591ee7c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I2ce8d9e6c1107faf21560e4e5bbdd0eaa4f306a9 Reviewed-on: https://chromium-review.googlesource.com/421765 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421765" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/421765/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I271b33af19898f92da79913ab332b708619fb80a" commit="61dcdfd77c9096877b77da78cc45cf931de67b48" commit_message="UPSTREAM: dp/mst: add SDP stream support This adds code to initialise the SDP streams for a sink in the simplest ordering. I've no idea how you'd want to control the ordering at this level, so don't bother until someone comes up with a use case. Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Libin Yang <libin.yang@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1449036584-105393-1-git-send-email-libin.yang@linux.intel.com (cherry picked from commit ef8f9bea1368b89d0d6d1819025586ae0bea0612) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I271b33af19898f92da79913ab332b708619fb80a Reviewed-on: https://chromium-review.googlesource.com/421767 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421767" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/421767/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I9b475837d9f3fe1f48a4dba48450bc4db4b2fd63" commit="771c8bffa57af1c6ab2bfd384e410a69472f245b" commit_message="UPSTREAM: drm/i915: Add get_eld audio component Implement a new i915_audio_component_ops, get_eld(). It's called by the audio driver to fetch the current audio status and ELD of the given HDMI/DP port. It returns the size of expected ELD bytes if it's valid, zero if no valid ELD is found, or a negative error code. The current state of audio on/off is stored in the given pointer, too. Note that the returned size isn't limited to the given max bytes. If the size is greater than the max bytes, it means that only a part of ELD has been copied back. For achieving this implementation, a new field audio_connector is added to struct intel_digital_port. It points to the connector assigned to the given digital port. It's set/reset at each audio enable/disable call in intel_audio.c, and protected with av_mutex. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Takashi Iwai <tiwai@suse.de> (cherry picked from commit cae666ceb8c3f154351f7df29c522f7a7016bdc0) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I9b475837d9f3fe1f48a4dba48450bc4db4b2fd63 Reviewed-on: https://chromium-review.googlesource.com/421768 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421768" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/421768/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Iab11fe1f9e2e2120565c161342e1702ed4085efd" commit="7e62dfb7b462460d28b9533363f22635c93dbedf" commit_message="UPSTREAM: drm/i915: Add reverse mapping between port and intel_encoder This patch adds a reverse mapping from a digital port number to intel_encoder object containing the corresponding intel_digital_port. It simplifies the query of the encoder a lot. Note that, even if it's a valid digital port, the dig_port_map[] might point still to NULL -- usually it implies a DP MST port. Due to this fact, the NULL check in each place has no WARN_ON() and just skips the port. Once when the situation changes in future, we might introduce WARN_ON() for a more strict check. Signed-off-by: Takashi Iwai <tiwai@suse.de> (cherry picked from commit 0bdf5a05647a66dcc6394986e061daeac9b1cf96) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Iab11fe1f9e2e2120565c161342e1702ed4085efd Reviewed-on: https://chromium-review.googlesource.com/421769 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421769" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/421769/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I612314ad6a1a0fd1bec52d5958c65bce01843ae2" commit="f7d95bb06e4dcdc469ed9779d1ffdea43d54a3df" commit_message="UPSTREAM: drm: Add crtc->name and use it in debug messages Show a sensible name for the crtc in debug mesages. The driver may supply its own name, otherwise the core genrates the name ("crtc-0", "crtc-1" etc.). v2: kstrdup() the name passed by the caller (Jani) v3: Generate a default name if the driver doesn't supply one Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1449592922-5545-6-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit fa3ab4c2113c74a9eae9b6a718b167f7c8833e78) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I612314ad6a1a0fd1bec52d5958c65bce01843ae2 Reviewed-on: https://chromium-review.googlesource.com/421770 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421770" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/421770/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I266ecc2f522aba7b74af2948b079594297a264d2" commit="78cb537c6ff2d5d5cf570507a72e71002f82a89c" commit_message="UPSTREAM: drm: Add plane->name and use it in debug prints Show a sensible name for the plane in debug mesages. The driver may supply its own name, otherwise the core genrates the name ("plane-0", "plane-1" etc.). v2: kstrdup() the name passed by the caller (Jani) v3: Generate a default name if the driver doesn't supply one Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1449592922-5545-7-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit 9f4c97a236d35b9fe45168a979adb5e1522c0968) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I266ecc2f522aba7b74af2948b079594297a264d2 Reviewed-on: https://chromium-review.googlesource.com/421771 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421771" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/421771/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I6c76229c065a5a361bc2c82133944cd456f710a2" commit="c3662565a926244619031f1b4bfadb278a806b51" commit_message="UPSTREAM: drm/atomic-helper: Drop unneeded argument from check_pending_encoder Just a remnant from an old iteration of this patch that I've forgotten to remove: We only need the encoder to figure out whether it has been reassigned in this update already or not to figure out whether there's a conflict or not. Reported-by: Thierry Reding <thierry.reding@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449564561-3896-2-git-send-email-daniel.vetter@ffwll.ch Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> (cherry picked from commit 07bad49ea89558583bc3d80c27e6c234fe0a4b63) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I6c76229c065a5a361bc2c82133944cd456f710a2 Reviewed-on: https://chromium-review.googlesource.com/421772 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421772" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/421772/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I4784e217692cfbc6efb3941f4e81bbb78448ce7d" commit="f7ab8bb64de4979adc55f9d953a9c487ac63ac40" commit_message="UPSTREAM: drm/dp/mst: reply with ACK for UP reqs Currently we reply with NACK to UP requests which might confuse receivers. We haven't seen any actual issues with this but should still respond to UP requests correctly. Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449514552-10236-2-git-send-email-harry.wentland@amd.com Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit a68d2437d73188abe5d92d551cc63d6b67d8ce57) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I4784e217692cfbc6efb3941f4e81bbb78448ce7d Reviewed-on: https://chromium-review.googlesource.com/421773 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421773" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/421773/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I5ca0626483d039a2c5acc9de26f57c85b95728e9" commit="7c6d4c85caec95ddb9fa6530da3217afaf64b40c" commit_message="UPSTREAM: drm/dp/mst: save vcpi with payloads This makes it possibly for drivers to find the associated mst_port by looking at the payload allocation table. Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449514552-10236-3-git-send-email-harry.wentland@amd.com Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit 6cecdf7a161d2b909dc7c8979176bbc4f0669968) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I5ca0626483d039a2c5acc9de26f57c85b95728e9 Reviewed-on: https://chromium-review.googlesource.com/421774 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421774" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/74/421774/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="Ia69004b2396d52aacce8ad5ce930e17497548042" commit="e915fa117539d2d6fb7b18aa01c8ec08053551c4" commit_message="BACKPORT: drm/i915: prefer for_each_intel_* macros for iteration Use the for_each_intel_* macros for iterating intel_encoder, intel_connector, and intel_crtc. No functional changes. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1450262896-5325-1-git-send-email-jani.nikula@intel.com (cherry picked from commit 19c8054c4d82932d9f6bbf8d650aae4a1399a64d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in asle_set_backlight drivers/gpu/drm/i915/intel_opregion.c Skip applying hunk onto skl_update_other_pipe_wm drivers/gpu/drm/i915/intel_pm.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia69004b2396d52aacce8ad5ce930e17497548042 Reviewed-on: https://chromium-review.googlesource.com/421775 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421775" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/421775/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I83bc7a7a57fbc8deaa3aa7554436141b68560034" commit="d201888d4284a81e35ad950988a6def198f7a7ca" commit_message="UPSTREAM: drm/i915/skl: Do not allow scaling when crtc is disabled. This fixes a warning when the crtc is turned off. In that case fb will be NULL, and crtc_clock will be 0. Because the crtc is no longer active this is not a bug, and shouldn't trigger the WARN_ON. Also remove handling a null crtc_state, with all transitional helpers gone this can no longer happen. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448360945-5723-2-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Mika Kahola <mika.kahola@intel.com> (cherry picked from commit bf8a0af0cc9f9de9e54aefd1afd8c23b91809e41) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I83bc7a7a57fbc8deaa3aa7554436141b68560034 Reviewed-on: https://chromium-review.googlesource.com/421776 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421776" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/76/421776/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I5574bca9c45bf72386ddd8586efdbf7618c71b45" commit="43341d68be4b438238ca7d6927bcf042d6aa67ff" commit_message="UPSTREAM: drm/i915: Keep track of the cdclk as if all crtc's were active. On skylake when calculating plane visibility with the crtc in dpms off mode the real cdclk may be different from what it would be if the crtc was active. This may result in a WARN_ON(cdclk < crtc_clock) from skl_max_scale. The fix is to keep a atomic_cdclk that would be true if all crtc's were active. This is required to get the same calculations done correctly regardless of dpms mode. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447945645-32005-12-git-send-email-maarten.lankhorst@linux.intel.com (cherry picked from commit 1a617b77658e0ab1cb58a9412c5a02f862bd4fcd) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I5574bca9c45bf72386ddd8586efdbf7618c71b45 Reviewed-on: https://chromium-review.googlesource.com/421777 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="2" gerrit_number="421777" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/421777/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I8d87ce3960ddf8ec14f21add100d825686a38c1e" commit="ddde36bef1de9de5f7f2dbe0eea82f73471708c1" commit_message="BACKPORT: oom: make sure that TIF_MEMDIE is set under task_lock OOM killer tries to exclude tasks which do not have mm_struct associated because killing such a task wouldn't help much. The OOM victim gets TIF_MEMDIE set to disable OOM killer while the current victim releases the memory and then enables the OOM killer again by dropping the flag. oom_kill_process is currently prone to a race condition when the OOM victim is already exiting and TIF_MEMDIE is set after the task releases its address space. This might theoretically lead to OOM livelock if the OOM victim blocks on an allocation later during exiting because it wouldn't kill any other process and the exiting one won't be able to exit. The situation is highly unlikely because the OOM victim is expected to release some memory which should help to sort out OOM situation. Fix this by checking task->mm and setting TIF_MEMDIE flag under task_lock which will serialize the OOM killer with exit_mm which sets task->mm to NULL. Setting the flag for current is not necessary because check and set is not racy. Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> BUG=chromium:727707 TEST=Build and boot Caroline, try to load it to start ooming (cherry picked from commit 83363b917a2982dd509a5e2125e905b6873505a3) Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Change-Id: I8d87ce3960ddf8ec14f21add100d825686a38c1e Reviewed-on: https://chromium-review.googlesource.com/521809 Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="521809" owner_email="dtor@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/09/521809/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I56d1f30a69d65b4020017a76198587680cb9284a" commit="bcfa8a0b76cf8c2c4a2d066208004b31167bfb79" commit_message="BACKPORT: mm/oom_kill.c: reverse the order of setting TIF_MEMDIE and sending SIGKILL It was confirmed that a local unprivileged user can consume all memory reserves and hang up that system using time lag between the OOM killer sets TIF_MEMDIE on an OOM victim and sends SIGKILL to that victim, for printk() inside for_each_process() loop at oom_kill_process() can consume many seconds when there are many thread groups sharing the same memory. Before starting oom-depleter process: Node 0 DMA: 3*4kB (UM) 6*8kB (U) 4*16kB (UEM) 0*32kB 0*64kB 1*128kB (M) 2*256kB (EM) 2*512kB (UE) 2*1024kB (EM) 1*2048kB (E) 1*4096kB (M) = 9980kB Node 0 DMA32: 31*4kB (UEM) 27*8kB (UE) 32*16kB (UE) 13*32kB (UE) 14*64kB (UM) 7*128kB (UM) 8*256kB (UM) 8*512kB (UM) 3*1024kB (U) 4*2048kB (UM) 362*4096kB (UM) = 1503220kB As of invoking the OOM killer: Node 0 DMA: 11*4kB (UE) 8*8kB (UEM) 6*16kB (UE) 2*32kB (EM) 0*64kB 1*128kB (U) 3*256kB (UEM) 2*512kB (UE) 3*1024kB (UEM) 1*2048kB (U) 0*4096kB = 7308kB Node 0 DMA32: 1049*4kB (UEM) 507*8kB (UE) 151*16kB (UE) 53*32kB (UEM) 83*64kB (UEM) 52*128kB (EM) 25*256kB (UEM) 11*512kB (M) 6*1024kB (UM) 1*2048kB (M) 0*4096kB = 44556kB Between the thread group leader got TIF_MEMDIE and receives SIGKILL: Node 0 DMA: 0*4kB 0*8kB 0*16kB 0*32kB 0*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 0kB Node 0 DMA32: 0*4kB 0*8kB 0*16kB 0*32kB 0*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 0kB The oom-depleter's thread group leader which got TIF_MEMDIE started memset() in user space after the OOM killer set TIF_MEMDIE, and it was free to abuse ALLOC_NO_WATERMARKS by TIF_MEMDIE for memset() in user space until SIGKILL is delivered. If SIGKILL is delivered before TIF_MEMDIE is set, the oom-depleter can terminate without touching memory reserves. Although the possibility of hitting this time lag is very small for 3.19 and earlier kernels because TIF_MEMDIE is set immediately before sending SIGKILL, preemption or long interrupts (an extreme example is SysRq-t) can step between and allow memory allocations which are not needed for terminating the OOM victim. Fixes: 83363b917a29 ("oom: make sure that TIF_MEMDIE is set under task_lock") Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Acked-by: Michal Hocko <mhocko@suse.com> Cc: David Rientjes <rientjes@google.com> Cc: <stable@vger.kernel.org> [4.0+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> BUG=chromium:727707 TEST=Build and boot Caroline, try to load it to start ooming (cherry picked from commit 426fb5e72d92b868912e47a1e3ca2df6eabc3872) Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Change-Id: I56d1f30a69d65b4020017a76198587680cb9284a Reviewed-on: https://chromium-review.googlesource.com/521810 Reviewed-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="521810" owner_email="dtor@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/10/521810/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="If1ae193d756ee952aa253b91ca794d4a6926bd3d" commit="fb4b4c09c1baf0c57a10083fced059d293a06bb0" commit_message="UPSTREAM: mm/oom_kill.c: fix potentially killing unrelated process At the for_each_process() loop in oom_kill_process(), we are comparing address of OOM victim's mm without holding a reference to that mm. If there are a lot of processes to compare or a lot of "Kill process %d (%s) sharing same memory" messages to print, for_each_process() loop could take very long time. It is possible that meanwhile the OOM victim exits and releases its mm, and then mm is allocated with the same address and assigned to some unrelated process. When we hit such race, the unrelated process will be killed by error. To make sure that the OOM victim's mm does not go away until for_each_process() loop finishes, get a reference on the OOM victim's mm before calling task_unlock(victim). [oleg@redhat.com: several fixes] Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Acked-by: Michal Hocko <mhocko@suse.com> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> BUG=chromium:727707 TEST=Build and boot Caroline, try to load it to start ooming (cherry picked from commit 880b768937e90c433c0c8254a22b1eb63df005a4) Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Change-Id: If1ae193d756ee952aa253b91ca794d4a6926bd3d Reviewed-on: https://chromium-review.googlesource.com/521811 Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="521811" owner_email="dtor@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/11/521811/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I35a3e2db92175a29de8011172b80091065b27414" commit="34edcafab26078e530841183896283a181736e41" commit_message="cr50: Add console and TPM vendor commands to get/set board ID This patch adds vendor and console commands to read and write the board ID space in the INFO1 block. Current image's board ID settings are saved in the image header by the latest codesigner. Board ID write attempts are rejected if the board ID space is already initialized, or if the currently running image will not be allowed to run with the new board ID space settings. Error codes are returned to the caller as a single byte value. Successful read command returns 12 bytes of the board ID space contents. The console command always allows to read the board ID value, and allows to write it if the image was built with debug enabled. BUG=b:35586335 BRANCH=cr50 TEST=as follows: - verified that board ID can be read by any image and set by debug images. - with the upcoming patches verified the ability to set and read board ID values using vendor commands. Change-Id: I35a3e2db92175a29de8011172b80091065b27414 Signed-off-by: Philip Chen <philipchen@google.com> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/522234 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Mary Ruthven <mruthven@chromium.org> " fail_count="0" gerrit_number="522234" owner_email="vbendeb@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/34/522234/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I11a45f65163044f808a82b214f9c5faf775f9020" commit="38146acbd1c8a11856cea4ae3be4bf578bfb1b89" commit_message="cr50: usb_upgrade: pass proper number of bytes to the vendor commands The code invoking vendor commands callbacks rightly passes the pointer to the command payload as the address right after the subcommand field, but does not deduct the size of the subcommand field from the size of the payload passed to the handler. This patch fixes the issue, the command handlers do not see two extra bytes at the tail of the command any more. BRANCH=cr50 BUG=b:62294740, b:35545754 TEST=verified that vendor commands sent over USB and TPM still work properly (in particular the TURN_UPDATE_ON command). Change-Id: I11a45f65163044f808a82b214f9c5faf775f9020 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/522943 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> " fail_count="0" gerrit_number="522943" owner_email="vbendeb@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/43/522943/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I18602882208a20861c0e8e49d31406390547326c" commit="cc2df83525c2af3fd7531442b9f1d9cd560ee85e" commit_message="chromiumos-overlay: Remove references to gizmo board. This board overlay is no longer used. BUG=chromium:729073 TEST=none CQ-DEPEND=Iaf47772eb20aec864a3e8891b7980f01d7d6ee18 Change-Id: I18602882208a20861c0e8e49d31406390547326c Reviewed-on: https://chromium-review.googlesource.com/522986 Commit-Ready: Dan Erat <derat@chromium.org> Tested-by: Dan Erat <derat@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522986" owner_email="derat@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/86/522986/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iaf47772eb20aec864a3e8891b7980f01d7d6ee18" commit="2879f6543d016266fed93743c08044dc786e8c21" commit_message="overlays: Remove overlay-gizmo. This board overlay is no longer used. BUG=chromium:729073 TEST=none CQ-DEPEND=I18602882208a20861c0e8e49d31406390547326c Change-Id: Iaf47772eb20aec864a3e8891b7980f01d7d6ee18 Reviewed-on: https://chromium-review.googlesource.com/522864 Commit-Ready: Dan Erat <derat@chromium.org> Tested-by: Dan Erat <derat@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522864" owner_email="derat@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/64/522864/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I686c3516fbabfeb77026666f73e6aca52acb4ec3" commit="63cf892c9510954528e6e1c0476fb5fd1f1d5346" commit_message="libcxx: remove libcxx libcxxabi libcxxrt ebuilds We have these ebuilds in chromiumos-overlay, there is no need to keep old version in portage-stable. BUG=chromium:620402 TEST=sudo emerge cross-x86_64-cros-linux-gnu/libcxx Change-Id: I686c3516fbabfeb77026666f73e6aca52acb4ec3 Reviewed-on: https://chromium-review.googlesource.com/518928 Commit-Ready: Yunlian Jiang <yunlian@chromium.org> Tested-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Manoj Gupta <manojgupta@chromium.org> " fail_count="0" gerrit_number="518928" owner_email="yunlian@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/28/518928/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I6192c0a35cb4161ffa195f54083da5e89373bb51" commit="feb1ed5ad28e15943c662e730a1cdbdc2f131c89" commit_message="Remove autofdo llvm-next use flag. Toolchain builders fail to build autofdo with llvm-next as host clang is not rebuilt. Instead directly query if llvm was built with llvm-next and apply the patch to use newer API. Also update EAPI to 5 to be able to use the query. BUG=chromium:728360 TEST=autofdo builds with llvm with and without llvm-next. Change-Id: I6192c0a35cb4161ffa195f54083da5e89373bb51 Reviewed-on: https://chromium-review.googlesource.com/522908 Commit-Ready: Manoj Gupta <manojgupta@chromium.org> Tested-by: Manoj Gupta <manojgupta@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522908" owner_email="manojgupta@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/08/522908/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I8f842abaa50de724df60dd7e19f9e97cb9660367" commit="da6b935b740b343d090609c17e385e72658d5a90" commit_message="common: Add support for flash with regions of different size Add support to handle devices with flash regions of different sizes. BRANCH=none TEST=compile BUG=b:38018926 Change-Id: I8f842abaa50de724df60dd7e19f9e97cb9660367 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/264031 Reviewed-by: Alexandru M Stan <amstan@chromium.org> " fail_count="0" gerrit_number="264031" owner_email="gwendal@chromium.org" pass_count="0" patch_number="19" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/31/264031/19" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I974fec8f25a7b000048de96645786c57343b9511" commit="73a70b191741ebb8eedb83ed9efd9a7645c0b8a2" commit_message="Fix GLMark2 waffle backend patch to work with clang. Waffle patch is declaring gl* function pointers in global scope. clang complains because same functions with extern "C" linkage are exported in gl2.h header file. Put these function pointers in a separate namespace to fix this issue. BUG=chromium:728835 TEST=glmark2 builds for kevin and caroline boards. Change-Id: I974fec8f25a7b000048de96645786c57343b9511 Reviewed-on: https://chromium-review.googlesource.com/521768 Commit-Ready: Manoj Gupta <manojgupta@chromium.org> Tested-by: Manoj Gupta <manojgupta@chromium.org> Reviewed-by: Chad Versace <chadversary@chromium.org> Reviewed-by: Caroline Tice <cmtice@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="521768" owner_email="manojgupta@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/68/521768/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Icf12150c8902b3dedf7ca66df5afb57fb4f53fc0" commit="d357e98c678e65bb052ad9fac8d5f258eb5d667d" commit_message="cros_ec: workaround to set supported request/response size properly Due to a bug (chromium:725580), some NPCX based EC include the SPI header and footer in their supported response size. It leads flashrom to send bigger commands than the EC can support. Workaround the issue by only sending 4 bytes aligned payload. BUG=chromium:725580 BRANCH=none TEST=On kevin, without the fix: cros_ec_set_max_size: sending protoinfo command cros_ec_set_max_size: rc:12 cros_ec_set_max_size: max_write:536 max_read:163 ... Reading flash... __cros_ec_command_dev_v2(): Command 0x11 returned result: 11 (11 means Overflow: we request 163 bytes of data while the EC really support 160 bytes). After: cros_ec_set_max_size: sending protoinfo command cros_ec_set_max_size: rc:12 cros_ec_set_max_size: max_write:536 max_read:160 ... Reading flash... done.SUCCESS Change-Id: Icf12150c8902b3dedf7ca66df5afb57fb4f53fc0 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/521424 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> " fail_count="1" gerrit_number="521424" owner_email="gwendal@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/flashrom" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/flashrom" ref="refs/changes/24/521424/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I00d8efb14f396320da32e86683e021890fb245ae" commit="f13d4a4aa3860c184aa5296c366e071db20aaa97" commit_message="cros-board: add lakitu-st board BUG=chromium:728852,b:62272706 TEST=TBD Change-Id: I00d8efb14f396320da32e86683e021890fb245ae Reviewed-on: https://chromium-review.googlesource.com/522222 Commit-Ready: Edward Jee <edjee@google.com> Tested-by: Edward Jee <edjee@google.com> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522222" owner_email="edjee@google.com" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/22/522222/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I40ad3e80d8598ccbf3c8d06f67c9351fb4043dea" commit="6c9411785dbfd645e6abfc7f196a37dce27aad7f" commit_message="Follow Google C++ style guide This change was partly generated by running $ clang-format -i src/*.{cc,h} With added .clang-format symlinked to platform2/ - Use namespaces and correctly named include guards - Some changes according to cpplint.py output BUG=chromium:713756 TEST=emerge-guado sys-apps/atrusctl CQ-DEPEND=CL:519245 Change-Id: I40ad3e80d8598ccbf3c8d06f67c9351fb4043dea Signed-off-by: Emil Lundmark <emil@limesaudio.com> Reviewed-on: https://chromium-review.googlesource.com/496208 Reviewed-by: Simon Que <sque@chromium.org> " fail_count="0" gerrit_number="496208" owner_email="emil@limesaudio.com" pass_count="0" patch_number="7" project="chromiumos/third_party/atrusctl" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/atrusctl" ref="refs/changes/08/496208/7" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I73c326157234068d90ba62ad0b7c3cf81b55d510" commit="1ebf8addcbd824eb9c00754647e34a7a0a1b2b65" commit_message="cros-constants.eclass: add CROS_GIT_AOSP_URL This adds CROS_GIT_AOSP_URL variable for Android repos. BUG=chromium:620402 TEST=None Change-Id: I73c326157234068d90ba62ad0b7c3cf81b55d510 Reviewed-on: https://chromium-review.googlesource.com/522967 Commit-Ready: Yunlian Jiang <yunlian@chromium.org> Tested-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522967" owner_email="yunlian@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/eclass-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/eclass-overlay" ref="refs/changes/67/522967/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib77039108a58946f4fa9552c7a795d06ab13fffc" commit="289b9a88d9c94ade6de07dd65aa3e2f1c1db5a26" commit_message="cmake: update to 3.7.2 This CL upgrades the cmake package to the lastet stable version from Gentoo. BUG=chromium:716083 TEST=Successful trybot runs on link-llvm-toolchain, daisy-llvm-toolchain, x86-alex-release, elm-release and chromiumos-sdk. Change-Id: Ib77039108a58946f4fa9552c7a795d06ab13fffc Reviewed-on: https://chromium-review.googlesource.com/487704 Commit-Ready: Caroline Tice <cmtice@chromium.org> Tested-by: Caroline Tice <cmtice@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Yunlian Jiang <yunlian@chromium.org> " fail_count="0" gerrit_number="487704" owner_email="cmtice@chromium.org" pass_count="0" patch_number="5" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/04/487704/5" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I2e2b097599af1db47a4a0fe3e3f1cfe9b2d07aff" commit="c23065e6b9ee15cc414f5e12e7a6d36faa8ee9f6" commit_message="Remove security_OpenSSLRegressions. It's testing for a local patch that no longer exists. After removing from the ebuild, the code will be deleted. BUG=chromium:709990 TEST=test_that suite:bvt-inline does not run the test. Change-Id: I2e2b097599af1db47a4a0fe3e3f1cfe9b2d07aff Reviewed-on: https://chromium-review.googlesource.com/522168 Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org> Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="522168" owner_email="jorgelo@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/68/522168/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I87916f50ede4973376ccd81456c9045f38f0f35a" commit="931fd74dc1c0c49b0e2158763b616914d2fa030d" commit_message="smogcheck: let people set the proper libdir The proper library path depends on the active ABI, and only the higher build system (emerge) knows that info. BUG=chromium:725253 TEST=precq passes Change-Id: I87916f50ede4973376ccd81456c9045f38f0f35a Reviewed-on: https://chromium-review.googlesource.com/511470 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> " fail_count="0" gerrit_number="511470" owner_email="vapier@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/70/511470/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iecda46f5cc858196de52e284a04c58240ddfd9ea" commit="7a543975a73a72baa06e246f6414150edca8cbc2" commit_message="portage: switch to cros-workon Now that we have portage checked out in our manifest, we can switch from manual patching to a cros-workon package. This will make it easier to manage updates. BUG=chromium:712659 TEST=precq passes Change-Id: Iecda46f5cc858196de52e284a04c58240ddfd9ea Reviewed-on: https://chromium-review.googlesource.com/509211 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> " fail_count="3" gerrit_number="509211" owner_email="vapier@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/11/509211/2" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I758a190c72bcff3832119958ce66dce55678617f" commit="03b718fcce683d5da496fd911ef677a1c2c05bca" commit_message="Change to use list_next api to get all artifacts for a given build BUG=b:62141068 TEST=local devserver test Change-Id: I758a190c72bcff3832119958ce66dce55678617f Reviewed-on: https://chromium-review.googlesource.com/522889 Commit-Ready: Kris Rambish <krisr@chromium.org> Tested-by: Dan Shi <dshi@google.com> Reviewed-by: Kris Rambish <krisr@chromium.org> " fail_count="0" gerrit_number="522889" owner_email="dshi@google.com" pass_count="0" patch_number="1" project="chromiumos/platform/dev-util" project_url="https://chromium-review.googlesource.com/chromiumos/platform/dev-util" ref="refs/changes/89/522889/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib4a04aef2b123900449504c4f8c5e4d5b4674f82" commit="fbbf16f71c6cf2c70335c97327d58731836d6959" commit_message="shared-mime-info: upgraded package to upstream Upgraded x11-misc/shared-mime-info to version 1.4 on amd64, arm, x86 BUG=chromium:710116 TEST=precq passed Change-Id: Ib4a04aef2b123900449504c4f8c5e4d5b4674f82 Reviewed-on: https://chromium-review.googlesource.com/521726 Commit-Ready: Lann Martin <lannm@chromium.org> Tested-by: Lann Martin <lannm@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> " fail_count="0" gerrit_number="521726" owner_email="lannm@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/26/521726/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic032b5473d76e35cea867d12633aecfd04505752" commit="f0904ba2c30e7036fa08387136aa4b632bcf6ce7" commit_message="procps: upgraded package to upstream Upgraded sys-process/procps to version 3.3.12 on amd64, arm, x86 BUG=chromium:710102 TEST=precq passes Change-Id: Ic032b5473d76e35cea867d12633aecfd04505752 Reviewed-on: https://chromium-review.googlesource.com/517973 Commit-Ready: Lann Martin <lannm@chromium.org> Tested-by: Lann Martin <lannm@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> " fail_count="1" gerrit_number="517973" owner_email="lannm@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/73/517973/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I80a74fd0d54467579523c7922d2e220860ddfe70" commit="31bfd4097c4bcf798ced001102cdf3967351b4fe" commit_message="CHROMIUM: oom: show backtrace of threads refusing to die If we stumble upon a thread that refused to die, and the thread is not running, let's print it's backtrace so we could see what locks it wait on so that we can fix it. BUG=chromium:727707 TEST=Build and boot Caroline, try to load it to start ooming Change-Id: I80a74fd0d54467579523c7922d2e220860ddfe70 Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/522983 Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="522983" owner_email="dtor@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/83/522983/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I069fe7cc0f0856a68f0e2df464458fa110c1ef27" commit="059a4ddac704a23fc5f77eb13353084cd3747879" commit_message="BACKPORT: drm: Release driver references to handle before making it available again When userspace closes a handle, we remove it from the file->object_idr and then tell the driver to drop its references to that file/handle. However, as the file/handle is already available again for reuse, it may be reallocated back to userspace and active on a new object before the driver has had a chance to drop the old file/handle references. Whilst calling back into the driver, we have to drop the file->table_lock spinlock and so to prevent reusing the closed handle we mark that handle as stale in the idr, perform the callback and then remove the handle. We set the stale handle to point to the NULL object, then any idr_find() whilst the driver is removing the handle will return NULL, just as if the handle is already removed from idr. Note: This will be used to have a direct handle -> vma lookup table, instead of first a handle -> obj lookup, and then an (obj, vm) -> vma lookup. v2: Use NULL rather than an ERR_PTR to avoid having to adjust callers. idr_alloc() tracks existing handles using an internal bitmap, so we are free to use the NULL object as our stale identifier. v3: Needed to update the return value check after changing from using the stale error pointer to NULL. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: dri-devel@lists.freedesktop.org Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: Thierry Reding <treding@nvidia.com> [danvet: Add note about the use-case.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1460721308-32405-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit f6cd7daecff558fab2c45d15283d3e52f688342d) BUG=chromium:629521 TEST=Run http://browsertests.herokuapp.com/perf/mmap_fail_issue.html on the device for a day with --enable-native-gpu-memory-buffers --enable-zero-copy --disable-gpu-rasterization Change-Id: I069fe7cc0f0856a68f0e2df464458fa110c1ef27 Reviewed-on: https://chromium-review.googlesource.com/509910 Commit-Ready: Carlos Santa <carlos.santa@intel.com> Tested-by: Carlos Santa <carlos.santa@intel.com> Reviewed-by: Carlos Santa <carlos.santa@intel.com> Reviewed-by: Dongseong Hwang <dongseong.hwang@intel.com> Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org> " fail_count="0" gerrit_number="509910" owner_email="carlos.santa@intel.com" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/10/509910/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.10" change_id="I9f9391c07227200299f6bb570687dc883feca6cb" commit="16fb0711f3ae74c01bde70abc1f27886f87224ab" commit_message="CHROMIUM: low_mem: make ram_vs_swap_weight configurable As a temporary fix to OOM kill deadlocks, we want to try to avoid OOMs or at least reduce the number of occurrences. So we make the ram_vs_weight parameter run-time configurable, with two possible uses in mind: 1. leave as is (the default) and 2. on specific devices, set it to infinity so that available swap is completely ignored in the available memory calculation. This also adds the "available" sysfs entry, so that chrome doesn't have to duplicate the available memory calculations. BUG=chromium:727707 TEST=played around with sysfs Change-Id: I9f9391c07227200299f6bb570687dc883feca6cb Reviewed-on: https://chromium-review.googlesource.com/522745 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="0" gerrit_number="522745" owner_email="semenzato@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/522745/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I9f9391c07227200299f6bb570687dc883feca6cb" commit="6fc5b0333fa12fecf10834fd13173daed6d3237a" commit_message="CHROMIUM: low_mem: make ram_vs_swap_weight configurable As a temporary fix to OOM kill deadlocks, we want to try to avoid OOMs or at least reduce the number of occurrences. So we make the ram_vs_weight parameter run-time configurable, with two possible uses in mind: 1. leave as is (the default) and 2. on specific devices, set it to infinity so that available swap is completely ignored in the available memory calculation. This also adds the "available" sysfs entry, so that chrome doesn't have to duplicate the available memory calculations. BUG=chromium:727707 TEST=played around with sysfs Change-Id: I9f9391c07227200299f6bb570687dc883feca6cb Reviewed-on: https://chromium-review.googlesource.com/522822 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="0" gerrit_number="522822" owner_email="semenzato@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/22/522822/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.8" change_id="I9f9391c07227200299f6bb570687dc883feca6cb" commit="5df440ee1693b753901bf17136656ab980ffe1a8" commit_message="CHROMIUM: low_mem: make ram_vs_swap_weight configurable As a temporary fix to OOM kill deadlocks, we want to try to avoid OOMs or at least reduce the number of occurrences. So we make the ram_vs_weight parameter run-time configurable, with two possible uses in mind: 1. leave as is (the default) and 2. on specific devices, set it to infinity so that available swap is completely ignored in the available memory calculation. This also adds the "available" sysfs entry, so that chrome doesn't have to duplicate the available memory calculations. BUG=chromium:727707 TEST=played around with sysfs Change-Id: I9f9391c07227200299f6bb570687dc883feca6cb Reviewed-on: https://chromium-review.googlesource.com/522411 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="0" gerrit_number="522411" owner_email="semenzato@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/11/522411/3" remote="cros" total_fail_count="0"/><lkgm version="9612.0.0-rc2"/></manifest> |
