blob: 91f34bc4795fa25db0885c4e355213adab45669b [file] [log] [blame]
<?xml version="1.0" encoding="utf-8"?><manifest revision="bda5e53dcd725632a05fac4a54439c4557747ee2">
<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="7574c671c7c64aab957dc507fffff3c8c38dc7cb" upstream="refs/heads/master"/>
<project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="62b7538a31c4c5a88dcd2ef4d8a60a783ec6b6f7" upstream="refs/heads/master"/>
<project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="8263a04a1e4e6e40ed479f62ac529874eb7675ef" upstream="refs/heads/master"/>
<project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/>
<project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="5f43fb626cf8bba55580bc8781beb6234444366c" upstream="refs/heads/master"/>
<project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="8e64da49bd75fb7c72f227b22f25c0a0c488c986" upstream="refs/heads/master"/>
<project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="f4f4387b6bf2387efbcfd1453af4892e8982faf6" upstream="refs/heads/master"/>
<project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/>
<project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="82e91c996576d2db69155b909bc367c43e11f2e5" upstream="refs/heads/master"/>
<project groups="devserver" name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="672c1f54a499a825cc0bb9bc4f240bf1887550d9" upstream="refs/heads/master"/>
<project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="62ca9ee8ca421cb565fd4a05390f455c5fcefd17" upstream="refs/heads/master"/>
<project name="apps/libapps" path="src/third_party/libapps" revision="ad0d6277f3e7dc1544077710b92e574cc18e9e9b" upstream="refs/heads/master">
<annotation name="branch-mode" value="pin"/>
</project>
<project groups="minilayout,buildtools,labtools" name="chromium/buildtools" path="chromium/src/buildtools" remote="chromium" revision="3275a099f3c199b50ff97117aa0184f3e91f8a32" upstream="refs/heads/master"/>
<project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="a9c7333ec45588e0e6c2a26d21a8a474df1f53b6" upstream="refs/heads/master"/>
<project groups="minilayout,buildtools,labtools" name="chromium/llvm-project/cfe/tools/clang-format" path="chromium/src/buildtools/clang_format/script" remote="chromium" revision="d9edf9e6b7dc44d2ab92fcaf01e9a86ae1a6af5b" upstream="refs/heads/master"/>
<project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/>
<project name="chromium/src/tools/md_browser" remote="chromium" revision="e9462696241f3ca832890473173e03e7bcfe6adc" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="bfc4082f431375a49de0a5a18fd0e6685715426f"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="bb27ccdc595b1b5d66ad9bde02b123f5b69e7d50" upstream="refs/heads/master">
<copyfile dest="AUTHORS" src="AUTHORS"/>
<copyfile dest="LICENSE" src="LICENSE"/>
</project>
<project name="chromiumos/docs" path="docs" revision="699f96503a712c318ec794de8e11751c20d8ab34" upstream="refs/heads/master"/>
<project name="chromiumos/graphyte" path="src/platform/graphyte" revision="cab8671dc9437e8e6c79914c7c454d59bee21b76" upstream="refs/heads/master"/>
<project name="chromiumos/infra/bad_cl_detector" path="infra/bad_cl_detector" revision="ca87674837a3fbda5f9620f070def6403cf6dfc4" upstream="refs/heads/master"/>
<project groups="chromeos-admin" name="chromiumos/infra/ci_results_archiver" path="infra/ci_results_archiver" revision="dd5cfd07e7802fcac79c20afd66ddb3d0d9316d0" upstream="refs/heads/master"/>
<project name="chromiumos/infra/cl_exonerator" path="infra/cl_exonerator" revision="9f2f395f9b1809d09f21605b0fcff072d189dbef" upstream="refs/heads/master"/>
<project name="chromiumos/infra/cl_status_viewer" path="infra/cl_status_viewer" revision="8db2b39d37f1c646d04ec8b93459c7d556fbf09c" upstream="refs/heads/master"/>
<project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/>
<project name="chromiumos/infra/lucifer" path="infra/lucifer" revision="ec8dd4a3d01230f89f75fca236d68cc4f287c552" upstream="refs/heads/master"/>
<project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="b98c5d2888b7ad0336d5733f357161dd0428c4d2" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="0522483084841757f1e1b8e422fdcd777ba471c6" upstream="refs/heads/master"/>
<project name="chromiumos/manifest" path="manifest" revision="b38d7ca7a9d1e5b6a938e768586e319a1173fc6d" upstream="refs/heads/master"/>
<project groups="minilayout,firmware" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="7dadb7c7151abec3ea8c0713f5a72d100eeff688" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="5636bfd3f5e0d09d12355485378f7985334ff226" sync-c="true" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="8a76954878f4caa5363d9a6614a193c7845f1ead" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="4f374121053487b60b5b757c640515e48a376e6c" upstream="refs/heads/master"/>
<project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="c9fcb65724e111c7caeb45ec6048e12e4a804782" upstream="refs/heads/master"/>
<project name="chromiumos/platform/assets" path="src/platform/assets" revision="33b62ddc392ded3bf486eb40b2c91a92861753c6" upstream="refs/heads/master"/>
<project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="6b3e331f0ad67006c4cb3752a2161a641653288a" 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="5f4049369ed5e42176dc8947de1352f2e1b6b6b6" 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="300354e5d74418c8e03737ca9029c64d9297a28d" upstream="refs/heads/master"/>
<project name="chromiumos/platform/cfm-device-monitor" path="src/platform/cfm-device-monitor" revision="1b8aaa412109299d178536411989d7226e940e8e" upstream="refs/heads/master"/>
<project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="1558016a7d8a4be0569bb6e72e72ca264682a4e4" upstream="refs/heads/master"/>
<project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="c72f1bc16319ebd970ad277e76ef10d0b4663461" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="757f2763da8ed7cc1e963e1a493feadcf7354bce" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="ffcb2b1c3e4a1ad72910d97f08639742e0ad3b4f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="28a5a61616c09525206b6d9166832446adbc5314" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="259fa9826eb7a8f5f2bf12e31792f157b3d7c2a9" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="22f2eac6d646270791df78c898fc9cf9dd9401d8" upstream="refs/heads/master"/>
<project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="0a59878032d4bda0c4a7c13b2086c59283df63f1" upstream="refs/heads/master"/>
<project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="a676f1bef7b0241693d5fa3947e5e235015f40e6" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/ec" path="src/platform/ec" revision="b754761e60b719e577710c1d6117f5b15e9f7a6a" upstream="refs/heads/master"/>
<project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="0c9b56092424c370eff748b25d49caceb9a18dab" upstream="refs/heads/master"/>
<project name="chromiumos/platform/factory" path="src/platform/factory" revision="15bb8983df39dc3eba5aaac896bf5d67fca2ac89" upstream="refs/heads/master"/>
<project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="54d0bf6bdc7e8c9d4a88e67232255bfbda0855f6" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/firmware" path="src/platform/firmware" revision="82aa3c042c4977e038ea5872a3c0facd847288bd" upstream="refs/heads/master"/>
<project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="bb60557e05f4da64363bddb43db68b50793bdc58" upstream="refs/heads/master"/>
<project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5b0e635711c7409b2413a3d702afe7e83abb8a36" upstream="refs/heads/master"/>
<project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="613458c0e3c589e52e7f093288ef1d2ba57a9ff7" upstream="refs/heads/master"/>
<project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="2aaeead73fbc70860c6bc0ff477500f84ab595e9" upstream="refs/heads/master"/>
<project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="a040ae1df5f6d94f784776f7dc9e3c32653b336f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="e895698b7005bbbd518b93b5d303d347c8f2ed1f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/>
<project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/>
<project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/>
<project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="6061eab81238fddb26e09fe7a1a2f11d12b7904f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="dca599879cab0dba8ed32ef3a5d1b82e26524732" upstream="refs/heads/master"/>
<project name="chromiumos/platform/monitor_reconfig" path="src/platform/monitor_reconfig" revision="f022d19d84f232290b596beeb26347f62442e7eb" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="0cadaa95434c27e1e869522ae58eaa91e13040fa" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="54df236a4e201034ac9d35dbf3ca3b2062290f40" 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="97d6b3b0c32595b75b053047f02f7789ea8cfe03" upstream="refs/heads/master"/>
<project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="cac3fc97a21939021a9f0bad63ec896c891fc842" upstream="refs/heads/master"/>
<project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="21545afa050a69c457602b1ab7193a87d6f1b621" upstream="refs/heads/master"/>
<project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="c050715684a5dde3a4fc818f3de816a407fdb2de" upstream="refs/heads/master"/>
<project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="47afcabaf957c013418ef2a33481ec1fe764dc94" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tast" path="src/platform/tast" revision="f4e1354ee0657d3fce4da763bba2e16fee20b905" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tast-tests" path="src/platform/tast-tests" revision="5a435707749bc18ab2e4fbeb3ef773c93cb7304b" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="7143423c99f1f7c9a2f35903a9fd4bc38aab6433" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="4d5c969c0a73a4677d50271104fcd49131180591" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="9546ffbb37d5fef191ad1607eeb0b76a6f3a9872" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="bc2c1d69e9d2649633548856ed2c0fe75d8c015e" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/>
<project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/>
<project groups="firmware,buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="2aa3dd0f6dfbe68474b2db3dec8c53a7ad66fb6d" upstream="refs/heads/master"/>
<project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="437a6375c95a60f85725d4e11b6fd385001418f5" upstream="refs/heads/master"/>
<project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/>
<project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="4ff44d75e4214626fcda1bcd7a2cb34907c40db1" upstream="refs/heads/master"/>
<project name="chromiumos/platform2" path="src/platform2" revision="5771b6c9a7afbeeb40ff363010ae7776ff880dc5" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="8b02d5142a32c6bbc8a0fb44a66fee14cfd297ff" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="c0e3c885cdd4009930b1460f60677abcdae27637" 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="f18f5f9867551d0d21da79e25371a298933aaff1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="19bc98421b566e5e9a9ecb2319f9f4082107eb9a" upstream="refs/heads/master"/>
<project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="afe550a63024ebaf0dcb37870cd394998f748d71" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="6a72e01213beecb5d2f234fe39bb094b79faca76" upstream="refs/heads/chromeos-5.44"/>
<project groups="firmware" 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 groups="firmware" 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 groups="firmware" name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="6ff1410d371a75eda45f4f19610d644e397eccc4" upstream="refs/heads/chromeos-2016.05"/>
<project groups="firmware" name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="a3576d16e98a2e0760eb97771062ae5e931e748e" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="96d9e30fdfb7ab8b0cdc44228359dd0c08d59946" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="ccb37a514aa1d0ea1604dbc9ad290491a1e65832" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160">
<annotation name="branch-mode" value="pin"/>
</project>
<project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="ab586ccd21556108662fbd80ab5a429143eac264" upstream="refs/heads/chromeos-2017.08"/>
<project groups="firmware" name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="f676897b6dd1f4341afb400d5ef113c2fd7e6f09" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/>
<project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="b3678648e8cdff19c86b6265564038115a8cad86" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="606930e16eec8c872097b61156083ae6cb4e07c9" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant-2.6" revision="bcae50b5da9a5bb77546cb76c6af1d334ab102f1" upstream="refs/heads/wpa_supplicant-2.6"/>
<project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="b61756522807af0acd68e924949d12189e372d99" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="04a60d4fe235cb01e5ee280fe7cea049cef08325" upstream="refs/heads/chromeos-3.8"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="38ea7fb00e5be3d83d71a264f54de2f719a1fe01" upstream="refs/heads/chromeos-3.10"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="d57193361223e5fe38101d01b9ede82991ccd7b0" upstream="refs/heads/chromeos-3.14"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="be0131dfb7fdbb2b8a85da4420c6f06c6614add5" upstream="refs/heads/chromeos-3.18"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="f2d30cddc10a28f47eac781fc7470fc3c5451ad0" upstream="refs/heads/chromeos-4.4"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.12" revision="4e57a2344816aa44b913b8e2ba24c0f244bc46c8" upstream="refs/heads/chromeos-4.12"/>
<project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="9dc621e77e7e4f3c045831021b04d19997d3deb5" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="8b82aa2cbd013ebe8027590974235170d6c63dc8" upstream="refs/heads/chromeos-2.4.83"/>
<project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="fef68978614b58681625799ceac6f4cd19cd3728" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="475ac2811c0f2e5e6bf139fe71ebb44c39cbac5f" 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="cfb9e18bc09d70e46ea8be34510729c005ec6906" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="fd5fb0dbd611eb99674f123b6da0d94a7998e232" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/logitech-updater" path="src/third_party/logitech-updater" revision="905d590f327e44723e8ce47c62b6d7ae0db5955a" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/>
<project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="aeb032379b96f2f8412a46d15120661eab8feb2b" upstream="refs/heads/arc-17.2.0-pre1"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="f9d239e11fe044de0e977fd1d3a62d9f6a92e49d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/>
<project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="5510cc6d670760d4815a45517705adc81ca672c5" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="744acb7c4d82ed5fba6f0416c7ac5588217f4113" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="165395bf01548d8a0135357ca4c222b9c0c0acaa" upstream="refs/heads/V2.3-stable"/>
<project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="a9fc54d636fc3e5b5f0918769a2e5343c5f0d823" upstream="refs/heads/V1.3.3-cros"/>
<project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="5210635496db76cc37c94a7ef351776914000e47" upstream="refs/heads/chromeos-2.2.12"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/>
<project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="fc570685c1ca4acb871c706a66d0493b5e92c7c9" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/>
<project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="64388ca12cbec5ad5c0c6c6fec7a670dfdaedf82" upstream="refs/heads/master"/>
<project groups="firmware" 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="411bfbd54e5eea784596ef6622010d37483d8058" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="b49833eaccc38d0c22958ffc8cb80ffa361ec611" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="0f114d2d7eb1950faab02fe479864da5e5d50414" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="55ee15ea1d06c90d8ab5dc1f0fd3884999e229aa" upstream="refs/heads/master-0.3.13"/>
<project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" upstream="refs/heads/chromeos-v2017.05"/>
<project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/>
<project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="f6e2acc3f21e8b7c9eec4a8871a65f50381daacf" upstream="refs/heads/master"/>
<project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="4edf3354c6469f53a292ff7ecc6f36767603cf36" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin" name="external/swarming.client" path="chromite/third_party/swarming.client" remote="chromium" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/>
<project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="e6527b0cd469e3ff5764785dadcb39bf7d787154"/>
<project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="166479b259e73a89836797ac3e2db2ccc89221e0" upstream="refs/heads/master"/>
<project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="68540f685e6d0494ad2887477e9ff16f26e51adf" upstream="refs/heads/master"/>
<project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="ba19c01cab035056f9a27459d908d73f9992f985" upstream="refs/heads/master"/>
<project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="aa42493d878601250c3bfe1cb69875fc0b6cb7e3" upstream="refs/heads/master"/>
<project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="40aea3375468790cc985f638ce71a49885c17874" upstream="refs/heads/master"/>
<project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="98b55b853bbb34882b915366afe1012091b614a8" upstream="refs/heads/master"/>
<project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="d775f4c8559d829a897899e5be857661fdbbcf84" upstream="refs/heads/master"/>
<project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="53dd00a1a34ebf5251f6210d778768b4157c5e11"/>
<project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="0c5a656a1322e137fa4a251f2ccc6c4022918c0a"/>
<project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/>
<repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/>
<pending_commit branch="chromeos-4.12" change_id="I90a7755381e1e016c633768b6bb69b8e9b0a681f" commit="78e434075126bedd1cd937ecc8d7f05fbfe5a9c9" commit_message="UPSTREAM: drm/amdgpu: register the psp v10 function pointers at psp sw_init Add the psp 10.0 callbacks for PSP. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Huang Rui &lt;ray.huang@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit c1798b540084a3bb026f2d4d2717e982d96527da) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I90a7755381e1e016c633768b6bb69b8e9b0a681f Reviewed-on: https://chromium-review.googlesource.com/735041 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735041" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/735041/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I3b77d72eb94f55390264b4f8df648191a0e14347" commit="1725b6d8b7044f85d1760bccd681f4ee31f2fbaf" commit_message="UPSTREAM: drm/amdgpu/soc15: add psp ip block BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Huang Rui &lt;ray.huang@amd.com&gt; Acked-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 9e2837f6aee2c1859041d901b8d6202f2ba85210) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I3b77d72eb94f55390264b4f8df648191a0e14347 Reviewed-on: https://chromium-review.googlesource.com/735042 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735042" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/735042/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I79451ed2889e009b3c9f155a9fdb9769eb6168f1" commit="3d0b130d6237df3af67028eea1f29d7a8a808a02" commit_message="UPSTREAM: drm/amdgpu: add initial vcn support and decode tests VCN is the new media block on Raven. Add core support and the ring and ib tests for decode. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 95d0906f8506550a7c4a59c770732e7de912cffc) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I79451ed2889e009b3c9f155a9fdb9769eb6168f1 Reviewed-on: https://chromium-review.googlesource.com/735044 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735044" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/735044/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Ib87457f25a15b7b81000723d5107079e8ead703b" commit="8090d9340e460093ce390a17ecbd4f36c6141d81" commit_message="UPSTREAM: drm/amdgpu: add encode tests for vcn Add encode ring and ib tests. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 2d531d81d0fb906ee74a5d5f8c04857849efa785) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Ib87457f25a15b7b81000723d5107079e8ead703b Reviewed-on: https://chromium-review.googlesource.com/735045 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735045" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/735045/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Iaa087639597e759de18c5b1ac6723aa4e31daf57" commit="2057ae866baa82f676a89e93d0667209c44552b8" commit_message="UPSTREAM: drm/amdgpu: add vcn ip block functions (v2) Fill in the core VCN 1.0 setup functionality. v2: squash in fixup (Alex) BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Acked-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 88b5af70e29edda095f3d26edcd376cb1688cf70) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Iaa087639597e759de18c5b1ac6723aa4e31daf57 Reviewed-on: https://chromium-review.googlesource.com/735046 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735046" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/735046/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I008544577a847a3dbf99cf161c895c25fba7727f" commit="b5caed6d77de61c15b10b85bb2f8df9a9c63691f" commit_message="UPSTREAM: drm/amdgpu: add vcn decode ring support Add the decode ring init. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Acked-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit a4bf608be5df37cff51c8a5feba7708ebad7e6f6) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I008544577a847a3dbf99cf161c895c25fba7727f Reviewed-on: https://chromium-review.googlesource.com/735047 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735047" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/735047/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I28adf3ccc3c41969bd21ab45bf5a251cf8744b5c" commit="3daf5785ab4faaf7aa8f029fc24b9a3e4477a67f" commit_message="UPSTREAM: drm/amdgpu: add vcn decode ring type and functions Add the ring function callbacks for the decode ring. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Acked-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit cca69fe8ff98b6321765752e0e46d7470e870630) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I28adf3ccc3c41969bd21ab45bf5a251cf8744b5c Reviewed-on: https://chromium-review.googlesource.com/735048 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735048" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/735048/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Idcdc58abd89222cef1a59772ec371151e0eb1192" commit="d9b65ec9c531ec7cd63d9cec2428ff857305b469" commit_message="UPSTREAM: drm/amdgpu: add vcn irq functions BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Acked-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit a319f444bb86eb5bb9b896e0606e56e1392cfe38) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Idcdc58abd89222cef1a59772ec371151e0eb1192 Reviewed-on: https://chromium-review.googlesource.com/735049 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735049" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/735049/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I68c308faf88219c2aa0bbc98f2b1587589eebebf" commit="9269056008a57336f10edf7bd9409f83197f30b0" commit_message="UPSTREAM: drm/amdgpu: add vcn ip block and type BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Chunming Zhou &lt;david1.zhou@amd.com&gt; Acked-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 3ea975e4ff959e9a4fafa429ed2481f79ffecb90) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I68c308faf88219c2aa0bbc98f2b1587589eebebf Reviewed-on: https://chromium-review.googlesource.com/735050 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735050" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/735050/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I14aa17de5b5ec86f973245fab195a32065892e2e" commit="6caaba66b6e3065a15e3e0d199f5429bd8d9f941" commit_message="UPSTREAM: drm/amdgpu: move amdgpu_vcn structure to vcn header BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Christian Knig &lt;christian.koenig@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 95aa13f6b196d3b8e1c694638002c18c07cdccab) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I14aa17de5b5ec86f973245fab195a32065892e2e Reviewed-on: https://chromium-review.googlesource.com/735051 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735051" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/735051/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I48f2a545100b9b3fe9cf83c2b5ba42fc5fee5671" commit="2f11401c714a2d65292a944ebbac63c7b2b6e7b7" commit_message="UPSTREAM: drm/amdgpu: re-group the functions in amdgpu_vcn.c BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 3e1086cf64669ea94106f9f505b8d964cf70f492) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I48f2a545100b9b3fe9cf83c2b5ba42fc5fee5671 Reviewed-on: https://chromium-review.googlesource.com/735052 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735052" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/735052/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Idba7a3f36fe3fd145f10d16c26446d0488be9b16" commit="37bbd94abe3efd219612f9c1da13d6fb01ab171f" commit_message="UPSTREAM: drm/amdgpu: move vcn ring test to amdgpu_vcn.c Hope it will be generic for vcn later BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 8c303c019014afe5842bf4001b4d762f05b3a77e) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Idba7a3f36fe3fd145f10d16c26446d0488be9b16 Reviewed-on: https://chromium-review.googlesource.com/735053 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735053" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/735053/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I5e2f8b578d040dbcff0d6fa97c69454fb1952021" commit="fd20b559652dca7b75f28930e4813f1c9f0dbf59" commit_message="UPSTREAM: drm/amdgpu: expose vcn RB command BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 7741cced67aed83d87152a601d58bfb16eda8301) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I5e2f8b578d040dbcff0d6fa97c69454fb1952021 Reviewed-on: https://chromium-review.googlesource.com/735054 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735054" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/735054/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I942fefc8c9df8a6a9b83357a918857dfc1817ef6" commit="c0d1d88f48dbedc0652933128d30291d0d79559e" commit_message="UPSTREAM: drm/amdgpu: add a ring func for vcn start command Needed for the proper command sequence for VCN. BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit ef44f8541e8e99f1040c0d1b147956e2c2f25d79) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I942fefc8c9df8a6a9b83357a918857dfc1817ef6 Reviewed-on: https://chromium-review.googlesource.com/735055 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735055" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/735055/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I4b2168aba970442fe8663f7d370f9374630f6862" commit="3286793179e7c435eec27428bc44e382df15584b" commit_message="UPSTREAM: drm/amdgpu: implement vcn start RB command BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit e7501c34aa002e53f0128f685134eb550a74560d) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I4b2168aba970442fe8663f7d370f9374630f6862 Reviewed-on: https://chromium-review.googlesource.com/735056 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735056" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/735056/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I4f14fb4eb8f2280b5631ef13756a926efedefe5a" commit="5995b7e15adf22a3710a14bbf7af1685b719dbd9" commit_message="UPSTREAM: drm/amdgpu: implement insert end ring function for vcn decode BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit a4c424c5c633bfe381d16c4342777513dc5a91b4) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I4f14fb4eb8f2280b5631ef13756a926efedefe5a Reviewed-on: https://chromium-review.googlesource.com/735057 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735057" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/735057/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Idbb3d175e7ae997069cc904a2c6a555c06e67bc2" commit="3706fac2518111623d894239827027fd7f6df648" commit_message="UPSTREAM: drm/amdgpu/vcn: implement ib tests with new message buffer interface BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Acked-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 2d8a425bf6edb7177e7dadecc78dcae75852ee9e) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Idbb3d175e7ae997069cc904a2c6a555c06e67bc2 Reviewed-on: https://chromium-review.googlesource.com/735058 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="735058" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/735058/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="Iecf6f37d2c2b3b77a67f69556b4bc52356b55361" commit="8c5ed4a6edb2a05e91e246b9ec1c5cf98134d8d2" commit_message="UPSTREAM: uapi/drm: add AMDGPU_HW_IP_VCN_DEC for decode CS BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit 66e236f180f0ab6b9b9efd9e7fdbfd9de98e333d) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: Iecf6f37d2c2b3b77a67f69556b4bc52356b55361 Reviewed-on: https://chromium-review.googlesource.com/736155 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="736155" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/736155/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I740447cf25340de6d05783e6da521ee2af05d46a" commit="0596adcf8a42a1c4ff55d9a8adafaa32fbec36a2" commit_message="UPSTREAM: uapi/drm: add AMDGPU_HW_IP_VCN_ENC for encode CS BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Christian Knig &lt;christian.koenig@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit fcfc5a90628f69c08018c8ec7b3d6dca5a8a2203) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I740447cf25340de6d05783e6da521ee2af05d46a Reviewed-on: https://chromium-review.googlesource.com/736156 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="736156" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/736156/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.12" change_id="I569b0e77508164812eade3a6daafd4f720fb75a4" commit="b6e35ad34b670c0d348df3904b394d4615898645" commit_message="UPSTREAM: drm/amdgpu: add AMDGPU_HW_IP_VCN_DEC to info query BUG=b:66735140 TEST=boot Kahlee, run graphics_SanAngeles Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt; Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; (cherry picked from commit bdc799e5eee551f53c7beb01f89cccedc83f7824) Signed-off-by: Dominik Behr &lt;dbehr@chromium.org&gt; Change-Id: I569b0e77508164812eade3a6daafd4f720fb75a4 Reviewed-on: https://chromium-review.googlesource.com/736157 Commit-Ready: Dominik Behr &lt;dbehr@chromium.org&gt; Tested-by: Dominik Behr &lt;dbehr@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="0" gerrit_number="736157" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/736157/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I5761196d7afd89285bbadc59f0e8500a80c4a395" commit="c36f83e4096b9783ba82f950a6279656542569aa" commit_message="UPSTREAM: clk: introduce clk_core_enable_lock and clk_core_disable_lock functions This can be useful when clock core wants to enable/disable clocks. Then we don't have to convert the struct clk_core to struct clk to call clk_enable/clk_disable which is a bit un-align with exist using. And after introduce clk_core_{enable|disable}_lock, we can refine clk_enable and clk_disable a bit. As well as clk_core_{enable|disable}_lock, we also added clk_core_{prepare|unprepare}_lock and clk_core_prepare_enable/ clk_core_unprepare_disable for clock core to easily use. Cc: Michael Turquette &lt;mturquette@baylibre.com&gt; Cc: Stephen Boyd &lt;sboyd@codeaurora.org&gt; Cc: Shawn Guo &lt;shawnguo@kernel.org&gt; Signed-off-by: Dong Aisheng &lt;aisheng.dong@nxp.com&gt; Signed-off-by: Stephen Boyd &lt;sboyd@codeaurora.org&gt; (cherry picked from commit a6adc30ba7bef8da62a32c884609eb9cace04fbc) BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: I5761196d7afd89285bbadc59f0e8500a80c4a395 Reviewed-on: https://chromium-review.googlesource.com/737744 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="737744" owner_email="sathya.prakash.m.r@intel.com" 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/44/737744/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I35bc5eb374d5c6c269c6b52feb632346c706c725" commit="944562656dd64912f074d1849e6e7b23f4f06558" commit_message="UPSTREAM: clk: move clk_disable_unused after clk_core_disable_unprepare function No function level change, just moving code place. clk_disable_unused function will need to call clk_core_prepare_enable/ clk_core_disable_unprepare when adding CLK_OPS_PARENT_ENABLE features. So move it after clk_core_disable_unprepare to avoid adding forward declared functions later. Cc: Michael Turquette &lt;mturquette@baylibre.com&gt; Cc: Stephen Boyd &lt;sboyd@codeaurora.org&gt; Cc: Shawn Guo &lt;shawnguo@kernel.org&gt; Signed-off-by: Dong Aisheng &lt;aisheng.dong@nxp.com&gt; Signed-off-by: Stephen Boyd &lt;sboyd@codeaurora.org&gt; (cherry picked from commit 7ec986efed0208ca5fdfc26f9fc19c1604d3d502) BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: I35bc5eb374d5c6c269c6b52feb632346c706c725 Reviewed-on: https://chromium-review.googlesource.com/737745 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="737745" owner_email="sathya.prakash.m.r@intel.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/737745/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="If83c87f41010239aa815df9e59a629afde38f052" commit="d516b4ac510960bb06655237472eda4337fab42f" commit_message="UPSTREAM: clk: Allow clocks to be marked as CRITICAL Critical clocks are those which must not be gated, else undefined or catastrophic failure would occur. Here we have chosen to ensure the prepare/enable counts are correctly incremented, so as not to confuse users with enabled clocks with no visible users. Signed-off-by: Lee Jones &lt;lee.jones@linaro.org&gt; Signed-off-by: Michael Turquette &lt;mturquette@baylibre.com&gt; Link: lkml.kernel.org/r/1455225554-13267-2-git-send-email-mturquette@baylibre.com (cherry picked from commit 32b9b10961860860268961d9aad0c56a73018c37) BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: If83c87f41010239aa815df9e59a629afde38f052 Reviewed-on: https://chromium-review.googlesource.com/737746 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="737746" owner_email="sathya.prakash.m.r@intel.com" 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/46/737746/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I015abe4b397d2c8aac44588c5f754f1488756c7e" commit="640bab212287927f444d4c1b95557a588e3b3c40" commit_message="UPSTREAM: clk: core: support clocks which requires parents enable (part 1) On Freescale i.MX7D platform, all clocks operations, including enable/disable, rate change and re-parent, requires its parent clock enable. Current clock core can not support it well. This patch introduce a new flag CLK_OPS_PARENT_ENABLE to handle this special case in clock core that enable its parent clock firstly for each operation and disable it later after operation complete. The patch part 1 fixes the possible disabling clocks while its parent is off during kernel booting phase in clk_disable_unused_subtree(). Before the completion of kernel booting, clock tree is still not built completely, there may be a case that the child clock is on but its parent is off which could be caused by either HW initial reset state or bootloader initialization. Taking bootloader as an example, we may enable all clocks in HW by default. And during kernel booting time, the parent clock could be disabled in its driver probe due to calling clk_prepare_enable and clk_disable_unprepare. Because it's child clock is only enabled in HW while its SW usecount in clock tree is still 0, so clk_disable of parent clock will gate the parent clock in both HW and SW usecount ultimately. Then there will be a child clock is still on in HW but its parent is already off. Later in clk_disable_unused(), this clock disable accessing while its parent off will cause system hang due to the limitation of HW which must require its parent on. This patch simply enables the parent clock first before disabling if flag CLK_OPS_PARENT_ENABLE is set in clk_disable_unused_subtree(). This is a simple solution and only affects booting time. After kernel booting up the clock tree is already created, there will be no case that child is off but its parent is off. So no need do this checking for normal clk_disable() later. Cc: Michael Turquette &lt;mturquette@baylibre.com&gt; Cc: Stephen Boyd &lt;sboyd@codeaurora.org&gt; Cc: Shawn Guo &lt;shawnguo@kernel.org&gt; Signed-off-by: Dong Aisheng &lt;aisheng.dong@nxp.com&gt; Signed-off-by: Stephen Boyd &lt;sboyd@codeaurora.org&gt; (cherry picked from commit a4b3518d146f150d633f7dc815bb8ee2fbc162e9) BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: I015abe4b397d2c8aac44588c5f754f1488756c7e Reviewed-on: https://chromium-review.googlesource.com/737747 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="737747" owner_email="sathya.prakash.m.r@intel.com" 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/47/737747/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I0b8d1946be2734b48e325136287cd83b8b345cd9" commit="8870c3a0a6a02385db754a3a4e2ca752771660ea" commit_message="UPSTREAM: clk: core: support clocks which requires parents enable (part 2) On Freescale i.MX7D platform, all clocks operations, including enable/disable, rate change and re-parent, requires its parent clock on. Current clock core can not support it well. This patch adding flag CLK_OPS_PARENT_ENABLE to handle this special case in clock core that enable its parent clock firstly for each operation and disable it later after operation complete. The patch part 2 fixes set clock rate and set parent while its parent is off. The most special case is for set_parent() operation which requires all parents including both old and new one to be enabled at the same time during the operation. Cc: Michael Turquette &lt;mturquette@baylibre.com&gt; Cc: Stephen Boyd &lt;sboyd@codeaurora.org&gt; Cc: Shawn Guo &lt;shawnguo@kernel.org&gt; Signed-off-by: Dong Aisheng &lt;aisheng.dong@nxp.com&gt; [sboyd@codeaurora.org: Move set_rate tracepoint after prepare_enable] Signed-off-by: Stephen Boyd &lt;sboyd@codeaurora.org&gt; (cherry picked from commit fc8726a2c021b5525151ff6482f8f9a863c56d8d) BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: I0b8d1946be2734b48e325136287cd83b8b345cd9 Reviewed-on: https://chromium-review.googlesource.com/737748 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="737748" owner_email="sathya.prakash.m.r@intel.com" 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/48/737748/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I8baf77286f4d9aac32da21ef9e02a5256eea13de" commit="630141f87672e6c3a05bc3257c56886e3a6ca2d5" commit_message="FROMLIST: clk: Add support for runtime PM Registers for some clocks might be located in the SOC area, which are under the power domain. To enable access to those registers respective domain has to be turned on. Additionally, registers for such clocks will usually loose its contents when power domain is turned off, so additional saving and restoring of them might be needed in the clock controller driver. This patch adds basic infrastructure in the clocks core to allow implementing driver for such clocks under power domains. Clock provider can supply a struct device pointer, which is the used by clock core for tracking and managing clock's controller runtime pm state. Each clk_prepare() operation will first call pm_runtime_get_sync() on the supplied device, while clk_unprepare() will do pm_runtime_put_sync() at the end. Additional calls to pm_runtime_get/put functions are required to ensure that any register access (like calculating/changing clock rates and unpreparing/disabling unused clocks on boot) will be done with clock controller in runtime resumend state. When one wants to register clock controller, which make use of this feature, he has to: 1. Provide a struct device to the core when registering the provider. 2. Ensure to enable runtime PM for that device before registering clocks. 3. Make sure that the runtime PM status of the controller device reflects the HW state. Signed-off-by: Marek Szyprowski &lt;m.szyprowski@samsung.com&gt; Reviewed-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt; Acked-by: Krzysztof Kozlowski &lt;krzk@kernel.org&gt; Link:am from https://patchwork.kernel.org/patch/9911741/ BUG=b:67763576 TEST=Build and ensure no regression Signed-off-by: Sathya Prakash M R &lt;sathya.prakash.m.r@intel.com&gt; Change-Id: I8baf77286f4d9aac32da21ef9e02a5256eea13de Reviewed-on: https://chromium-review.googlesource.com/739081 Commit-Ready: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Tested-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; Reviewed-by: Cheng-Yi Chiang &lt;cychiang@chromium.org&gt; " fail_count="0" gerrit_number="739081" owner_email="sathya.prakash.m.r@intel.com" 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/81/739081/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic91cb72c1fb7c2b399e6acd4a83ca6d666f6ce33" commit="bc67aba0d9fbe4aa9ee38976f13b6f6a0c184aef" commit_message="libcbm: some code clean-ups - Rename CameraBufferMapper to CameraBufferManager since we can now allocate buffers with the class. - Merge camera_buffer_mapper_typedefs.h into camera_buffer_mapper_impl.h BUG=b:67923637 CQ-DEPEND=CL:737736 CL:737725 TEST=Make sure all the arc-camera3-* packages still build. TEST=unit tests TEST=Make sure camera works on Soraka. Change-Id: Ic91cb72c1fb7c2b399e6acd4a83ca6d666f6ce33 Reviewed-on: https://chromium-review.googlesource.com/737735 Commit-Ready: WeiX Meng &lt;weix.meng@intel.com&gt; Tested-by: Ricky Liang &lt;jcliang@chromium.org&gt; Tested-by: WeiX Meng &lt;weix.meng@intel.com&gt; Reviewed-by: Hung-yu Wu &lt;hywu@chromium.org&gt; " fail_count="1" gerrit_number="737735" owner_email="jcliang@chromium.org" pass_count="0" patch_number="5" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/35/737735/5" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I56b0e6c964d880854e75ec31373ab5e3b6e551c2" commit="ef22932ef60365923a3455dae24bd8184181af9a" commit_message="intel: ipu3: rename buffer mapper to buffer manager BUG=b:67923637 TEST=Make sure arc-camera3-hal-intel-ipu3 still build. Change-Id: I56b0e6c964d880854e75ec31373ab5e3b6e551c2 Reviewed-on: https://chromium-review.googlesource.com/737725 Commit-Ready: WeiX Meng &lt;weix.meng@intel.com&gt; Tested-by: Ricky Liang &lt;jcliang@chromium.org&gt; Reviewed-by: Hung-yu Wu &lt;hywu@chromium.org&gt; Reviewed-by: Liang L Yang &lt;liang.l.yang@intel.com&gt; " fail_count="1" gerrit_number="737725" owner_email="jcliang@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/25/737725/3" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I12b7b8ae2762d12952dffe2e01cf3108d347f36c" commit="a4a9e80745840dcc8a050ce46d1deeea6ee539e8" commit_message="arc-camera3-libcbm: rename buffer_mapper to buffer_manager Update ebuild description and file names per CL:737735. BUG=b:67923637 CQ-DEPEND=CL:737735 TEST=Make sure all the arc-camera3-* packages still build. Change-Id: I12b7b8ae2762d12952dffe2e01cf3108d347f36c Reviewed-on: https://chromium-review.googlesource.com/737736 Commit-Ready: WeiX Meng &lt;weix.meng@intel.com&gt; Tested-by: Ricky Liang &lt;jcliang@chromium.org&gt; Tested-by: WeiX Meng &lt;weix.meng@intel.com&gt; Reviewed-by: Hung-yu Wu &lt;hywu@chromium.org&gt; " fail_count="1" gerrit_number="737736" owner_email="jcliang@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/36/737736/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="Ia3c77bfaa75721c7c7bdf569893108c56d537969" commit="8b3976e9272fe75d1ce93a3b9020fd578dbdf2c3" commit_message="Testlog: Refactor the unittest of testlog Refactor the unittest of testlog_validator and testlog. Change the Attachment() in testlog_validator: 1. Better arguments. 2. Use attachment name as the temporary file name, instead of original file name. BUG=b:68295200 TEST=make test Change-Id: Ia3c77bfaa75721c7c7bdf569893108c56d537969 Reviewed-on: https://chromium-review.googlesource.com/737672 Commit-Ready: Chun-Tsen Kuo &lt;chuntsen@chromium.org&gt; Tested-by: Chun-Tsen Kuo &lt;chuntsen@chromium.org&gt; Reviewed-by: Hung-Te Lin &lt;hungte@chromium.org&gt; " fail_count="0" gerrit_number="737672" owner_email="chuntsen@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/72/737672/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="If3de6ebffef25eb7d78ec1bbc1f3798b6d3289ed" commit="05265450c48f41b5bf7f38cc66c02a066dd7c1cc" commit_message="Testlog: Add AttachContent method and its unittest Add AttachContent method and its unittest. This new method is usful in pytest, if it only want to save some raw data. Pytest don't need to create a file. BUG=None TEST=make test CQ-DEPEND=CL:737672 Change-Id: If3de6ebffef25eb7d78ec1bbc1f3798b6d3289ed Reviewed-on: https://chromium-review.googlesource.com/737775 Commit-Ready: Chun-Tsen Kuo &lt;chuntsen@chromium.org&gt; Tested-by: Chun-Tsen Kuo &lt;chuntsen@chromium.org&gt; Reviewed-by: Hung-Te Lin &lt;hungte@chromium.org&gt; " fail_count="0" gerrit_number="737775" owner_email="chuntsen@chromium.org" pass_count="0" patch_number="5" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/75/737775/5" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Id265c71cff1c4f19623c186e97c44bf8a578f487" commit="84f90181e308a9481af13834e0716fcd8ff98016" commit_message="intel: ipu3: Add error handling when mClient is nullptr 1. When the algo is not connected, the Intel3AClient::getInstance() will be nullptr. So we need to add nullptr checking for mClient before using it. 2. If the camera service gets 0 camera number, the hal lib will be reloaded. So calling Intel3AClient::getInstance() in hal_get_number_of_cameras() checks if the connecting to the remote 3a is successful. BUG=b:67882568 TEST=Build and deploy package to poppy and camera works Change-Id: Id265c71cff1c4f19623c186e97c44bf8a578f487 Signed-off-by: Yang Liang &lt;liang.l.yang@intel.com&gt; Reviewed-on: https://chromium-review.googlesource.com/729226 Commit-Ready: WeiX Meng &lt;weix.meng@intel.com&gt; Tested-by: WeiX Meng &lt;weix.meng@intel.com&gt; Reviewed-by: Hung-yu Wu &lt;hywu@chromium.org&gt; Reviewed-by: Liang L Yang &lt;liang.l.yang@intel.com&gt; " fail_count="0" gerrit_number="729226" owner_email="weix.meng@intel.com" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/26/729226/6" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I74a4dfd9a8f88d7d528c70a729522b96eb311d48" commit="9644d45cb71d28f978d81710b11e7e6f6e15e6dc" commit_message="ui_templates: Cleanup. Remove an unnecessary replace. BUG=None TEST=make test TEST=manually on DUT. Change-Id: I74a4dfd9a8f88d7d528c70a729522b96eb311d48 Reviewed-on: https://chromium-review.googlesource.com/741286 Commit-Ready: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Tested-by: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Reviewed-by: Hung-Te Lin &lt;hungte@chromium.org&gt; " fail_count="0" gerrit_number="741286" owner_email="pihsun@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/86/741286/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iab1edfab10907de858084aed1299f30e42ba7368" commit="fdbda0f5696b841d2707601b5722187a36e92a3d" commit_message="i18n: Fix i18n-label containing HTML tags. We allow HTML tags in i18n-label in static HTML, so handle it in the code. BUG=chromium:678434 TEST=make test TEST=manually on DUT. Change-Id: Iab1edfab10907de858084aed1299f30e42ba7368 Reviewed-on: https://chromium-review.googlesource.com/732802 Commit-Ready: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Tested-by: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Reviewed-by: Hung-Te Lin &lt;hungte@chromium.org&gt; " fail_count="0" gerrit_number="732802" owner_email="pihsun@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/02/732802/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Icfa96d5fa2054b3a7d7b7e34fa84a7a46ebd91ca" commit="71bfbe5f81230b6c1db60a0b1ab99217ca4c2397" commit_message="shill: cellular: remove unused function declarations BUG=None TEST=Run unit tests. Change-Id: Icfa96d5fa2054b3a7d7b7e34fa84a7a46ebd91ca Reviewed-on: https://chromium-review.googlesource.com/741482 Commit-Ready: Ben Chan &lt;benchan@chromium.org&gt; Tested-by: Ben Chan &lt;benchan@chromium.org&gt; Reviewed-by: Mike Frysinger &lt;vapier@chromium.org&gt; " fail_count="0" gerrit_number="741482" owner_email="benchan@chromium.org" pass_count="0" patch_number="1" project="aosp/platform/system/connectivity/shill" project_url="https://chromium-review.googlesource.com/aosp/platform/system/connectivity/shill" ref="refs/changes/82/741482/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I728f4b078382e846ee6fcc12199749cd840ed49a" commit="5e330793861d788d3ad483c5bae2e8b58787c587" commit_message="minijail0: Fix argument assertion. CL:735261 fixed a bug that the assert call should not have parenthesis since assert is a statement, but the assert statement has another bug that it checks len(args) &gt; 1 while it intended to check that args is not empty. Fix the check. BUG=b:68292043 TEST=make test TEST=manually on DUT, check that cras is started. Change-Id: I728f4b078382e846ee6fcc12199749cd840ed49a Reviewed-on: https://chromium-review.googlesource.com/740922 Commit-Ready: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Tested-by: Pi-Hsun Shih &lt;pihsun@chromium.org&gt; Reviewed-by: Marco Chen &lt;marcochen@chromium.org&gt; " fail_count="1" gerrit_number="740922" owner_email="pihsun@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/22/740922/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I9705178569654c671f16ca5532a69da1826d49fa" commit="4029931a89aece62503c5b934a9300f73e463df9" commit_message="midis: Add test for ProcessMidiEvents BUG=chromium:701005 TEST=cros_run_unit_tests --board veyron_minnie --packages chromeos-base/midis --debug Change-Id: I9705178569654c671f16ca5532a69da1826d49fa Reviewed-on: https://chromium-review.googlesource.com/737654 Commit-Ready: Prashant Malani &lt;pmalani@google.com&gt; Tested-by: Prashant Malani &lt;pmalani@google.com&gt; Reviewed-by: Ben Chan &lt;benchan@chromium.org&gt; " fail_count="1" gerrit_number="737654" owner_email="pmalani@google.com" pass_count="0" patch_number="5" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/54/737654/5" remote="cros" total_fail_count="1"/><lkgm version="10070.0.0-rc2"/></manifest>