| <?xml version="1.0" encoding="utf-8"?><manifest revision="347204867f3a6c2b2c8b775cf8e169c03595ba1e"> |
| <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="bce0483dd09f592d6f9f989f0e34fc930d206810" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="16c285d16813172eaacd12d3396df90a3894cbc5" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="a6cbc3661fcae9e3eb330d5cf0eb1f3314968b38" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/minijail" path="src/aosp/external/minijail" revision="472581ace012ae755f3136870bba8bdd5cdb8331" 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="b606f03ee5a4d7a5f5f78cc980a447f08d94f9df" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="496f396f9178b2830a60e3f667321f7eae5c482c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="90c4a0d3a66a84270aa8a8b4d46a97e6172074e9" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="2fd999172a963720eae7161e1d7fa48b2c22bd0a" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="696faf4dffebca4d15959251cf3fb88b0727d801" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="b470b41a117a213f5b8cf2d7badcc208da001b72" upstream="refs/heads/master"/> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" revision="dbc033517bd8edd0a90de7593c5b2829a0718136" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/hwcplus" revision="e66a31e54e12906e86dc59f95b458889f025c505" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromium/tools/depot_tools" revision="9d20675998f69ae543c3ebed4bcc14f748f3797e"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/chromite" path="chromite" revision="f67f93e2592355a9e8fc2fafe1f2ff2695035ed4" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/manifest" path="manifest" revision="87d1aba6179807d63d6586c95f3f7cca76e29586" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="bf44726f5993f7abc39c1a487d17b7dd41c6338e" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="d6979d33a60493b5bb257e72ecd75bac7fc48f5b" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="a2882abcbdc54e408f31a30d9ace64fcfe0d0b0a" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="e4fa502eea525e2aaa8e1fc44bfabb28316c9a47" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="5fc15dee29d1d967ccc46071a732d802d3b34655" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="2ff17232be7ec4a7d87f861abe1c52c7d13e35d8" 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="563ac6b7db7e742045b02ed29cc5ecc81ff58531" 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="9455125dcf07aceef29693b48b4d144b819b513e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="05ce8d3c59a2d8e765b3beb2e1a69e7fcf59e5ba" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="76a782517d00df81b30f0efb89060d89d1d38bb3" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="763040e4a6c093697b2d6c8da113bea81468e8dd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="e52e1fcf82315b4f6f969c39cb372bc29e84a9c3" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="2aca0ac5103f3216e307d07bd3e75d890b9746c5" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="c4df284b32558f631862f79c75fc03af4f5ca68a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="309c0107cd02bad4142bc5f8f76cc3778c9bd113" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="a9b4ae1f5a9fd3ada8709d0d39e6f694bf8f6423" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="28fba4f8f6af17e5a033307a199a6a9188afcb40" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="312f06df6f921915f15f976f936eea335c51b236" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="10469a5be03af25ef6a6bd168d488b00d3255a68" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="8f99f4378aacc6ad7da94d0519d5d2f99f71f021" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5a656849c7d2b0d0ddbe0ac6d300c1e2fada0bb4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/glbench/images" path="src/platform2/glbench/images" revision="5fd5ce655833f65d46b1950bec4eedeb4e96959b" 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="67d5567177301d0c24303f26ad119ab7bd7fab40" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="fb7fe28f7f7e948d6ce4c8e9b1ba9c3999c819ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="1a710721263b8b93ab49af6a6f749a778483f3df" 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="5ee665e7c68856d3b6ce8bb0f610d43503e603af" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="6647f24f432fa0746dd9561cbe9e8e34fbe3bbd6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="3c7204287bbc8f4341f546857216389bdff58e51" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/microbenchmark" path="src/platform/microbenchmark" revision="d5ea30febe406c5b486325dfae926564f3a46efd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="0fd114250dba56533eee9b7a812bc287b7dbf663" 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="2ce3d4578345d2b3a154839ff1fe70a2d1f1bb96" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="44148fe605b952132644f0d0e5ccea7cfcc6d6c8" 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="9efd0e1723cd45709bd0d34e8e7bbfd15967f0d5" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="5a230ee17756dc43ff732932dcb52899c06a4d09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="4e881cb61b0afc11d645383d70a3929f7f68df21" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="1973ced7b023bdb4d095dff3e779bb4afacfe4f4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="6b0aba12a385f4d3a7a47641a3a919018032f6f8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="002d36922396e45b745dff32b0244f3c1744fd5b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="75d8f1bfbbb3dfc870fcbc22f53cd16b66ac7f23" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="d2e7d94a834b54511ca57e6359839f9ca86d6d04" 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/trunks" path="src/platform/trunks" revision="92dbe8c9e7fcf8acf67805fd5e25e85aa371f673" 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" path="src/platform/vboot" revision="2d30a2f5b1c81eb61de4bf82180a910d45f22e81" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="814aaf09ceecddb16a01e1cbe0df4299b83b5699" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="c0ce1732095ed3b16d478af8016fc23d14ffa000" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/wireless_automation" path="src/platform/wireless_automation" revision="d7177dbd464f2952e10309bf1eef56bb31a7f8ad" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/workarounds" path="src/platform/workarounds" revision="30cab56de921f5be2d24c2e83bcd4ad5631b2d9b" 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="985d0d7edf399fa6214a198b8a15b805f71e95bd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="d4774913e68a0daa4c754edc7e43f87ff1ca3b53" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="fdbac8e95ef6153ab23370ea1586a86f462dbe5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="9328255777f233fa007da1375edfa3f416a0c231" 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="3d99b17f60142ef96d39759132d4448e138b6c4e"> |
| <annotation name="branch-mode" value="create"/> |
| </project> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="2ac9c66be70fea0776f0cedcbedda26bd6c9ea5a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="5b88e58e74b5acd2b45b56cc7fe556806eafaf63" upstream="refs/heads/chromeos-5.39"/> |
| <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="aac0d13ecc812ce6b18cde19cec4f8949e023b8b" 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="5319e836704fcf2df75c7425addebb89bb973714" 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="3182aa85c087446e4358370549adc45db21ec124" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="f140c0aa430e1db1c0f31d23d3eb2397d47f209e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" 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="aaaf66654dba797f152066df4d1dc4144b492c66" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="915e74112423c47738210b81367c7e06e246a4da" 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="69702c400e274984a24d08fcaefe3952d5dcb36e" 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="c87c2b18f4e41ca341e7d8ff2248f1ec3ec35b98" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="08666c3432c7d7ebeeeed165ff8869e698fed86c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hwcplus-drm" path="src/third_party/hwcplus-drm" revision="7376a8da1c961115a61d7a3cb23bb13e4153583d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-chewing" path="src/third_party/ibus-chewing/files" revision="7a9514a0844eb5eb90ab96f62484a6af9e4a0d6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-xkb-layouts" path="src/third_party/ibus-xkb-layouts/files" revision="6af015110aa92dc2eed88a9f704634c3eff53b14" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="653848d0fa58ebf9cc0c7543ff88b4a9e154651d" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="806a0a1fba47afc09bf8f6f3d28c50f0627f1bc1" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="b041f4f0089b777efa714310b61863fa97c87126" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="3b01722b8e9d835aa66ca783311e53238229fa9c" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="49d02986da834236f02929e4e799b3968146f211" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="dceee6ef99b968fd11d9c6058448202db835bc0f" 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="a30fa998eb0ba2288017b4fd9f616bee81180f63" upstream="refs/heads/chromeos-2.4.66"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="c4e2949edeed01ca3b810729a7af0d265c49629b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="a436c551cf226af66cdb3dd74ee3971d0b1dae04" 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="61eb2eceaed6f66a36aa9fc3ed2bd55b8aa3eafe" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="0ef8540dbdb318b868d98421a08cd5d6d8a6a309" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7fea30a4ad5b7b4e99865afcee8b6bfd19ec8b03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="db05d126a42a1540a503a2e5b49c3746c03df77d" 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="b8bc460f4022e1108549e33ac40a8b5ed1d6269f" upstream="refs/heads/arc-11.3.0-pre1"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="6ef50efc1079e544d7fe912aba219e8907cb0cbd" 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/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="d759387adb6b4079241f7d1f2a145738acad929b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ply-image" path="src/third_party/ply-image" revision="6cf4e4cd968bb72ade54e423e2b97eb3a80c6de9" upstream="refs/heads/master"/> |
| <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/rootdev" path="src/third_party/rootdev" revision="5d7d7ff513315abd103d0c95e92ae646c1a7688c" 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/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="0c4b13bf15b8e5773b79e6317121fba5e97a154f" 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="8f3d7352003a8492e69128827634215314878d6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="416d30f74a9c1dc08b95b907d8b7e81edf6c9db0" 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="bcf721d62d6a4c4c162c63714371fa4349df53bc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/xf86-video-armsoc" path="src/third_party/xf86-video-armsoc" revision="30370e9dbf7ba0e457ee7de297d2ad6c269a00be" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="9292030109847793f7a6689adac1ddafb412fe14"/> |
| <project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="61240f88ead5c68424eab72194641a2310e59c3b" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="05ff27aaf4275e40715872280021734dc6e7c53c" upstream="refs/heads/master"/> |
| <project name="platform/hardware/libhardware" path="src/platform/libhardware" remote="aosp" revision="1c1e311e0683605daf8f785ff6067a8837a13dc1" upstream="refs/heads/master"/> |
| <project name="platform/system/bt" path="src/platform/bt" remote="aosp" revision="d19e0785e662e640191a075eda07acce61c2aeda" upstream="refs/heads/master"/> |
| <project name="platform/system/core" path="src/platform/core" remote="aosp" revision="9cd828b8589a64e79cbd6aa7dc324fcdba75dd73" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="6422a80df992e4542dbd4fb70a04f316065674af" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="fe767fbb6d580458aeea609ac5c82b600acce63d"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.18" change_id="I669ee1064adfc9f214a8dded872157d6b5ed0f91" commit="c1f450569ea0738957b01e7db96643276f1bc92a" commit_message="BACKPORT: drm: Simplify drm_for_each_legacy_plane arguments No need to pass the planelist when everyone just uses dev->mode_config.plane_list anyway. I want to add a pile more of iterators with unified (obj, dev) arguments. This is just prep. Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 4ea50e99bd3501aea394aa7a9e9bd3115faabf37) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: The function ilk_compute_wm_parameters is removed in drivers/gpu/drm/i915/intel_pm.c Change-Id: I669ee1064adfc9f214a8dded872157d6b5ed0f91 Reviewed-on: https://chromium-review.googlesource.com/334089 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334089" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/89/334089/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I7541569a7e1758ed8a197175094cb22be7d399c7" commit="f7fbbad708812394421d1d5ad933609dffbf7084" commit_message="Revert "CHROMIUM: Disable watermarks by default in multi-screen configuration." This reverts commit 0e2fc440a72346db049e5dfce0fc6e4890ce6fe0. Enable watermarks in all allowed display configurations. BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. Change-Id: I7541569a7e1758ed8a197175094cb22be7d399c7 Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reviewed-on: https://chromium-review.googlesource.com/344371 Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="344371" 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/344371/5" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I7d82e742971421797d97d70412951e7468e96e52" commit="5c022a6fa4f39fa74580b1e4a6ccdaa0f3429103" commit_message="Revert "CHROMIUM: drm/i915: Allow a way to disable watermark for debuging purposes." This reverts commit afcec1fd6381b7d880daa96cc221d79f700d935f. Enable watermarks in all allowed display configurations. BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. Change-Id: I7d82e742971421797d97d70412951e7468e96e52 Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reviewed-on: https://chromium-review.googlesource.com/344372 Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="344372" 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/344372/5" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I85fd6afadee6cc1f528f7953f799da874ad37af5" commit="44e69f175b5ad91c51b6997c3c2d52535af8e7dc" commit_message="Revert "FROMLIST: drm/i915/skl: Increase ddb blocks to support large cursor sizes" This reverts commit 3fdf4842473a95e005ea3b6d8901aaf958dcc5d3. With the right watermark values programmed for the listed planes, we need not bump the number of ddb blocks for single screen. However we may have to increase the ddb blocks in multi-screen configuration to allow the system to enter deeper PC states. BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. Change-Id: I85fd6afadee6cc1f528f7953f799da874ad37af5 Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reviewed-on: https://chromium-review.googlesource.com/344373 Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="344373" 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/344373/5" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I9bfb08e197805307b4bc520563db5f02e3904748" commit="c25830dc2a2df939ab2a0ed8a9de67fc11628e54" commit_message="BACKPORT: drm: Make the connector dpms callback return a value, v2. This is required to properly handle failing dpms calls. When making a wait in i915 interruptible, I've noticed that the dpms sequence could fail with -ERESTARTSYS because it was waiting interruptibly for flips. So from now on allow drivers to fail in their connector dpms callback. Encoder and crtc dpms callbacks are unaffected. Changes since v1: - Update kerneldoc for the drm helper functions. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> [danvet: Resolve conflicts due to different merge order.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 9a69a9ac20f7f3435dd18019f902351c61a9ad1d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Removed drivers/gpu/drm/radeon/radeon_dp_mst.c Did not apply the patch on drivers/gpu/drm/tegra/dsi.c Did not apply the patch on drivers/gpu/drm/tegra/sor.c Change-Id: I9bfb08e197805307b4bc520563db5f02e3904748 Reviewed-on: https://chromium-review.googlesource.com/334057 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334057" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/334057/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I8f352480e86708c5a4fc23618d527bdd09a1b3ad" commit="3d9bb21db477dac73caaa96829fde8cd66a4f000" commit_message="BACKPORT: drm/i915: Validate the state after an atomic modeset only, and pass the state. First step in removing dpms and validating atomic state. There can still be a mismatch in the connector state because the dpms callbacks are still used, but this can not happen immediately after a modeset. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ee165b1a6e0269e5badde679f72fe39d3d15a7d4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in drivers/gpu/drm/i915/intel_drv.h Change-Id: I8f352480e86708c5a4fc23618d527bdd09a1b3ad Reviewed-on: https://chromium-review.googlesource.com/334058 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334058" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/334058/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I119b80699fc5e6dcb0c0694b78965e720f9907a3" commit="fc920d33c662a937a19a41ef266655fb35ce63ca" commit_message="UPSTREAM: drm/i915: Remove some unneeded checks from check_crtc_state. This is handled by the atomic core now, no need to check this for ourself. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7b89b8de4e90d3c08f845e2b559929c8f77981ae) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I119b80699fc5e6dcb0c0694b78965e720f9907a3 Reviewed-on: https://chromium-review.googlesource.com/334039 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334039" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/334039/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ic4fddbc3a67869134e1b6d403db5a5f45c4bb39f" commit="98353250000801860cd3ee30c511de58a1057c3a" commit_message="UPSTREAM: drm/i915: Remove connectors_active from state checking. Connectors are updated atomically now, so the only interaction with the encoder is through base.crtc. If it's NULL the encoder's not part of any crtc, and if it's not NULL then active should be equal to crtc_state->active. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7c60d1984afa482f0648d963206124df6dca325e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ic4fddbc3a67869134e1b6d403db5a5f45c4bb39f Reviewed-on: https://chromium-review.googlesource.com/334038 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334038" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/38/334038/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I4e8bbcb0c7768481750d2516f1bbbed541a948e6" commit="c75c6b88f593a5b506b84295d67f34d2b8783662" commit_message="UPSTREAM: drm/i915: Make crtc checking use the atomic state, v2. Instead of allocating pipe_config on the stack use the old crtc_state, it's only going to freed from this point on. All crtc' are now only checked once during modeset, because false positives can happen with encoders after dpms changes and to limit the amount of errors for 1 failure. Changes since v1: - crtc_state -> old_crtc_state - state -> old_state Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 4d20cd860bbe908ef62aa4673eeac8f8f2c43735) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I4e8bbcb0c7768481750d2516f1bbbed541a948e6 Reviewed-on: https://chromium-review.googlesource.com/334050 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334050" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/334050/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ib2246c97ba304e175511526cc3f3144ba76f706e" commit="14740deaeb22b8757b6fb63c7f1926382c815c85" commit_message="UPSTREAM: drm/i915: Also call frontbuffer flip when disabling planes. We also need to call the frontbuffer flip to trigger proper invalidations when disabling planes. Otherwise we will miss screen updates when disabling sprites or cursor. On core platforms where HW tracking also works, this issue is totally masked because HW tracking triggers PSR exit however on VLV/CHV that has only SW tracking we miss screen updates when disabling planes. It was caught with kms_psr_sink_crc sprite_plane_onoff and cursor_plane_onoff subtests running on VLV/CHV. This is probably a regression since I can also get this with the manual test case, but with so many changes on atomic modeset I couldn't track exactly when this was introduced. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 8be6ca8537e1230da8e92c753df4125151a3f6b1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib2246c97ba304e175511526cc3f3144ba76f706e Reviewed-on: https://chromium-review.googlesource.com/334080 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334080" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/80/334080/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I01dc748c845c781efd6a816e9af9bdb2ef2e035b" commit="525facf8b1c0c2bddf47e57a0f8af2fa891c23b7" commit_message="BACKPORT: drm/i915: Future proof panel fitter. This is another case where we can consider the default is the newest available and not actually a missed case. No functional change. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 1c132b44f0eabaaf801e79a3e4b98770431a4274) Conflicts: Minor conflict in haswell_get_pipe_config drivers/gpu/drm/i915/intel_display.c Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I01dc748c845c781efd6a816e9af9bdb2ef2e035b Reviewed-on: https://chromium-review.googlesource.com/334052 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334052" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/334052/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I4b4c3368e9142a6438b67424dd9064de2ccd5432" commit="66bbc9fbe90857470a4ba746b915a86e8c6097b3" commit_message="UPSTREAM: drm/i915: Dump pfit state as hex The pfit state is stored as register values, so dump them as hex instead of decimal to make some sense of the error messages. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 333b8ca8cfcafc8c556d4333fe660283fea691d4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I4b4c3368e9142a6438b67424dd9064de2ccd5432 Reviewed-on: https://chromium-review.googlesource.com/334051 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334051" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/334051/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I961f55176112d137fd06e1bb2fce71322dd1cd6e" commit="6cbe9a5f7bc72bc646ee0f04a52896d424180afa" commit_message="BACKPORT: drm/atomic: Make prepare_fb/cleanup_fb only take state, v3. This removes the need to separately track fb changes i915. That will be done as a separate commit, however. Changes since v1: - Add dri-devel to cc. - Fix a check in intel's prepare and cleanup fb to take rotation into account. Changes since v2: - Split out i915 changes to a separate commit. Cc: dri-devel@lists.freedesktop.org Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com> [danvet: Squash in msm fixup from Maarten.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 844f9111f6f54f88eb2f0fac121b82ce77193866) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Removed the file drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c Used the master copy of drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c Used the master copy of drivers/gpu/drm/omapdrm/omap_plane.c Change-Id: I961f55176112d137fd06e1bb2fce71322dd1cd6e Reviewed-on: https://chromium-review.googlesource.com/334074 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="0" gerrit_number="334074" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/74/334074/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I6a8f4d876e73962b347147d9eb156b9573b481a7" commit="2262ef571a816a26c10501fe86a6ee396b5bd916" commit_message="UPSTREAM: drm/i915: Use atomic plane state in the primary plane update. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d4b08630fb6e3fe9948456b09feb223fba2b48a6) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I6a8f4d876e73962b347147d9eb156b9573b481a7 Reviewed-on: https://chromium-review.googlesource.com/334053 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334053" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/334053/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="If189f364083dc43bff8ef2aa33f22cd3ad639925" commit="9765a3e628c82b9fd2c82c71112a00ccf328c3cf" commit_message="UPSTREAM: drm/i915: Use the atomic state in intel_update_primary_planes. This function was still using the legacy state, convert it to atomic. While we're at it, fix the FIXME too and disable the primary plane. v2 (Daniel): - Add FIXME explaining that update_primary_planes should soon get removed anyway. - Don't call ->disable_plane since we can't disable the primary plane with a CS flip (noticed by Ville). Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (v1) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 11c22da619101a5a4332df718268e6214e3919f3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If189f364083dc43bff8ef2aa33f22cd3ad639925 Reviewed-on: https://chromium-review.googlesource.com/334035 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334035" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/334035/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I1b0244ccf563fc5d16adca89981e66e465624e59" commit="513cfafb5555d3695793918b8d055ce223bd808b" commit_message="UPSTREAM: drm/i915: Use crtc->state for duplication. In async mode crtc->config can be updated after the locks are released, resulting in the wrong state being duplicated. Note that this also removes a spurious assignment of crtc_state->crtc introduced in commit f0c60574eb1216b0904c0d696c64d5096d6e4913 Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Date: Tue Apr 21 17:12:58 2015 +0300 drm/i915: Call drm helpers when duplicating crtc and plane states Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f2a066f3dee8a0e37015d15298e14e9ad6c0a53d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I1b0244ccf563fc5d16adca89981e66e465624e59 Reviewed-on: https://chromium-review.googlesource.com/334055 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334055" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/334055/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I98dc0f21a93a732dc926b59fca644abe79ec69fc" commit="e928bcd9b1676aef213807027c96791e22e75395" commit_message="BACKPORT: drm/i915: Make updating pipe without modeset atomic. Instead of doing a hack during primary plane commit the state is updated during atomic evasion. It handles differences in pipe size and the panel fitter. This is continuing on top of Daniel's work to make faster modesets atomic, and not yet enabled by default. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> [danvet: - simplify/future-proof if ladder that Jesse spotted - resolve conflict in pipe_config_check and don't spuriously move the code.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit bfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c) Conflicts: Minor context change in drivers/gpu/drm/i915/intel_display.c Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I98dc0f21a93a732dc926b59fca644abe79ec69fc Reviewed-on: https://chromium-review.googlesource.com/334605 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334605" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/05/334605/7" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ibe8acd2a7433532a3e6790feecd40f30a767ecc1" commit="ad1e7d772fb2796a2b24a457829597033ba2ce4e" commit_message="UPSTREAM: drm/i915: remove pre-atomic check from SKL update_primary_plane The comment suggests the check was there for some non-fully-atomic case, and I couldn't find a case where we wouldn't correctly initialize plane_state, so remove the check. Let's leave a WARN there just in case. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Acked-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit a42e5a23ed1939a8eca5a753c19bb8b0e5cee475) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ibe8acd2a7433532a3e6790feecd40f30a767ecc1 Reviewed-on: https://chromium-review.googlesource.com/334033 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334033" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/33/334033/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I521fe3ba75477dcdf82131ff4356da48132702a1" commit="319e6c09fbdfd7034eaa97fd08079113161f5c56" commit_message="UPSTREAM: drm/i915: Add primary plane to mask if it's visible This fixes the warnings like "plane A assertion failure, should be disabled but not" that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons. Most likely caused by commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Date: Mon Jun 1 12:49:54 2015 +0200 drm/i915: update plane state during init This is a new version of commit 721a09f7393de6c28a07516dccd654c6e995944a Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Date: Tue Sep 15 14:28:54 2015 +0200 drm/i915: Add primary plane to mask if it's visible That was reverted in order to facilitate easier backporting of some commits from -next to v4.3. Reported-by: Andreas Reis <andreas.reis@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429 Reported-and-tested-by: Emil Renner Berthing <kernel@esmil.dk> Tested-by: Andreas Reis <andreas.reis@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> [Jani: cherry-picked from -next to v4.3] Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 18e9345b0db9fe7bd18c3c43967789fe0a2fdb52) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I521fe3ba75477dcdf82131ff4356da48132702a1 Reviewed-on: https://chromium-review.googlesource.com/334066 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334066" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/334066/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ib5fd9dfd813f705853bcb4766776185957b27c67" commit="c8738ff6aaa293449a27f398c34608fd6519a96e" commit_message="UPSTREAM: drm/i915/skl+: Enable pipe CSC on cursor planes. (v2) Extend this to SKL and BXT as it's needed for these platforms as well. v2: Change if condition to HAS_DDI() instead of listing each platform Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit fc6f93bce582ccf76335843584e6a797ac72813c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib5fd9dfd813f705853bcb4766776185957b27c67 Reviewed-on: https://chromium-review.googlesource.com/334034 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334034" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/34/334034/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I1176e5dc4162c8e228d8913175fbc98622368e95" commit="67b81b9d9f00cc644fcecc7d8b83ff2ea50a012c" commit_message="UPSTREAM: drm/i915: Make plane fb tracking work correctly, v2. atomic->disabled_planes is a hack that had to exist because prepare_fb was only called when a new fb was set. This messed up fb tracking in some circumstances like aborts from interruptible waits. As a result interruptible waiting in prepare_plane_fb was forbidden, but other errors could still cause frontbuffer tracking to be messed up. Now that prepare_fb is always called, this hack is no longer required and prepare_fb may fail without consequences. Changes since v1: - Clean up a few fb tracking warnings by changing plane->fb to plane->state->fb. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 1ee493991470bcae58e716ba24d6d4eb9ad612ab) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I1176e5dc4162c8e228d8913175fbc98622368e95 Reviewed-on: https://chromium-review.googlesource.com/334075 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334075" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/334075/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I2167ffafef6f3e32bd331661ac06e289aa8631ef" commit="cd34cd9eee9f9bc04351634b47b6b9ec1712e101" commit_message="UPSTREAM: drm/i915: Make prepare_plane_fb fully interruptible. Now that we agreed on not preserving framebuffers pinning is finally allowed to fail because of signals. Use this to make pinning and acquire the mutex in an interruptible way too. Unpinning is still uninterruptible, because it happens as a cleanup of old state, or undoing pins after one of the pins failed. The intel_pin_and_fence_fb_obj in page_flip will also wait interruptibly, and can be aborted now. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b26a6b35581c84124bd78b68cc02d171fbd572c9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I2167ffafef6f3e32bd331661ac06e289aa8631ef Reviewed-on: https://chromium-review.googlesource.com/334082 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334082" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/82/334082/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ie09765b396fde25ee9b166bedbf7dedb1d79721a" commit="17a93ab366bcd7f8a68f5f96235e7fa3abe99d79" commit_message="UPSTREAM: drm/i915: Update legacy primary state outside the commit hook, v2. This should allow not running plane commit when the crtc is off. While the atomic helpers update those, crtc->x/y is only updated during modesets, and primary plane is updated after this function returns. Unfortunately non-atomic watermarks and fbc still depend on this state inside i915, so it has to be kept in sync. Changes since v1: - Add comment that the legacy state is updated for fbc. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 61067a5e69f548f5cb7f575f8e147956b60b2876) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ie09765b396fde25ee9b166bedbf7dedb1d79721a Reviewed-on: https://chromium-review.googlesource.com/334054 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334054" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/334054/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I78e49987ef9a2055deb9c83bed282901cbe34c79" commit="648cb85e2e7630ba5bec5d6687b228a99e32c25f" commit_message="UPSTREAM: drm/i915: Only commit active planes when updating planes during reset. In the next commit commit_plane will no longer check if the crtc is active. To prevent issues with legacy page flips the check should be performed inside update_primary_planes. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f029ee825cdfc486b24ee67a3d4d0b2c05c9bee5) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I78e49987ef9a2055deb9c83bed282901cbe34c79 Reviewed-on: https://chromium-review.googlesource.com/334036 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334036" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/334036/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="If55c892ecaf20d8a16c5a2c8fabbdc1623aab560" commit="033fb97f5636b86271c9226c4b239585bd8c033b" commit_message="BACKPORT: drm/i915: Only run commit when crtc is active, v2. The crtc->active guards are no longer needed now that all state updates are outside the commit. Changes since v1: - Only check crtc->state->active before calling commit_planes_on_crtc. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 6285262259ca3d12da57073236a55d1b81bf8643) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: The functions intel_pipe_update_{start/end} drivers/gpu/drm/i915/intel_display.c take the vblank_count as an argument. Minor context change in drivers/gpu/drm/i915/intel_sprite.c Change-Id: If55c892ecaf20d8a16c5a2c8fabbdc1623aab560 Reviewed-on: https://chromium-review.googlesource.com/334606 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334606" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/06/334606/7" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I634a3cb0527bbb7f1e09c5879073b1d8d0d56f50" commit="0beab34163bb54c7611de1a2db4f8d9f3cc9b659" commit_message="UPSTREAM: drm/i915: Only call commit_planes when there are things to commit. The atomic helpers set planes_changed on a crtc_state if there is any plane_state bound to that crtc. If there's none and there is no pipe update required the crtc has nothing to update, so vblank evasion can be skipped. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 6173ee2886ca46e00ba3d8f0b4a9a1cd6f8a76ce) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I634a3cb0527bbb7f1e09c5879073b1d8d0d56f50 Reviewed-on: https://chromium-review.googlesource.com/334037 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334037" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/37/334037/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Iaec87f1cb13d78de9cc75a26c1da35fec6b935a8" commit="79b2a9cae2eee3181dae46c8d5eaa1d37c14b704" commit_message="UPSTREAM: drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4) Just pull the info out of the state structures rather than staging it in an additional set of structures. To make this more straightforward, we change the signature of several internal WM functions to take the crtc state as a parameter. v2: - Don't forget to skip cursor planes on a loop in the DDB allocation function to match original behavior. (Ander) - Change a use of intel_crtc->active to cstate->active. They should be identical, but it's better to be consistent. (Ander) - Rework more function signatures to pass states rather than crtc for consistency. (Ander) v3: - Add missing "+ 1" to skl_wm_plane_id()'s 'overlay' case. (Maarten) - Packed formats should pass '0' to drm_format_plane_cpp(), not 1. (Maarten) - Drop unwanted WARN_ON() for disabled planes when calculating data rate for SKL. (Maarten) v4: - Don't include cursor plane in total relative data rate calculation; we've already handled the cursor allocation earlier. - Fix 'bytes_per_pixel' calculation braindamage. Somehow I hardcoded the NV12 format as a parameter rather than the actual fb->pixel_format, and even then still managed to get the format plane wrong. (Ville) - Use plane->state->fb rather than plane->fb in skl_allocate_pipe_ddb(); the plane->fb pointer isn't updated until after we've done our watermark recalculation, so it has stale values. (Bob Paauwe) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by(v3): Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Paauwe, Bob J <bob.j.paauwe@intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> References: http://lists.freedesktop.org/archives/intel-gfx/2015-September/077060.html References: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077721.html Smoke-tested-by(v4): Paulo Zanoni <paulo.r.zanoni@intel.com> (SKL) Link: http://patchwork.freedesktop.org/patch/61968/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 024c9045221fe45482863c47c4b4c47d37f97cbf) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Iaec87f1cb13d78de9cc75a26c1da35fec6b935a8 Reviewed-on: https://chromium-review.googlesource.com/327315 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="327315" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/15/327315/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ibf3038f38ece6b5bfaf6b348149aa3685218bc09" commit="4000800b5d64082e683ee7bf2692ca0893c9acc9" commit_message="BACKPORT: drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check Determine whether we need to apply this workaround at atomic check time and just set a flag that will be used by the main watermark update routine. Moving this workaround into the atomic framework reduces ilk_update_sprite_wm() to just a standard watermark update, so drop it completely and just ensure that ilk_update_wm() is called whenever a sprite plane is updated in a way that would affect watermarks. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60367/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d21fbe87ce18297af0a9b7cc0cd545fd9ac28d33) Conflicts: Minor context change in drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ibf3038f38ece6b5bfaf6b348149aa3685218bc09 Reviewed-on: https://chromium-review.googlesource.com/334059 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334059" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/334059/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I03ad7b86834d3b5f5df25f4b99ebb59665fbb61a" commit="74bc6fcf4bce222098764dc0195c522c6a2bd6b0" commit_message="UPSTREAM: drm/i915: Drop intel_update_sprite_watermarks The only platform that still has an update_sprite_wm entrypoint is SKL; on SKL, intel_update_sprite_watermarks just updates intel_plane->wm and then performs a regular watermark update. However intel_plane->wm is only used to update a couple fields in intel_wm_config, and those fields are never used by the SKL code, so on SKL an update_sprite_wm is effectively identical to an update_wm call. Since we're already ensuring that the regular intel_update_wm is called any time we'd try to call intel_update_sprite_watermarks, the whole call is redundant and can be dropped. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60372/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 791a32be6eb233773dd5698375d051af99e68d3b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I03ad7b86834d3b5f5df25f4b99ebb59665fbb61a Reviewed-on: https://chromium-review.googlesource.com/334060 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334060" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/334060/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ied99b5562ed78affd07c1af353181dea2b633500" commit="0f53378fde41073b8702e49dc83dbe061898ca79" commit_message="UPSTREAM: drm/i915: Refactor ilk_update_wm (v3) Split ilk_update_wm() into two parts; one doing the programming and the other the calculations. v2: Fix typo in commit message v3 (by Matt): Heavily rebased for current codebase. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60366/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b9d5c839f18c8bbd79a61013371eb8cadf6d897d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ied99b5562ed78affd07c1af353181dea2b633500 Reviewed-on: https://chromium-review.googlesource.com/334061 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334061" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/334061/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I47acf562a85e298b3e403c4d90b12daf94a63ddd" commit="1322bc7c15a3b2b72beee3a626bb6b7e60732273" commit_message="UPSTREAM: drm/i915: Calculate pipe watermarks into CRTC state (v3) A future patch will calculate these during the atomic 'check' phase rather than at WM programming time, so let's store the watermark values we're planning to use in the CRTC state; the values actually active on the hardware remains in intel_crtc. While we're at it, do some minor restructuring to keep ILK and SKL values in a union. v2: Don't move cxsr_allowed to state (Maarten) v3: Only calculate watermarks in state. Still keep active watermarks in intel_crtc itself. (Ville) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59556/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 4e0963c7663b0538b5a21fb49d17ea4ad64de861) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I47acf562a85e298b3e403c4d90b12daf94a63ddd Reviewed-on: https://chromium-review.googlesource.com/334062 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334062" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/334062/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ia947e3aed1b91f05a5344ebe9283e6725082afa0" commit="a1e5b8e2e15ee7a58176012d723a7bc793ec8419" commit_message="UPSTREAM: drm/i915: Calculate ILK-style watermarks during atomic check (v3) Calculate pipe watermarks during atomic calculation phase, based on the contents of the atomic transaction's state structure. We still program the watermarks at the same time we did before, but the computation now happens much earlier. While this patch isn't too exciting by itself, it paves the way for future patches. The eventual goal (which will be realized in future patches in this series) is to calculate multiple sets up watermark values up front, and then program them at different times (pre- vs post-vblank) on the platforms that need a two-step watermark update. While we're at it, s/intel_compute_pipe_wm/ilk_compute_pipe_wm/ since this function only applies to ILK-style watermarks and we have a completely different function for SKL-style watermarks. Note that the original code had a memcmp() in ilk_update_wm() to avoid calling ilk_program_watermarks() if the watermarks hadn't changed. This memcmp vanishes here, which means we may do some unnecessary result generation and merging in cases where watermarks didn't change, but the lower-level function ilk_write_wm_values already makes sure that we don't actually try to program the watermark registers again. v2: Squash a few commits from the original series together; no longer leave pre-calculated wm's in a separate temporary structure since it's easier to follow the logic if we just cut over to using the pre-calculated values directly. v3: - Pass intel_crtc instead of drm_crtc to .compute_pipe_wm() entrypoint and use intel_atomic_get_crtc_state() to avoid need for extra casting. (Ander) - Drop unused intel_check_crtc() function prototype. (Ander) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60363/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 86c8bbbeb8d11b898ac33a52b1410b39a1c73b89) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ia947e3aed1b91f05a5344ebe9283e6725082afa0 Reviewed-on: https://chromium-review.googlesource.com/334063 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334063" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/334063/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I1ee72cd2c71f5314bd46d6c58f2c62fb3e1e7ed4" commit="94c10c14d282476047daf7a0c932ae49c4459988" commit_message="UPSTREAM: drm/i915: Don't set plane visible during HW readout if CRTC is off We already ensure that pstate->visible = false when crtc->active = false during runtime programming; make sure we follow the same logic when reading out initial hardware state. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59564/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 19b8d3875e21f4f7e5c999350892f1a788f4e977) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I1ee72cd2c71f5314bd46d6c58f2c62fb3e1e7ed4 Reviewed-on: https://chromium-review.googlesource.com/334067 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334067" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/334067/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Id9625163980c1f121fb68877dfd9ff60e6489fdb" commit="7519378e9657626aeca3b6e0801b6a05bc8f4ca5" commit_message="UPSTREAM: drm/i915: Calculate watermark configuration during atomic check (v2) v2: Don't forget to actually check the cstate->active value when tallying up the number of active CRTC's. (Ander) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59561/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit aa363136866caa636031284f13ea0f730c64fca9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Id9625163980c1f121fb68877dfd9ff60e6489fdb Reviewed-on: https://chromium-review.googlesource.com/334068 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334068" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/334068/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ic925da9f4811a9219b5873fc6edb1e879b191576" commit="e7cff06349ae777faf380cf7880d45f2a126725e" commit_message="UPSTREAM: drm/i915: Make wait_for_flips interruptible. Move it from intel_crtc_atomic_commit to prepare_plane_fb. Waiting is done before committing, otherwise it's too late to undo the changes. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 5008e874edd34705be433bfa74bd29908182b36e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ic925da9f4811a9219b5873fc6edb1e879b191576 Reviewed-on: https://chromium-review.googlesource.com/334081 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334081" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/81/334081/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ief4f6fe35c3234c052bc98c1a215a8a925877d5f" commit="ecaa5e4e104a9aabb34ae6fbd0c9ea0dc333eaba" commit_message="UPSTREAM: drm/i915: Change locking for struct_mutex, v3. struct_mutex is being locked for every plane in intel_prepare_plane_fb and intel_cleanup_plane_fb. Require the caller to hold the mutex, and only acquire the mutex for each helper call. This way the lock only needs to be acquired twice in ->atomic_commit(). Once for pinning new framebuffers at the start, the second time for unpinning old framebuffer. Changes since v1: - Use mutex_lock_interruptible instead of i915 variant, to prevent a deadlock when called from the reset code. Changes since v2: - Clarify struct_mutex is locked by the caller. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> #v1 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f935675f0c07f87da2facc4c144d511e6da48240) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ief4f6fe35c3234c052bc98c1a215a8a925877d5f Reviewed-on: https://chromium-review.googlesource.com/334083 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334083" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/83/334083/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ia27c94ba1624511e699890554216f5ca0b115636" commit="e14e0474e86c290d986cb9dc03ad3da29e58daf1" commit_message="UPSTREAM: drm/i915: Wait for object idle without locks in atomic_commit, v2. Make pinning and waiting a separate step, and wait for object idle without struct_mutex held. Changes since v1: - Do not wait when a reset is in progress. - Remove call to i915_gem_object_wait_rendering for intel_overlay_do_put_image (Chris Wilson) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7580d774b0466fff28aab19db4f36dac37a3d1a9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ia27c94ba1624511e699890554216f5ca0b115636 Reviewed-on: https://chromium-review.googlesource.com/334084 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334084" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/84/334084/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ifef6be2eb787b34d16369e70b7c783385a8dc396" commit="0433bbf623bfffbb725060e3bcba067b0befb745" commit_message="UPSTREAM: drm/i915: Check for FIFO underruns after modeset on IVB/HSW and CPT/PPT Due to the shared error interrupt on IVB/HSW and CPT/PPT we may not always get an interrupt on a FIFO underrun. But we can always do an explicit check (like we do on GMCH platforms that have no underrun interrupt). v2: Drop stale kerneldoc for i9xx_check_fifo_underruns() (Daniel) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1446225741-11070-1-git-send-email-ville.syrjala@linux.intel.com BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit aca7b684bab9da1e3071ad872f1d78d41ae7a706) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ifef6be2eb787b34d16369e70b7c783385a8dc396 Reviewed-on: https://chromium-review.googlesource.com/334087 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334087" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/87/334087/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I0a20cc40c1fb9a5128901e8b75badd01e40fe665" commit="1a68813af7692d46defcf77b776fddd685b0aff2" commit_message="UPSTREAM: drm/i915/skl: Correct other-pipe watermark update condition check (v2) If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's. In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages. WARN_ON(!wm_changed) This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks. v2 (by Matt): Rebased to latest -nightly and fixed a typo Signed-off-by: Kumar, Mahesh <mahesh1.kumar@intel.com> Reviewed-by(v1): Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit e6d900239e7aee6e4c4cd863b2b9bbcc62ec71e1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I0a20cc40c1fb9a5128901e8b75badd01e40fe665 Reviewed-on: https://chromium-review.googlesource.com/334069 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334069" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/334069/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="If926a1c82ae853ea8a98896b90037cf9dbe94bc4" commit="d724f267f760b3d6cf62d24d787edd19f11ac571" commit_message="UPSTREAM: drm/i915: Check for underruns after crtc disable To get a better idea if underruns occurred during crtc disabling, let's check for them explicitly. This helps in cases where the error interrupt isn't active, or there is no underrun interrupt support at all. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448050160-14124-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 9bbc8258ae5914af1986561767d971417cee7a28) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If926a1c82ae853ea8a98896b90037cf9dbe94bc4 Reviewed-on: https://chromium-review.googlesource.com/334078 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334078" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/78/334078/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ic82fa8d2f2874a5b6de2a3746a6823f88edaa5b7" commit="c8d9578de6f7888ba31a4ea786d3cdf17a2089db" commit_message="UPSTREAM: drm/i915: Move disable_cxsr to the crtc_state. intel_crtc->atomic will be removed later on, move this member to intel_crtc_state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447945645-32005-2-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ab1d3a0e5a44f5b1a8d1f811e925c8519b56fba4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ic82fa8d2f2874a5b6de2a3746a6823f88edaa5b7 Reviewed-on: https://chromium-review.googlesource.com/334076 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334076" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/76/334076/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ifbb6496fc2428df09934719886a894706474c39a" commit="67dc4549f647879d5cccd29e4c2e8993330bb0b1" commit_message="UPSTREAM: drm/i915: Calculate watermark related members in the crtc_state, v4. This removes pre/post_wm_update from intel_crtc->atomic, and creates atomic state for it in intel_crtc. Changes since v1: - Rebase on top of wm changes. Changes since v2: - Split disable_cxsr into a separate patch. Changes since v3: - Move some of the changes to intel_wm_need_update. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/56603A49.5000507@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 92826fcdfc147a7d16766e987c12a9dfe1860c3f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ifbb6496fc2428df09934719886a894706474c39a Reviewed-on: https://chromium-review.googlesource.com/334077 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334077" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/334077/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ia561f77b1ca51aab3629ea9bcac06fbd63ad6ead" commit="f8e0b11ba26e998adc4f1fde29f81ccb7dc275d9" commit_message="UPSTREAM: drm/i915/skl: Update watermarks before the crtc is disabled. On skylake some of the registers are only writable when the correct power wells are enabled. Because of this watermarks have to be updated before the crtc turns off, or you get unclaimed register read and write warnings. This patch needs to be modified slightly to apply to -fixes. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92181 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: stable@vger.kernel.org Cc: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447945645-32005-4-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b900111459e2f4a538697f75b63478f3a6acec3c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ia561f77b1ca51aab3629ea9bcac06fbd63ad6ead Reviewed-on: https://chromium-review.googlesource.com/334079 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334079" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/79/334079/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I92c37f815162785809c3d9333a6eee741e04e39a" commit="95be5fb916683d7f8fcedcded48d18944b1d9bde" commit_message="UPSTREAM: drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2) If we fail to reconstruct the BIOS fb (e.g., because the FB is too large), we'll be left with plane state that indicates the primary plane is visible yet has a NULL fb. This mismatch causes problems later on (e.g., for the watermark code). Since we've failed to reconstruct the BIOS FB, the best solution is to just disable the primary plane and pretend the BIOS never had it enabled. v2: Add intel_pre_disable_primary() call (Maarten) Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Ville Syrjl <ville.syrjala@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: drm-intel-fixes@lists.freedesktop.org Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-2-git-send-email-matthew.d.roper@intel.com BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 200757f5d7c6f7f7032a0a07bbb8c02a840bbf7d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I92c37f815162785809c3d9333a6eee741e04e39a Reviewed-on: https://chromium-review.googlesource.com/334070 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334070" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/334070/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I7eac71f3c32c1d2c8916b85dfa53c6715987e450" commit="8600a200c32fcd3af674546325d122fdf20b635b" commit_message="BACKPORT: drm/i915: Do not acquire crtc state to check clock during modeset, v4. Parallel modesets are still not allowed, but this will allow updating a different crtc during a modeset if the clock is not changed. Additionally when all pipes are DPMS off the cdclk will be lowered to the minimum allowed. Changes since v1: - Add dev_priv->active_crtcs for tracking which crtcs are active. - Rename min_cdclk to min_pixclk and move to dev_priv. - Add a active_crtcs mask which is updated atomically. - Add intel_atomic_state->modeset which is set on modesets. - Commit new pixclk/active_crtcs right after state swap. Changes since v2: - Make the changes related to max_pixel_rate calculations more readable. Changes since v3: - Add cherryview and missing WARN_ON to readout. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 565602d7501a3e83580289d7d6da9b15838cfbe3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Context change in intel_atomic_commit drivers/gpu/drm/i915/intel_display.c Change-Id: I7eac71f3c32c1d2c8916b85dfa53c6715987e450 Reviewed-on: https://chromium-review.googlesource.com/334085 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334085" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/85/334085/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ib28b3b3e2dcc31ec3dea211e44ce74a9e7697061" commit="c06971bd65967d801bb7a95720c62c3ee74aea93" commit_message="UPSTREAM: drm/i915: Setup clipped src/dest coordinates during FB reconstruction (v2) Plane state objects contain two copies of src/dest coordinates: the original (requested by userspace) coordinates in the base drm_plane_state object, and a second, clipped copy (i.e., what we actually want to program to the hardware) in intel_plane_state. We've only been setting up the former set of values during boot time FB reconstruction, but we should really be initializing both. Note that the code here probably still needs some more work since we make a lot of assumptions about how the BIOS programmed the hardware that may not always be true, especially on gen9+; e.g., * Primary plane might not be positioned at 0,0 * Primary plane could have been rotated by the BIOS * Primary plane might be scaled * The BIOS fb might be a single "extended mode" FB that spans multiple displays. * ...etc... v2: Reword/expand commit message description of assumptions we make Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by(v1): Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-4-git-send-email-matthew.d.roper@intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 0a8d8a8667c7e66f4fa2498be18d47f8b296b430) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib28b3b3e2dcc31ec3dea211e44ce74a9e7697061 Reviewed-on: https://chromium-review.googlesource.com/334071 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334071" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/334071/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ib396c3b72e137a8863906281208360c6e382010b" commit="0095ed20f9732ba2e0e0bcf4d2f4de2328b301b1" commit_message="UPSTREAM: drm/i915: Add extra paranoia to ILK watermark calculations Our low-level watermark calculation functions don't get called when the CRTC is disabled or the relevant plane is invisible, so they should never see a zero htotal or zero bpp. However add some checks to ensure this is true so that we don't wind up dividing by zero if we make a mistake elsewhere in the driver (which the atomic watermark series has revealed we might be). References: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077370.html Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-6-git-send-email-matthew.d.roper@intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 151268821e6f08956b28b6ff90fae187a5b230b8) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib396c3b72e137a8863906281208360c6e382010b Reviewed-on: https://chromium-review.googlesource.com/334072 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334072" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/334072/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ie5312f4bd884d74ef4c2b21354fadf1f4962b722" commit="fa531b899eb3e4ef1d3e6953711d2fd1285210a4" commit_message="UPSTREAM: drm/i915: Sanitize watermarks after hardware state readout (v4) Although we can do a good job of reading out hardware state, the graphics firmware may have programmed the watermarks in a creative way that doesn't match how i915 would have chosen to program them. We shouldn't trust the firmware's watermark programming, but should rather re-calculate how we think WM's should be programmed and then shove those values into the hardware. We can do this pretty easily by creating a dummy top-level state, running it through the check process to calculate all the values, and then just programming the watermarks for each CRTC. v2: Move watermark sanitization after our BIOS fb reconstruction; the watermark calculations that we do here need to look at pstate->fb, which isn't setup yet in intel_modeset_setup_hw_state(), even though we have an enabled & visible plane. v3: - Don't move 'active = optimal' watermark assignment; we just undo that change in the next patch anyway. (Ville) - Move atomic helper locking fix to separate patch. (Maarten) v4: - Grab connection_mutex before calling atomic helper to duplicate state. The connector loop inside the helper will throw a WARN if we don't hold something to protect the connector list (and the helper itself doesn't try to lock the list). - Make failure to calculate watermarks for inherited state a WARN() since it probably indicates a serious problem in either our state readout code or our watermark code for this platform. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d93c037246104e403436ffe339bcb832185d0627) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ie5312f4bd884d74ef4c2b21354fadf1f4962b722 Reviewed-on: https://chromium-review.googlesource.com/334073 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334073" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/334073/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Id356e58840e7b8dbdd2d42fe668c0edbaf42a52e" commit="b8518a3a966a5e41dea9dea53a1974e8a00b9906" commit_message="BACKPORT: drm/i915: Use the active wm config for merging on ILK-BDW ilk_program_watermarks() is supposed to merge the active watermarks from all pipes. Thus we need to use the active config too instead of some precomputed stuff. Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)") Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1452776015-22076-2-git-send-email-ville.syrjala@linux.intel.com Conflicts: Minor conflict in signature of ilk_program_watermarks drivers/gpu/drm/i915/intel_pm.c BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d890565c44447db08fd9d07f5b02928a07a88c7e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Id356e58840e7b8dbdd2d42fe668c0edbaf42a52e Reviewed-on: https://chromium-review.googlesource.com/344376 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="344376" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/76/344376/6" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Ica4be22f0d71751972459d725074a9474d02a95c" commit="3afbbcbd105b6b873a092a021b7ddb818a444510" commit_message="BACKPORT: drm/i915: Add two-stage ILK-style watermark programming (v11) In addition to calculating final watermarks, let's also pre-calculate a set of intermediate watermark values at atomic check time. These intermediate watermarks are a combination of the watermarks for the old state and the new state; they should satisfy the requirements of both states which means they can be programmed immediately when we commit the atomic state (without waiting for a vblank). Once the vblank does happen, we can then re-program watermarks to the more optimal final value. v2: Significant rebasing/rewriting. v3: - Move 'need_postvbl_update' flag to CRTC state (Daniel) - Don't forget to check intermediate watermark values for validity (Maarten) - Don't due async watermark optimization; just do it at the end of the atomic transaction, after waiting for vblanks. We do want it to be async eventually, but adding that now will cause more trouble for Maarten's in-progress work. (Maarten) - Don't allocate space in crtc_state for intermediate watermarks on platforms that don't need it (gen9+). - Move WaCxSRDisabledForSpriteScaling:ivb into intel_begin_crtc_commit now that ilk_update_wm is gone. v4: - Add a wm_mutex to cover updates to intel_crtc->active and the need_postvbl_update flag. Since we don't have async yet it isn't terribly important yet, but might as well add it now. - Change interface to program watermarks. Platforms will now expose .initial_watermarks() and .optimize_watermarks() functions to do watermark programming. These should lock wm_mutex, copy the appropriate state values into intel_crtc->active, and then call the internal program watermarks function. v5: - Skip intermediate watermark calculation/check during initial hardware readout since we don't trust the existing HW values (and don't have valid values of our own yet). - Don't try to call .optimize_watermarks() on platforms that don't have atomic watermarks yet. (Maarten) v6: - Rebase v7: - Further rebase v8: - A few minor indentation and line length fixes v9: - Yet another rebase since Maarten's patches reworked a bunch of the code (wm_pre, wm_post, etc.) that this was previously based on. v10: - Move wm_mutex to dev_priv to protect against racing commits against disjoint CRTC sets. (Maarten) - Drop unnecessary clearing of cstate->wm.need_postvbl_update (Maarten) v11: - Now that we've moved to atomic watermark updates, make sure we call the proper function to program watermarks in {ironlake,haswell}_crtc_enable(); the failure to do so on the previous patch iteration led to us not actually programming the watermarks before turning on the CRTC, which was the cause of the underruns that the CI system was seeing. - Fix inverted logic for determining when to optimize watermarks. We were needlessly optimizing when the intermediate/optimal values were the same (harmless), but not actually optimizing when they differed (also harmless, but wasteful from a power/bandwidth perspective). Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1456276813-5689-1-git-send-email-matthew.d.roper@intel.com Conflicts: Minor context change in drivers/gpu/drm/i915/i915_drv.h Minor conflict intel_crtc_duplicate_state in drivers/gpu/drm/i915/intel_atomic.c Minor conflict intel_plane_atomic_calc_changes drivers/gpu/drm/i915/intel_display.c Minor context change in drivers/gpu/drm/i915/intel_drv.h BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ed4a6a7ca853253f9b86f3005d76345482a71283) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ica4be22f0d71751972459d725074a9474d02a95c Reviewed-on: https://chromium-review.googlesource.com/334086 Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="334086" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="9" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/86/334086/9" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="Ie7abfeec60d26acb0b0af02d3abf2f3e99875e91" commit="3cbbb29dd471735bf31859b25b12850b2a648310" commit_message="UPSTREAM: soc/intel/quark: Enable use of hard reset Select HAVE_HARD_RESET in the KCONFIG file to enable use of the hard_reset routine. TEST=Build and run on Galileo Gen2 BUG=None BRANCH=None Change-Id: Ie7abfeec60d26acb0b0af02d3abf2f3e99875e91 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/15992 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/366304 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="366304" owner_email="furquan@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/04/366304/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-2016.05" change_id="I8c7fd6897df771713a6e4440d1256e237c436658" commit="3eb610bc9508e854fae979e6180a0226e97fac05" commit_message="UPSTREAM: intel/lynxpoint,broadwell: Fix eDP display in Windows, SeaBios & Tiano Without this patch, eDP output is non-functional pre-graphics driver regardless of payload (SeaBIOS, Tianocore) or video init method (VBIOS, GOP driver) and once the standard Windows Intel HD graphics driver is loaded. Test: Boot Windows on peppy and auron_paine, install Intel HD Graphics driver, observe functional eDP output with full video acceleration. Debugging method: adjust location of call to run VBIOS within coreboot, observed that eDP output functional if the VBIOS is run before the power optimizer lines, broken if run afterwards. BUG=None BRANCH=None TEST=None Change-Id: I8c7fd6897df771713a6e4440d1256e237c436658 Signed-off-by: Prabal Saha <coolstarorganization@gmail.com> Reviewed-on: https://review.coreboot.org/15261 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-on: https://chromium-review.googlesource.com/366305 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="366305" owner_email="furquan@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/05/366305/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-2016.05" change_id="Iffef51354d09c4a399661be27179c88e054d086a" commit="cc145b09e14df43c5ce7aae419262078af912a61" commit_message="UPSTREAM: console: Drop leftover struct console_driver BUG=None BRANCH=None TEST=None Change-Id: Iffef51354d09c4a399661be27179c88e054d086a Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/16007 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://chromium-review.googlesource.com/366306 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="366306" owner_email="furquan@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/06/366306/5" remote="cros" total_fail_count="4"/><pending_commit branch="arc-11.3.0-pre1" change_id="I8a64b0048a1ee9e714ebb3f33fffd8334036450b" commit="189dd69793e1b0d6bd6184bc87eab33cdbc20dbc" commit_message="i965: Fix miptree layout for EGLImage-based renderbuffers When glEGLImageTargetRenderbufferStorageOES() was given an EGLImage created from the non-base slice of a miptree, intel_image_target_renderbuffer_storage() forgot to apply the intra-tile offsets __DRIimage::tile_x,tile_y to the miptree layout. This patch fixes the problem with a quick hack suitable for cherry-picking. A proper fix requires more thorough plumbing in intel_miptree_create_layout() and brw_tex_layout(). Patch 1/2 that fixes test 'dEQP-EGL.functional.image.create.gles2_cubemap_*'. BUG=chrome-os-partner:54775 TEST=dEQP-EGL.functional.image.create#gles2_cubemap_*_read_pixels Reported-by: Haixia Shi <hshi@chromium.org> Diagnosed-by: Haixia Shi <hshi@chromium.org> Cc: Jason Ekstrand <jason@jlekstrand.net> Cc: Mark Janes <mark.a.janes@intel.com> Cc: mesa-stable@lists.freedesktop.org Change-Id: I8a64b0048a1ee9e714ebb3f33fffd8334036450b Reviewed-on: https://chromium-review.googlesource.com/366814 Commit-Ready: Haixia Shi <hshi@chromium.org> Tested-by: Haixia Shi <hshi@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Chad Versace <chadversary@chromium.org> " fail_count="0" gerrit_number="366814" owner_email="hshi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/mesa" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/mesa" ref="refs/changes/14/366814/1" remote="cros" total_fail_count="0"/><pending_commit branch="arc-11.3.0-pre1" change_id="I4b397b27e55a743a7094d29fb0a6a4b6b34352b0" commit="7b6145e4b825068a5b2db34c32fd5b3bb323e41d" commit_message="i965: Respect miptree offsets in intel_readpixels_tiled_memcpy() Respect intel_miptree_slice::x_offset,y_offset and intel_mipmap_tree::offset. All three may be non-zero when glReadPixels is called on an EGLImage created from the non-base slice of a miptree. Patch 2/2 that fixes test 'dEQP-EGL.functional.image.create.gles2_cubemap_*'. BUG=chrome-os-partner:54775 TEST=dEQP-EGL.functional.image.create#gles2_cubemap_*_read_pixels Reported-by: Haixia Shi <hshi@chromium.org> Diagnosed-by: Haixia Shi <hshi@chromium.org> Cc: Jason Ekstrand <jason@jlekstrand.net> Cc: Mark Janes <mark.a.janes@intel.com> Cc: mesa-stable@lists.freedesktop.org Change-Id: I4b397b27e55a743a7094d29fb0a6a4b6b34352b0 Reviewed-on: https://chromium-review.googlesource.com/366815 Commit-Ready: Haixia Shi <hshi@chromium.org> Tested-by: Haixia Shi <hshi@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Chad Versace <chadversary@chromium.org> " fail_count="0" gerrit_number="366815" owner_email="hshi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/mesa" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/mesa" ref="refs/changes/15/366815/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ifc79bf1e4c57f5de448ab05b3a8d3a1aca5a58e2" commit="ed06c9b0aeafb1fcc5b7bdc3028a7e0d184124eb" commit_message="btle: Add common link layer code BUG=None BRANCH=None TEST=make BOARD=hadoken Add a task that is responsible for the state of the link layer. Change-Id: Ifc79bf1e4c57f5de448ab05b3a8d3a1aca5a58e2 Signed-off-by: Myles Watson <mylesgw@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/362144 Reviewed-by: Randall Spangler <rspangler@chromium.org> " fail_count="0" gerrit_number="362144" owner_email="mylesgw@chromium.org" pass_count="0" patch_number="7" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/44/362144/7" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="Ie28038847c9549eb1c27a605aa0fbad5efd3b2c7" commit="eef225608e42149edc3cf3df5bb6ce6a8501cee4" commit_message="btle: Add the HCI layer Add a case statement to handle HCI commands. Add a test commands. Try to match the hcitool syntax, so the same commands can be executed on a Linux host. Added lcmd (long cmd) to pass more parameters in fewer arguments BUG=None BRANCH=None TEST=Use HCI commands to configure an advertiser and listen for it using `hcitool lescan` on the host. Change-Id: Ie28038847c9549eb1c27a605aa0fbad5efd3b2c7 Signed-off-by: Myles Watson <mylesgw@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/362145 Reviewed-by: Randall Spangler <rspangler@chromium.org> " fail_count="0" gerrit_number="362145" owner_email="mylesgw@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/45/362145/6" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.14" change_id="Ibdf82f04aeca34018229088ced01518eca3c126e" commit="5c1971747ce36e08c87fd0da11a2c205b8cfec05" commit_message="CHROMIUM: net: xt_qtaguid/xt_socket: fix refcount underflow and crash xt_socket_get[4|6]_sk() do not always increment sock refcount, which causes confusion in xt_qtaguid module which is not aware of this fact and drops the reference whether it should have or not. Fix it by changing xt_socket_get[4|6]_sk() to always increment recount of returned sock. This should fix the following crash: [ 111.319523] BUG: failure at /mnt/host/source/src/third_party/kernel/v3.18/net/ipv4/inet_timewait_sock.c:90/__inet_twsk_kill()! [ 111.331192] Kernel panic - not syncing: BUG! [ 111.335468] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G U W 3.18.0-06867-g268df91 #1 [ 111.343810] Hardware name: Google Tegra210 Smaug Rev 1+ (DT) [ 111.349463] Call trace: [ 111.351917] [<ffffffc000207288>] dump_backtrace+0x0/0x10c [ 111.357314] [<ffffffc0002073a4>] show_stack+0x10/0x1c [ 111.362367] [<ffffffc000a82d1c>] dump_stack+0x74/0x94 [ 111.367414] [<ffffffc000a81824>] panic+0xec/0x238 [ 111.372116] [<ffffffc000981648>] __inet_twsk_kill+0xd0/0xf8 [ 111.377684] [<ffffffc0009817b0>] inet_twdr_do_twkill_work+0x64/0xd0 [ 111.383946] [<ffffffc000981a5c>] inet_twdr_hangman+0x2c/0xa4 [ 111.389602] [<ffffffc000271cf0>] call_timer_fn+0xac/0x160 [ 111.394995] [<ffffffc00027250c>] run_timer_softirq+0x23c/0x274 [ 111.400824] [<ffffffc000220a68>] __do_softirq+0x1a4/0x330 [ 111.406218] [<ffffffc000220e94>] irq_exit+0x70/0xd0 [ 111.411093] [<ffffffc000264e00>] __handle_domain_irq+0x84/0xa8 [ 111.416922] [<ffffffc0002003ec>] gic_handle_irq+0x4c/0x80 BUG=b:29455973 TEST=`run cts --package android.tests.appsecurity --disable-reboot` Change-Id: Ibdf82f04aeca34018229088ced01518eca3c126e Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/366454 Commit-Ready: Kevin Cernekee <cernekee@chromium.org> Tested-by: Kevin Cernekee <cernekee@chromium.org> " fail_count="1" gerrit_number="366454" owner_email="cernekee@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/54/366454/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.14" change_id="I696621d0a99eb9ac2d8bebd111a975f9490e6f2a" commit="c5d02ecb8d72bb117080d968642686da1787a573" commit_message="CHROMIUM: Enable qtaguid prerequisites For ARC we need to enable CONFIG_NETFILTER_XT_MATCH_QTAGUID=y, which depends on: # CONFIG_NETFILTER_XT_MATCH_OWNER is not set CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_CONNTRACK_IPV6=y The former two items are configured in cros-kernel2.eclass. The latter two items are configured here. BUG=b:29455973 TEST=`iptables -I OUTPUT -m owner --uid-owner 216 -j DROP` while pinging from crosh Change-Id: I696621d0a99eb9ac2d8bebd111a975f9490e6f2a Signed-off-by: Kevin Cernekee <cernekee@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/365033 Reviewed-by: Kirtika Ruchandani <kirtika@google.com> " fail_count="1" gerrit_number="365033" owner_email="cernekee@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/33/365033/3" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I698fd6de3656bcf6a048c1cadba21c8278603697" commit="ada0232af71ee0dd98fc408797494ea8d8d95d5d" commit_message="Fix minor typo. BRANCH=none BUG=chrome-os-partner:43025 TEST=no typo observed. Change-Id: I698fd6de3656bcf6a048c1cadba21c8278603697 Reviewed-on: https://chromium-review.googlesource.com/366891 Commit-Ready: Marius Schilder <mschilder@chromium.org> Tested-by: Marius Schilder <mschilder@chromium.org> Reviewed-by: Marius Schilder <mschilder@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> " fail_count="0" gerrit_number="366891" owner_email="mschilder@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/91/366891/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I50dbc2fece91ba6a49d000670bc520f118c5793c" commit="ccdfa5896b0cdae63958aa0ed094f0b597b7d9e5" commit_message="wpa_supplicant: log mesh network channel info log mesh network channel info such as channel, bandwidth, center frequency. BUG=b:30430879 TEST=Verified on gale by configuring as root and non-root node and observed channel info in logs. Change-Id: I50dbc2fece91ba6a49d000670bc520f118c5793c Signed-off-by: Narayanraddi Masti <nmasti@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/366032 Commit-Ready: NARAYANRADDI MASTI <nmasti@google.com> Tested-by: NARAYANRADDI MASTI <nmasti@google.com> Reviewed-by: Julan Hsu <julanhsu@google.com> Reviewed-by: Srinivasa duvvuri <sduvvuri@chromium.org> " fail_count="0" gerrit_number="366032" owner_email="nmasti@google.com" pass_count="0" patch_number="2" project="chromiumos/third_party/hostap" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/hostap" ref="refs/changes/32/366032/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I96537ed9022d4e62a0e23bb478a9ed9851563498" commit="072092b73c39de477040bce851efc085e3911192" commit_message="quipper: Combine split Chrome huge pages mappings Add a new class, HugePagesMappingDeducer that figures out when a single binary is partially mapped with a run of hugepages, thus splitting it into into three ranges. Use this class in PerfParser to replace the split mapping with the original restored mapping. BUG=chromium:633698 TEST=unit tests pass Change-Id: I96537ed9022d4e62a0e23bb478a9ed9851563498 Reviewed-on: https://chromium-review.googlesource.com/366040 Commit-Ready: Simon Que <sque@chromium.org> Tested-by: Simon Que <sque@chromium.org> Reviewed-by: Simon Que <sque@chromium.org> " fail_count="0" gerrit_number="366040" owner_email="sque@chromium.org" pass_count="0" patch_number="4" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/40/366040/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I0e060be304afe49857dab687fc112f46396d57a1" commit="4aa14dbd237c0e09fc4f942414a728f7b6edf454" commit_message="[Scheduler]Update release information for Android devices. BUG=None TEST=None Change-Id: I0e060be304afe49857dab687fc112f46396d57a1 Reviewed-on: https://chromium-review.googlesource.com/366758 Commit-Ready: Bindu Mahadev <bmahadev@chromium.org> Tested-by: Bindu Mahadev <bmahadev@chromium.org> Reviewed-by: Kris Rambish <krisr@chromium.org> " fail_count="0" gerrit_number="366758" owner_email="bmahadev@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/58/366758/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I0fa4ea46d4c29e3be8dd176242bc725dccebf46a" commit="19dbca646629ffda8e6398bf0ab6c80338bce5f3" commit_message="Pass the host time on remote-install and remove egg directory on clean This patch did 2 fixes: * pass the host time to Chameleon for remote-install such that Chameleon will be synced with the host machine. * remove the egg directory on "make clean". BUG=chromium:624487 TEST=Ran "make remote-install" and "make clean". Change-Id: I0fa4ea46d4c29e3be8dd176242bc725dccebf46a Reviewed-on: https://chromium-review.googlesource.com/366853 Commit-Ready: Wai-Hong Tam <waihong@chromium.org> Tested-by: Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="0" gerrit_number="366853" owner_email="waihong@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/chameleon" project_url="https://chromium-review.googlesource.com/chromiumos/platform/chameleon" ref="refs/changes/53/366853/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I0087495e7ab953084b4ad9dbde17b8942c993776" commit="2f209e6b31d0986f3a660f63d725d498b842c1c1" commit_message="media-libs/mesa: Remove unreferenced patches There are some patches in the tree not referenced by our ebuilds and it looks like recent upstream Mesa no longer needs them indeed. The patches in question are: 10.5-Mesa-Add-support-for-GL_OES_texture_-float-extension.patch 10.5-Mesa-Advertise-GL_OES_texture_-float-extensions-supp.patch 10.5-lp_rast-Remove-alignment-constraints.patch We don't seem to keep ebuilds for old Mesa versions, so let's remove them and stop polluting the repo. They can be still brought back from Git history if there is any need for them in future. BUG=none TEST=emerge-cyan-cheets media-libs/mesa Change-Id: I0087495e7ab953084b4ad9dbde17b8942c993776 Signed-off-by: Tomasz Figa <tfiga@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/366196 Commit-Ready: Ilja H. Friedel <ihf@chromium.org> Tested-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> " fail_count="2" gerrit_number="366196" owner_email="tfiga@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/96/366196/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I09a1f82dcdad6e3130f92b623947243de52c72b7" commit="123c9cfac09482cb2a215fb4bfeb78be06e4c660" commit_message="Gale: Add initial FAFT config BUG=none BRANCH=none TEST="test_that --board=gale DUT_IP_ADDR f:.*firmware_InvalidUSB/control" Change-Id: I09a1f82dcdad6e3130f92b623947243de52c72b7 Reviewed-on: https://chromium-review.googlesource.com/366125 Commit-Ready: Julio Diez <jdiez@chromium.org> Tested-by: Julio Diez <jdiez@chromium.org> Reviewed-by: Suresh Rajashekara <sureshraj@chromium.org> " fail_count="4" gerrit_number="366125" owner_email="jdiez@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/25/366125/1" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I22985e167cdb1ab01d97602f52f2e48238509a2f" commit="3fcd150b9d617f25808dc9b9f0c573e5822d119d" commit_message="Add unit test cases for gs_offloader_unittest. Add a test result folder with a different timestamp in gs_offloader_unittest.test_upload_testresult_files. Fix test_upload_files by moving try/except to the upper layer in upload_testresult_files; otherwise, failure unittests will be swallowed by the try/except block. BUG=chromium:619209 TEST=unit test Change-Id: I22985e167cdb1ab01d97602f52f2e48238509a2f Reviewed-on: https://chromium-review.googlesource.com/366430 Commit-Ready: Ilja H. Friedel <ihf@chromium.org> Tested-by: Ilja H. Friedel <ihf@chromium.org> Tested-by: Ningning Xia <nxia@chromium.org> Reviewed-by: Dan Shi <dshi@google.com> " fail_count="2" gerrit_number="366430" owner_email="nxia@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/30/366430/3" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I2b8ab5c202190340d580834071347e93766dcb94" commit="6203f7167ce1085a9998070bac9ea2f6264c299c" commit_message="sys-devel/gcc: enable passing -fstack-protector-strong to clang. The mapping from "-fstack-protector-strong" to "-fstack-protector-all" was added for clang in https://chromium-review.googlesource.com/#/c/173931/ This is no longer needed. Clang now supports "-fstack-protector-strong" as of http://llvm.org/viewvc/llvm-project?view=revision&revision=201120 BUG=None TEST='x86_64-cros-linux-gnu-clang -fstack-protector-strong' works. Change-Id: I2b8ab5c202190340d580834071347e93766dcb94 Reviewed-on: https://chromium-review.googlesource.com/366452 Commit-Ready: Rahul Chaudhry <rahulchaudhry@chromium.org> Tested-by: Rahul Chaudhry <rahulchaudhry@chromium.org> Reviewed-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="366452" owner_email="rahulchaudhry@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/52/366452/1" remote="cros" total_fail_count="3"/><lkgm version="8678.0.0-rc2"/></manifest> |
