| <?xml version="1.0" encoding="utf-8"?><manifest revision="f6ced8497b9d4a842eab26ecd2c2f888a63cabbd"> |
| <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="319acf9c7e9bfca277781a763217f757ab3be73e" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="d6d6f31b3988e21d0a5b50977ef7befedf339b55" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="5943df7448213fdf373bda6270044e1e79a88d2f" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="a9a4938a099d1bf1a87798e021791bbe2e467d00" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="5f6ff40d1e6520be789a7ae9402f46f505ad053a" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="3d8e6ae763671ec2e7160e0cb93cf358865f7851" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="6ae80d22e929385dc1ee28aa06c198b2ff073c44" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="941cf235c5e56eddc6e4f2de2f38bee032a4dead" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="8f325b7f28a4b3042753fb006bdbe95db98768cc" upstream="refs/heads/master"/> |
| <project name="apps/libapps" path="src/third_party/libapps" revision="17626492b5ee53d49c1651a9f8663359cd474e99" upstream="refs/heads/master"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="4a93e2cfc133473ae58f17374c32669eea9a8912" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="f246a322b16c15723800ea6c6414af3a29d79ee9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="1c822ade1f731ec35a3d2d3be8805f773df22c4c"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="dd358519420dd61c90156e8ed1cec1f0d73e5714" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/docs" path="docs" revision="2e4d46ab32491f64aa29f40cbf6ae03c47cadd06" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="b2d7015c3721926cc39018e778790cd2c463534e" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="8969815234fa6a9eb6e4eebba243f829336f08b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="f61a998565223c4cf6c7e1b43f2e288d94a8f08f" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="704dbb824410432fcd5902ed41509f40735e7fd8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="a7e78b4bec86bd968f5075d0f57f3919fb598ef3" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="b8b2188585496490ecd595f0e42127bb08a1e3e7" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="83cec18347a26f356ce997757749d72fbdadf2ef" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="a175282b64829a1ca736001910fb217c8fbe593c" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="fcb96d49a8b4f93cba6eb7848ac403f68d777ac4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="5cd63012d522bf3c1bac3f72301a49f137986d72" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="07f5d5eb201c6f5c978df8f86e9e81907df54db1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="a2834cbe4e9cb85356e115afd4f4b2398745cf75" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="32463c6de8e8c98d4b1711937bc7678afc121a85" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="fa7fda4e53dbf7ee2b155f7b8761bb50f6ebd92f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="50e26c0020940a88729ac3f2e194c5b5d475d8db" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="2f1ee8448a886ce1abad9c0e8741582244f8ab40" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="0cb02d88617dd456aff4076cbd9b8b37fa2302fa" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="f5603d7d2a772e7842e64ec8e9e5c4b558566adf" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="67030be903bb02e51c7690fa6beb8ce57f0b9fa3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="121bf2ff4234578421af7d164173423f1fec3744" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="ebdb0a880e7b60de1ec4ddd93b8320260c3ad25d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="5d5faf68cdb05e477f0637f517f4926a0db1394a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="04a17cb6834cf604115846f9239b55108b2928e6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="f9c201e93c45f008b79ce63c1ec276ede05146f0" 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="53f94cf8e0bde1199c05003ee676834e1a7e9e03" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="39dc50c15c59193776fa3d9636b0af5755594349" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="16e29dbdc5f411944ec21d0d59ac4f157fa97c70" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="da55e6cd18a13750b0fc417f8db6a310ad284231" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5a656849c7d2b0d0ddbe0ac6d300c1e2fada0bb4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="cc1deb44521d41125f5d617940a654c58c794325" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="a290471be8063ef1a1173d891e70ee6607d129ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="a878c6922db5fc5c2565b4058f1f4713ee5115aa" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="c7ff5188fb31541c3c6173e8171155f965760883" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="5272e812b594d10232826c4bded9c6ad7d77469a" 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="0c83f50c60b22056980328889cc9e7c81d653c07" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="17cc088dc198f626513d4154644d57553b69fefd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtplot" path="src/platform/mtplot" revision="5e4f631e633384751f582bd9db5f4d6eb2112494" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="8e83b1936d92fa4992d6597862d10b801fbaa097" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="3703e8a79698c78864d3e5610341c64338f4600a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="5a230ee17756dc43ff732932dcb52899c06a4d09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="c672d233ca3ab9436cf3944a41149022c388e347" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="95a5fb7a1e4526ed8c8e641431f66f22f302cddc" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="98c46b9aed2e0a33ce23517da5102cdc59f23060" 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/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="ad16cf327e86f46a6d6e9e14e53ac31bf5b49757" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="0ed732a09b5cd199e4741624437aa0a85866e3c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="c72b5f688bfe853ca5d0788c90fde6149c2b6a69" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="b8874877fd2da9d4e9abd76f5c194318fd3b2375" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="f9d41b3c36126579c60665c847834b624bf7b174" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="1a8074b548ea350eede9d5a09386810690fb5209" 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="95fba14bc483055114d40e72386daf9c021177b6" upstream="refs/heads/upstream_mirror/master"> |
| <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 name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="0db2ba835b1b13855844bdd40618f7b365e67326" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="cf4787f4cd11b972a7f348d5c7e17e6a21956d74" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="6ce372f140653c9b665910bb47a0d083dd50e0e9" upstream="refs/heads/chromeos-5.44"/> |
| <project name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="d3e4c86fc3aa162425702759b70127ef00bd0472" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="f21d857fde838f7cb141f81c49070abbdf343fce" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="904f49fd770dd559800523edd91c1226e131655d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="252eda88ac16a71a84da2c934b293c07a09a0df3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="f15c2fa5c2d975395be6a29a1ddbfc722077af6c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/gdata" path="chromite/third_party/gdata" revision="fe7e5c90a9827feb66ed446b2d297a1618b25272" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/> |
| <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="8f9ffbab8c46958a44c29fb09d519c78a266b26c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="d829774c5994dbe35409f2a9875a7d0bde1eb61c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="c5395f1d8392ae8e050e9f8c952be12c7553b33f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="10f175e80cdb29c2c7549fb9dbef4bd06c9db517" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="9497031b53a70b69526a4c276a3974f901e1cce1" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="0af594bde2f90bbe6a738643c84af07aee190937" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="8d3c47f143459e41cb73ce3b5dbb73f622e8e099" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="ff5ffb70d281fa7addd2ee2de6d6fa8c7c4f6747" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="9dc621e77e7e4f3c045831021b04d19997d3deb5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="0c7748b56694e9b00537f27bbe9edb11c78ce08f" upstream="refs/heads/chromeos-2.4.70"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="afc1b877083133dbb52958d1a9e1b621761c06ab" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="7b5fbfa86476ce1641891064b222a56bf24aff4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libresample" path="src/third_party/libresample" revision="cc9f20f439396b7d45e94b8301edd95d33f26a46" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="b45c53f9418a6eff2c8ed98703a55f96029304b1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="199fe31115c76231746f5953271795d58679561c" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="c9edfa218e5a5972531b6f4a3ece8d33a44ae1b5" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="3279c2825684c7009775b731d0a9e37815778282" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="e79d5093d0c93b9072f45415b29e12b2740db25e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="b9aa9932d0fe198195c852d3a31c650fce4d5d65" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="a74a417f08a105db2835914d713fda07a9b40d41" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="9baf1ff8fc06d8c986e55465f77427d416ecd710" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/> |
| <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="ddfd74f6363a8cce6ebeadeb380d9c2a09d9d68c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="c3cded2efc1c82a18639ae4109d6dbc2d6a95502" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ply-image" path="src/third_party/ply-image" revision="6cf4e4cd968bb72ade54e423e2b97eb3a80c6de9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="3ccfed9fd25d8e3c01e5be7d737e8d478fb46f70" upstream="refs/heads/chromeos-2.2.12"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="b9b8f1de0ab9d4b0e1739d7c0dc4ec232b85a5c3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="f8cdd7917157bb744fcc4d79e7e56e5ae94c2b09" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="8ccda0f645b65dc82f8676ce321406938a35d0b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="5ef88e5ed90b7a76487021b7e0e8a390ba6f05a2" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="cb2de5a810df1898cd3ae47d517603b8b12371c0" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="31f4933a54cce7b157619eb1dd14ea32bec39279" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="bcf721d62d6a4c4c162c63714371fa4349df53bc" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="52f9ebbda94d27df8f6e89e150d8f58c66631a86" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" remote="chromium" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="3f6478ac95edf86cd3da300c2c0d34a438f5dbeb"/> |
| <project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="494d97fe6b456e516cf210f01a4436d488658306" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="b9fa8599064d10afd8c231155500f0b8e934d71f" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="c4992577c751e9150f01be2c6638943be9a8b585" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="c80811581709b9346364e3229b888f9ad830cdf5" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="32c89c19b042a12b5a1bf0153299154ea5435c03"/> |
| <project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-4.4" change_id="I3a9273d0d690cb3baafe9c131343216fc47008fb" commit="41c872a222dcf3b67c5a7712c95ebc18bbfdfb2a" commit_message="UPSTREAM: drm/atomic: Make drm_atomic_legacy_backoff reset crtc->acquire_ctx Atomic updates may acquire more state than initially locked through drm_modeset_lock_crtc, running with heavy stress can cause a WARN_ON(crtc->acquire_ctx) in drm_modeset_lock_crtc: [ 601.491296] ------------[ cut here ]------------ [ 601.491366] WARNING: CPU: 0 PID: 2411 at drivers/gpu/drm/drm_modeset_lock.c:191 drm_modeset_lock_crtc+0xeb/0xf0 [drm] [ 601.491369] Modules linked in: drm i915 drm_kms_helper [ 601.491414] CPU: 0 PID: 2411 Comm: kms_cursor_lega Tainted: G U 4.7.0-rc4-patser+ #4798 [ 601.491417] Hardware name: Intel Corporation Skylake Client [ 601.491420] 0000000000000000 ffff88044d153c98 ffffffff812ead28 0000000000000000 [ 601.491425] 0000000000000000 ffff88044d153cd8 ffffffff810868e6 000000bf58058030 [ 601.491431] ffff880088b415e8 ffff880458058030 ffff88008a271548 ffff88008a271568 [ 601.491436] Call Trace: [ 601.491443] [<ffffffff812ead28>] dump_stack+0x4d/0x65 [ 601.491447] [<ffffffff810868e6>] __warn+0xc6/0xe0 [ 601.491452] [<ffffffff81086968>] warn_slowpath_null+0x18/0x20 [ 601.491472] [<ffffffffc00d4ffb>] drm_modeset_lock_crtc+0xeb/0xf0 [drm] [ 601.491491] [<ffffffffc00c5526>] drm_mode_cursor_common+0x66/0x180 [drm] [ 601.491509] [<ffffffffc00c91cc>] drm_mode_cursor_ioctl+0x3c/0x40 [drm] [ 601.491524] [<ffffffffc00bc94d>] drm_ioctl+0x14d/0x530 [drm] [ 601.491540] [<ffffffffc00c9190>] ? drm_mode_setcrtc+0x520/0x520 [drm] [ 601.491545] [<ffffffff81176aeb>] ? handle_mm_fault+0x106b/0x1430 [ 601.491550] [<ffffffff81108441>] ? stop_one_cpu+0x61/0x70 [ 601.491556] [<ffffffff811bb71d>] do_vfs_ioctl+0x8d/0x570 [ 601.491560] [<ffffffff81290d7e>] ? security_file_ioctl+0x3e/0x60 [ 601.491565] [<ffffffff811bbc74>] SyS_ioctl+0x74/0x80 [ 601.491571] [<ffffffff810e321c>] ? posix_get_monotonic_raw+0xc/0x10 [ 601.491576] [<ffffffff8175b11b>] entry_SYSCALL_64_fastpath+0x13/0x8f [ 601.491581] ---[ end trace 56f3d3d85f000d00 ]--- For good measure, test mode_config.acquire_ctx too, although this should never happen. Testcase: kms_cursor_legacy Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 81e257e964268d050f8e9188becd44d50f241d72) from v4.7-rc5 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I3a9273d0d690cb3baafe9c131343216fc47008fb Reviewed-on: https://chromium-review.googlesource.com/459992 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="459992" owner_email="tarun.vyas@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/92/459992/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I669bb92022793ad8d7a3832e5c4f579b3506252a" commit="ce7bd14660be80b19672989024211a396a93419a" commit_message="UPSTREAM: drm/mm: avoid possible null pointer dereference Do not dereference node before the check if node is NULL. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1463602639-4861-1-git-send-email-xypron.glpk@gmx.de (cherry picked from commit b80d3942329dcd43580adc3f7c0a098515b5feec) from topic/drm-misc-2016-06-01 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I669bb92022793ad8d7a3832e5c4f579b3506252a Reviewed-on: https://chromium-review.googlesource.com/460011 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460011" owner_email="tarun.vyas@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/11/460011/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I9ba00d87afcab187b38857ff13e66bf414268ca1" commit="63332f42e908e42c0beb2997c68fe5425c60b07f" commit_message="UPSTREAM: drm: use seqlock for vblank time/count This patch aims to replace the roll-your-own seqlock implementation with full-blown seqlock'. We also remove the timestamp ring-buffer in favour of single timestamp/count pair protected by a seqlock. In turn this means we can now increment the vblank freely without the need for clamping. v2: - reduce the scope of the seqlock, keeping vblank_time_lock - make the seqlock per vblank_crtc, so multiple readers aren't blocked by the writer Cc: Mario Kleiner <mario.kleiner@tuebingen.mpg.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462890088-18194-1-git-send-email-matthew.auld@intel.com (cherry picked from commit d4055a9b207966ab4058550d818532b979d8bf78) from topic/drm-misc-2016-06-01 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I9ba00d87afcab187b38857ff13e66bf414268ca1 Reviewed-on: https://chromium-review.googlesource.com/460012 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460012" owner_email="tarun.vyas@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/12/460012/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I79cfdc7276b48840dadc4484838dc86fc4eb3601" commit="535a67c40a406c5dff3c7aeefb805cb74359d13b" commit_message="BACKPORT: drm/vgem: Use lockless gem BO free callback No dev->struct_mutex anywhere to be seen. Cc: seanpaul@chromium.org Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1464630800-30786-17-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 1bd816f120718d578af7e4b623b9a0dec59c028c) from topic/drm-misc-2016-06-01 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Conflicts: [Tarun: Retain the change corresponding to "4281b9fe7e CHROMIUM: drm/vgem: add DRM_IOCTL_VGEM_MODE_MAP_DUMB for render nodes"] drivers/gpu/drm/vgem/vgem_drv.c Change-Id: I79cfdc7276b48840dadc4484838dc86fc4eb3601 Reviewed-on: https://chromium-review.googlesource.com/460013 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460013" owner_email="tarun.vyas@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/13/460013/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I166fd2f9d9f09a2f9dc9a29ff0b984a44dabd11a" commit="40aeb56fb7e3e5c25a1b9cebfc625501d560fa86" commit_message="UPSTREAM: drm/i915: Remove i915_gem_obj_size Only caller is i915_gem_obj_ggtt_size which only cares about GGTT so simplify it and implement under that name. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> (cherry picked from commit 8da32727ac0e5a1b440c5f011d501bd64164d9ec) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I166fd2f9d9f09a2f9dc9a29ff0b984a44dabd11a Reviewed-on: https://chromium-review.googlesource.com/460014 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460014" owner_email="tarun.vyas@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/14/460014/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I6dd9b1d269c4ba302dc42fbd575e91337df653b8" commit="39a867b88accbb2bbc718ebdf915e01655b00ccb" commit_message="UPSTREAM: drm/i915: Simplify i915_gem_obj_to_ggtt_view Can use vma->is_ggtt to simplify the check and also switch the Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Dave Gordon <david.s.gordon@intel.com> (cherry picked from commit 598b9ec8eff264f29fbfef811d3e69da1eb38503) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I6dd9b1d269c4ba302dc42fbd575e91337df653b8 Reviewed-on: https://chromium-review.googlesource.com/460015 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460015" owner_email="tarun.vyas@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/15/460015/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ifba0d47017e96a8e50bb5651c473d6d92410c8f5" commit="4aac7f25987444091d533b26be6b8286197476cf" commit_message="UPSTREAM: drm/i915: Simplify i915_gem_obj_ggtt_offset_view Can use the new vma->is_ggtt to simplify the check and remove the local variables. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Dave Gordon <david.s.gordon@intel.com> (cherry picked from commit 8aac2220cc949accfdaae6161242c95f072da5ac) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ifba0d47017e96a8e50bb5651c473d6d92410c8f5 Reviewed-on: https://chromium-review.googlesource.com/460016 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460016" owner_email="tarun.vyas@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/16/460016/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I9d6c7f8e3af4c338ebca17a254d4e0ad836d2796" commit="57f8fb530858fc1e34090ddf72e292849f0981ba" commit_message="UPSTREAM: drm/i915: Simplify i915_gem_obj_ggtt_bound_view Can use the new vma->is_gtt to simplify the check and get rid of the local variables. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Dave Gordon <david.s.gordon@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461240286-25968-1-git-send-email-tvrtko.ursulin@linux.intel.com Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> (cherry picked from commit ff5ec22dad154e67f57c0c5e66afdd3668b698c8) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I9d6c7f8e3af4c338ebca17a254d4e0ad836d2796 Reviewed-on: https://chromium-review.googlesource.com/460017 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460017" owner_email="tarun.vyas@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/17/460017/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I222b8f46c7a66e1b9ee8f9918628c087bd72a8fc" commit="5197df61cc78b93c72022425567d439b4ca6bc67" commit_message="UPSTREAM: drm/i915/fbdev: Call intel_unpin_fb_obj() on release When releasing the intel_fbdev, we should unpin the framebuffer that we pinned during construction. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit fb4b8ce139c36fe93cf006bd68f0aa0340dd59e8) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I222b8f46c7a66e1b9ee8f9918628c087bd72a8fc Reviewed-on: https://chromium-review.googlesource.com/460018 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460018" owner_email="tarun.vyas@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/18/460018/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I2f7f466e2895a545bbdf2fcb32edda18e824a90e" commit="ebe632c93e48adab11c2932c52b088ed6d8baa62" commit_message="UPSTREAM: drm/i915: Unify GPU resets upon shutdown Both execlists and legacy need to reset the context (and mode) of the GPU before we lose control of the system. By resetting the GPU, we revert back to default settings. This simplifies the life of any subsequent driver (in particular for virtualized setups) as it does not then have to try and recover from an unknown condition. As both paths need to reset for the same reason, move the reset to a common point. This unifies the resets added in a647828afc (drm/i915: Also perform gpu reset under execlist mode) and 8e96d9c4d9 (drm/i915: reset the GPU on context fini). v2: Restrict the reset to "modern" gen (where we enable HW contexts) to try and avoid leaving the machine in an unusable state with a risky reset on older GPU. This should keep the status quo as to who performs resets (i.e. currently only GPUs with HW contexts perform a reset on shutdown). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> CC: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: "Niu, Bing" <bing.niu@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461833819-3991-25-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit e7ae86bab90887e1892e6c33c4fb38d8ca6935f9) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I2f7f466e2895a545bbdf2fcb32edda18e824a90e Reviewed-on: https://chromium-review.googlesource.com/460019 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460019" owner_email="tarun.vyas@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/19/460019/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Id821974d8b3603b6efb1ed50259e04732dc13cc6" commit="7a9711483c22e4dd04309241dd2644ac1987c80b" commit_message="UPSTREAM: drm/i915: Set crtc_state->lane_count for HDMI Set the lane count for HDMI to 4. This will make it easier to unduplicate CHV phy code. This also fixes the the soft reset programming for HDMI with CHV. After commit a8f327fb8464 ("drm/i915: Clean up CHV lane soft reset programming"), it wouldn't set the right bits for PCS23 since it relied on a lane count that was never set. v2: Set lane_count in *_get_config() to please state checker. (0day) v3: Set lane_count for DDI in DVI mode too. (CI) v4: Add note about CHV soft lane reset. (Ander) Fixes: a8f327fb8464 ("drm/i915: Clean up CHV lane soft reset programming") Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-2-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit d4d6279abe9a4a2d52115bad122118db4995df17) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Id821974d8b3603b6efb1ed50259e04732dc13cc6 Reviewed-on: https://chromium-review.googlesource.com/460020 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460020" owner_email="tarun.vyas@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/20/460020/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ic85ea54f5f38a9a7a1c763b3634745c0cf29d9a1" commit="8e9065c58e95487bfc25992d635a723d91f9456b" commit_message="UPSTREAM: drm/i915: Unduplicate CHV signal level code The code for programming voltage swing and emphasis was duplicated between DP and HDMI code. Move that to a new file, intel_dpio_phy.c. v2: Keep the "Use 800mV-0dB" comment in the HDMI code. (Ville) Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-3-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit b7fa22d872e323f4e11c55b31d6351cf017c57b8) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic85ea54f5f38a9a7a1c763b3634745c0cf29d9a1 Reviewed-on: https://chromium-review.googlesource.com/460021 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460021" owner_email="tarun.vyas@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/21/460021/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Id13eb3e74d54776478a6661759d8c85b5808d7c7" commit="53d9cece783d9327ca99a5f2815fac5d7d8d48bb" commit_message="UPSTREAM: drm/i915: Unduplicate chv_data_lane_soft_reset() The function chv_data_lane_soft_reset() was duplicated in DP and HDMI code. Move it to intel_dpio_phy.c. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-4-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 844b2f9a5d061e5d2d09b0664fad0e0bfa39dc39) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Id13eb3e74d54776478a6661759d8c85b5808d7c7 Reviewed-on: https://chromium-review.googlesource.com/460022 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460022" owner_email="tarun.vyas@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/22/460022/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ibccbbef68ed412464c513c608a4004dac0b07951" commit="96aeac0850a95fdb062188b18e4dce8aab84f7a4" commit_message="UPSTREAM: drm/i915: Unduplicate CHV phy-releated pre pll enabling code The same logic is used for DP and HDMI so move it to intel_dpio_phy.c. v2: Rebase Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-5-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 419b1b7ae13ed0518032ff8d564c0efc0008d20d) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ibccbbef68ed412464c513c608a4004dac0b07951 Reviewed-on: https://chromium-review.googlesource.com/460023 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460023" owner_email="tarun.vyas@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/23/460023/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I281bd2f1b9ec540d82f8509d626715e44c7b5594" commit="bcfef9a0df025c4f86fcad38a3e6fa86d0b48c36" commit_message="UPSTREAM: drm/i915: Unduplicate CHV pre-encoder enabling phy logic The only difference between the DP and HDMI versions was the lane count. Since lane_count is now set appropriately for HDMI too, get rid of the duplication and move this to intel_dpio_phy.c v2: Don't move comments about 2nd common lane staying alive. (Ville) Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-6-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit e7d2a7172426f3feecb5f13f47acde1c11e31985) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I281bd2f1b9ec540d82f8509d626715e44c7b5594 Reviewed-on: https://chromium-review.googlesource.com/460024 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460024" owner_email="tarun.vyas@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/24/460024/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ie9cacd3afebff010dc2ec8c587f79c6aaeb48cc9" commit="4dee39e690b28bc7591f072f5a148c05444eb6ad" commit_message="UPSTREAM: drm/i915: Unduplicate CHV encoders' post pll disable code The exact same code was used by HDMI and DP encoders, so move it to intel_dpio_phy.c. v2: Fix typo in the commit message. (Jim Bride) v3: Call the new function chv_phy_post_pll_disable() instead of chv_phy_post_disable(), as it should be called after the pll is disabled. (Ville) Cc: Jim Bride <jim.bride@linux.intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-7-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 204970b5cf8a3d3367b346df0ec6f56279ad8fca) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ie9cacd3afebff010dc2ec8c587f79c6aaeb48cc9 Reviewed-on: https://chromium-review.googlesource.com/460025 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460025" owner_email="tarun.vyas@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/25/460025/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I459d36ebc084848161a762c0984f731b37a62f17" commit="5ae1b270ea457d8a1d7593ef7fe3bdb2d33aaa85" commit_message="UPSTREAM: drm/i915: Unduplicate VLV signal level code The logic for setting signal levels is used for both HDMI and DP with small variations. But it is similar enough to put behind a function called from the encoders. v2: Remove unrelated MST changes due to rebase fumble. (Jim Bride) Fix typo in the commit message. (Jim Bride) v3: Really fix the typo. (Jim) Cc: Jim Bride <jim.bride@linux.intel.com> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-8-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 53d9872511c4911616ae39f59d97afb62510d81e) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I459d36ebc084848161a762c0984f731b37a62f17 Reviewed-on: https://chromium-review.googlesource.com/460026 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460026" owner_email="tarun.vyas@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/26/460026/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I73605ddfbe543fba246edbcce1863758f727e999" commit="fe10a9ca02c60adf8184d6a2d74d2492637c22c9" commit_message="UPSTREAM: drm/i915: Unduplicate VLV phy pre pll enabling code The code used by the DP and HDMI paths was very similar, so make them share it. Note that this removes the write to signal level registers from the HDMI pre pll enable path, but that's OK since those are set in vlv_hdmi_pre_enable() function. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-9-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 6da2e61602e3511a07d19df9494b07eb1f4c0ef6) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I73605ddfbe543fba246edbcce1863758f727e999 Reviewed-on: https://chromium-review.googlesource.com/460027 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460027" owner_email="tarun.vyas@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/27/460027/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ic6c60af24770eb5e7c829ea620756ac16d55acb4" commit="095fda756b72fbff796cdee2eb623d01e83cca0e" commit_message="UPSTREAM: drm/i915: Unduplicate pre encoder enabling phy code The phy code in vlv_pre_enable_dp() and vlv_hdmi_pre_enable() is exectly the same, so extract it to intel_dpio_phy.c. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-10-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 5f68c275b46460e6c2923763e7842011dabd3585) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic6c60af24770eb5e7c829ea620756ac16d55acb4 Reviewed-on: https://chromium-review.googlesource.com/460028 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460028" owner_email="tarun.vyas@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/28/460028/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I9bd03054b5c732e868276c708da2a136a540890b" commit="9b2b68df7ecd644a21e02a3956c19fcbd2cdb3df" commit_message="UPSTREAM: drm/i915: Move VLV HDMI lane reset work around logic to intel_dpio_phy.c This moves the last phy specific code from the encoders to the phy specific file. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jim Bride <jim.bride@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-11-git-send-email-ander.conselvan.de.oliveira@intel.com (cherry picked from commit 0f572ebec04ef1cb6f16372eccde6b4724e881cf) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I9bd03054b5c732e868276c708da2a136a540890b Reviewed-on: https://chromium-review.googlesource.com/460029 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460029" owner_email="tarun.vyas@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/29/460029/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I92ee169824ce92f8127a00fe374b0582f89dfc83" commit="c64c2806833b3860201295e9fe9e207390c84716" commit_message="UPSTREAM: drm/i915: Bump reserved size for legacy gen8 semaphore emission With 5 rings and a flush, we need 192 bytes of space to emit the breadcrumb and semaphores. However, we need some spare room the size of the single largest packet (36 dwords, 144 bytes) to accommodate wraparound giving a grand total of 336 bytes Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461917226-9132-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 596e5efc690d832e476018763ae6363c55e21165) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I92ee169824ce92f8127a00fe374b0582f89dfc83 Reviewed-on: https://chromium-review.googlesource.com/460030 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460030" owner_email="tarun.vyas@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/30/460030/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ifcf48f50ded2695b75076bd54adef95e205c8007" commit="3d8ed25273b80a8b22f16ef79fd0c2d2f1e1f011" commit_message="UPSTREAM: drm/i915: Trim the flush for the legacy request emission At the start of request emission, we flush some space for the request, estimating the typical size for the request body. The tail is now much larger than the typical body, so we can shrink the flush slightly. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461917226-9132-2-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit a0442461f2caa406ce77261214ec3217fe3cac22) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ifcf48f50ded2695b75076bd54adef95e205c8007 Reviewed-on: https://chromium-review.googlesource.com/460031 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460031" owner_email="tarun.vyas@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/31/460031/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I287a2058001822d5e6df8411b1baacc930f49288" commit="fc7d3146cb4ac00860bfff7a176c23a0c6759a76" commit_message="UPSTREAM: drm/i915: Trim the flush for the execlists request emission At the start of request emission, we flush some space for the request, estimating the typical size for the request body. The common tail is now much larger than the typical body, so we can shrink the flush substantially. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461917226-9132-3-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 0e93cdd4a94c16f646ad7d10ed5d0ca64e8de424) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I287a2058001822d5e6df8411b1baacc930f49288 Reviewed-on: https://chromium-review.googlesource.com/460032 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460032" owner_email="tarun.vyas@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/32/460032/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I49e6aad16a5a90dfe6e42afe90bfb6a695cd86aa" commit="c0865bbfde78e754a32834d5ad11472b76190a86" commit_message="UPSTREAM: drm/i915: Fix gen8 semaphores id for legacy mode With the introduction of a distinct engine->id vs the hardware id, we need to fix up the value we use for selecting the target engine when signaling a semaphore. Note that these values can be merged with engine->guc_id. Fixes: de1add360522c876c25ef2bbbbab1c94bdb509ab Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461932305-14637-3-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 215a7e3210eb208abe634480741e418b5a8bf60c) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I49e6aad16a5a90dfe6e42afe90bfb6a695cd86aa Reviewed-on: https://chromium-review.googlesource.com/460033 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460033" owner_email="tarun.vyas@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/33/460033/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I72dd5b6b665ce40555171417e00997e5839992ea" commit="8ba9a944e04554caed5d561127b68239ff2f377d" commit_message="UPSTREAM: drm/i915: Fix serialisation of pipecontrol write vs semaphore signal In order for the MI_SEMAPHORE_SIGNAL command to wait until after the pipecontrol writing the signal value is complete, we have to pause the CS inside the PIPE_CONTROL with the CS_STALL bit. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461932305-14637-4-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit f9a4ea35b87c28c08134dfc146345f77345a99be) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I72dd5b6b665ce40555171417e00997e5839992ea Reviewed-on: https://chromium-review.googlesource.com/460034 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460034" owner_email="tarun.vyas@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/34/460034/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I241751a427549478aca0b5af9da47feeb11e9920" commit="a4ba875395f39836ddf5c334eed417ef7a56f0e1" commit_message="UPSTREAM: drm/i915: Add rpm get/put in oom and vmap notifier i915_gem_shrink() will scan the bound list only if device is not suspended but in OOM failure scenario it becomes absolutely necessary to release as much memory as possible. Also in allocation failure from vmap address space, it is incumbent on the Driver to reap all its vmaps. So, adding rpm get/put in i915_gem_shrinker_oom() and i915_gem_shrinker_vmap() to ensure shrinking of bound objects as well. Signed-off-by: Praveen Paneri <praveen.paneri@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1462178429-13449-2-git-send-email-praveen.paneri@intel.com Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit ea9d9768a497e23713366a0e2ca290332bc1ed81) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I241751a427549478aca0b5af9da47feeb11e9920 Reviewed-on: https://chromium-review.googlesource.com/460035 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460035" owner_email="tarun.vyas@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/35/460035/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I61f94730d2dcfb2d240452733922c7b3a65a3335" commit="5d583384d06c16dd5a4d3a6dca0d961f5f805466" commit_message="UPSTREAM: Revert "drm/i915: start adding dp mst audio" Right now MST audio is causing too many kernel panics to really keep around in the kernel. On top of that, even after fixing said panics it's still basically non-functional (at least on all the setups I've tested it on). Revert until we have a proper solution for this. This reverts commit 3d52ccf52f2c51f613e42e65be0f06e4e6788093. Signed-off-by: Lyude <cpaul@redhat.com> Fixes: 3d52ccf52f2c ("drm/i915: start adding dp mst audio") Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462287692-28570-1-git-send-email-cpaul@redhat.com (cherry picked from commit 5a8f97ea04c98201deeb973c3f711c3c156115e9) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I61f94730d2dcfb2d240452733922c7b3a65a3335 Reviewed-on: https://chromium-review.googlesource.com/460036 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460036" owner_email="tarun.vyas@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/36/460036/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I5caa10af365645797e4dd5503cab31c4e0baf7c2" commit="b6091b70d053fd61b04f901ef66e2bc7e001612b" commit_message="UPSTREAM: drm/i915: Simplify intel_mark_busy/idle They use dev_priv exclusively so pass it in instead of dev for smaller source and binary. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1461844620-35360-1-git-send-email-tvrtko.ursulin@linux.intel.com (cherry picked from commit 7d9937397592c409d4745693f414dc394c1a747d) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I5caa10af365645797e4dd5503cab31c4e0baf7c2 Reviewed-on: https://chromium-review.googlesource.com/460037 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460037" owner_email="tarun.vyas@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/37/460037/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ibf0871606a65565c8f2036a510f8c2a249c27ce4" commit="f2608b5a7de5090ab9cd2eb1e27ccf6343dd497a" commit_message="UPSTREAM: drm/i915: remove i915_gem_object_ggtt_unbind Only has one user and is nothing more than a shim on top of i915_vma_unbind, so let's just get rid of it. Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461842691-27575-1-git-send-email-matthew.auld@intel.com (cherry picked from commit e96b7e575b1e488470b889dd599c63ae5222c3f4) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ibf0871606a65565c8f2036a510f8c2a249c27ce4 Reviewed-on: https://chromium-review.googlesource.com/460038 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460038" owner_email="tarun.vyas@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/38/460038/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I3124ea6adad6685032326ef1b101907e46651028" commit="28d8fc5a7b33daefe454bdd6e2a7aeb7da1b57d8" commit_message="UPSTREAM: drm/i915: Report command parser version 0 if disabled If the command parser is not active, then it is appropriate to report it as operating at version 0 as no higher mode is supported. This greatly simplifies userspace querying for the command parser as we then do not need to second guess when it will be active (a mixture of module parameters and generational support, which may change over time). v2: s/comand/command/ misspelling in comment Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1462368336-21230-1-git-send-email-chris@chris-wilson.co.uk Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> (cherry picked from commit 1ca3712ca3429a617ed6c5f87718e4f6fe4ae0c6) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I3124ea6adad6685032326ef1b101907e46651028 Reviewed-on: https://chromium-review.googlesource.com/460039 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460039" owner_email="tarun.vyas@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/39/460039/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I98ce30bb5a844869116a43a7de7148815a028bac" commit="8578b2c654aa59244401816c20d441f0f56ab98b" commit_message="UPSTREAM: drm/i915: Unexport i915_ppgtt_init() As i915_ppgtt_init() is not used outside of i915_gem_gtt.c we can make it static. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1462443767-5194-1-git-send-email-chris@chris-wilson.co.uk Reviewed-by: Matthew Auld <matthew.auld@intel.com> (cherry picked from commit cba6dba4e5b4b74589e97a02291f6e2182b502fe) from drm-intel-next-2016-05-08 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I98ce30bb5a844869116a43a7de7148815a028bac Reviewed-on: https://chromium-review.googlesource.com/460040 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460040" owner_email="tarun.vyas@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/40/460040/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Iee7817abab32532f42a38b1108c040837cb8dc14" commit="d51228840541ac7fa10b7b8b1cc3ae35e90ae515" commit_message="BACKPORT: drm: Add helper for DP++ adaptors Add a helper which aids in the identification of DP dual mode (aka. DP++) adaptors. There are several types of adaptors specified: type 1 DVI, type 1 HDMI, type 2 DVI, type 2 HDMI Type 1 adaptors have a max TMDS clock limit of 165MHz, type 2 adaptors may go as high as 300MHz and they provide a register informing the source device what the actual limit is. Supposedly also type 1 adaptors may optionally implement this register. This TMDS clock limit is the main reason why we need to identify these adaptors. Type 1 adaptors provide access to their internal registers and the sink DDC bus through I2C. Type 2 adaptors provide this access both via I2C and I2C-over-AUX. A type 2 source device may choose to implement either of these methods. If a source device implements the I2C-over-AUX method, then the driver will obviously need specific support for such adaptors since the port is driven like an HDMI port, but DDC communication happes over the AUX channel. This helper should be enough to identify the adaptor type (some type 1 DVI adaptors may be a slight exception) and the maximum TMDS clock limit. Another feature that may be available is control over the TMDS output buffers on the adaptor, possibly allowing for some power saving when the TMDS link is down. Other user controllable features that may be available in the adaptors are downstream i2c bus speed control when using i2c-over-aux, and some control over the CEC pin. I chose not to provide any helper functions for those since I have no use for them in i915 at this time. The rest of the registers in the adaptor are mostly just information, eg. IEEE OUI, hardware and firmware revision, etc. v2: Pass adaptor type to helper functions to ease driver implementation Fix a bunch of typoes (Paulo) Add DRM_DP_DUAL_MODE_UNKNOWN for the case where we don't (yet) know the type (Paulo) Reject 0x00 and 0xff DP_DUAL_MODE_MAX_TMDS_CLOCK values (Paulo) Adjust drm_dp_dual_mode_detect() type2 vs. type1 detection to ease future LSPCON enabling Remove the unused DP_DUAL_MODE_LAST_RESERVED define v3: Fix kernel doc function argument descriptions (Jani) s/NONE/UNKNOWN/ in drm_dp_dual_mode_detect() docs Add kernel doc for enum drm_dp_dual_mode_type Actually build the docs Fix more typoes v4: Adjust code indentation of type2 adaptor detection (Shashank) Add debug messages for failurs cases (Shashank) v5: EXPORT_SYMBOL(drm_dp_dual_mode_read) (Paulo) Cc: stable@vger.kernel.org Cc: Tore Anderson <tore@fud.no> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Shashank Sharma <shashank.sharma@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> (v4) Link: http://patchwork.freedesktop.org/patch/msgid/1462542412-25533-1-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit ede53344dbfd1dd43bfd73eb6af743d37c56a7c3) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Conflicts: [Tarun: Retain the change introduced by "68725498 CHROMIUM: drm: add helpers for fence and reservation based dma-buf sync"] drivers/gpu/drm/Makefile Change-Id: Iee7817abab32532f42a38b1108c040837cb8dc14 Reviewed-on: https://chromium-review.googlesource.com/460041 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460041" owner_email="tarun.vyas@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/41/460041/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ie469d55e022a8c1fd7ab27316d0cee28558dee43" commit="f360818fb5e3468e85b214e61e61f31a3823dad9" commit_message="UPSTREAM: drm/i915: Respect DP++ adaptor TMDS clock limit Try to detect the max TMDS clock limit for the DP++ adaptor (if any) and take it into account when checking the port clock. Note that as with the sink (HDMI vs. DVI) TMDS clock limit we'll ignore the adaptor TMDS clock limit in the modeset path, in case users are already "overclocking" their TMDS links. One subtle change here is that we'll have to respect the adaptor TMDS clock limit when we decide whether to do 12bpc or 8bpc, otherwise we might end up picking 12bpc and accidentally driving the TMDS link out of spec even when the user chose a mode that fits wihting the limits at 8bpc. This means you can't "overclock" your DP++ dongle at 12bpc anymore, but you can continue to do so at 8bpc. Note that for simplicity we'll use the I2C access method for all dual mode adaptors including type 2. Otherwise we'd have to start mixing DP AUX and HDMI together. In the future we may need to do that if we come across any board designs that don't hook up the DDC pins to the DP++ connectors. Such boards would obviously only work with type 2 dual mode adaptors, and not type 1. v2: Store adaptor type under indel_hdmi->dp_dual_mode Deal with DRM_DP_DUAL_MODE_UNKNOWN Pass adaptor type to drm_dp_dual_mode_max_tmds_clock(), and use it for type1 adaptors as well Cc: stable@vger.kernel.org Reported-by: Tore Anderson <tore@fud.no> Fixes: 7a0baa623446 ("Revert "drm/i915: Disable 12bpc hdmi for now"") Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462216105-20881-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> (cherry picked from commit b1ba124d8e95cca48d33502a4a76b1ed09d213ce) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ie469d55e022a8c1fd7ab27316d0cee28558dee43 Reviewed-on: https://chromium-review.googlesource.com/460042 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460042" owner_email="tarun.vyas@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/42/460042/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I8130e3bbcd63b12348eb551ea7ef544af03ea46b" commit="8d73c48a968e9b2ab28474bb4fc0c7850cb209fc" commit_message="UPSTREAM: drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed To save a bit of power, let's try to turn off the TMDS output buffers in DP++ adaptors when we're not driving the port. v2: Let's not forget DDI, toss in a debug message while at it v3: Just do the TMDS output control based on adaptor type. With the helper getting passed the type, we wouldn't actually have to check at all in the driver, but the check eliminates the debug output more honest Cc: stable@vger.kernel.org Cc: Tore Anderson <tore@fud.no> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462216105-20881-4-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> (cherry picked from commit b2ccb822d376d1bbbe5d1f9118d1488b25e6bc6d) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I8130e3bbcd63b12348eb551ea7ef544af03ea46b Reviewed-on: https://chromium-review.googlesource.com/460043 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460043" owner_email="tarun.vyas@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/43/460043/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I3f110f16472dfcde69ba4743e175aa86cd2cfc7f" commit="05336fa5d9ccaa0ced600a6322ad77ec1a215e97" commit_message="UPSTREAM: drm/i915: Determine DP++ type 1 DVI adaptor presence based on VBT DP dual mode type 1 DVI adaptors aren't required to implement any registers, so it's a bit hard to detect them. The best way would be to check the state of the CONFIG1 pin, but we have no way to do that. So as a last resort, check the VBT to see if the HDMI port is in fact a dual mode capable DP port. v2: Deal with VBT code reorganization Deal with DRM_DP_DUAL_MODE_UNKNOWN Reduce DEVICE_TYPE_DP_DUAL_MODE_BITS a bit Accept both DP and HDMI dvo_port in VBT as my BSW at least declare its DP port as HDMI :( v3: Ignore DEVICE_TYPE_NOT_HDMI_OUTPUT (Shashank) Cc: stable@vger.kernel.org Cc: Tore Anderson <tore@fud.no> Reported-by: Tore Anderson <tore@fud.no> Fixes: 7a0baa623446 ("Revert "drm/i915: Disable 12bpc hdmi for now"") Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462362322-31278-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> (cherry picked from commit d61992565bd3cc5b66d74ed2e96df043c2a207e2) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I3f110f16472dfcde69ba4743e175aa86cd2cfc7f Reviewed-on: https://chromium-review.googlesource.com/460044 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460044" owner_email="tarun.vyas@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/44/460044/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ifd21accef94365851b723a5214e3bc2369938e8b" commit="d92344c0f5bfde973988da8e918c8d9506bccd96" commit_message="UPSTREAM: drm/i915: Calculate IPS linetime watermark based on future cdclk Use the cdclk we're going to be using when the pipe gets enabled to compute the IPS linetime watermark. The current cdclk frequency is irrelevant at this point since it can still change. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461940278-17122-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (cherry picked from commit 532f7a7f8daab388358f6d00dfad1d98b27d409e) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ifd21accef94365851b723a5214e3bc2369938e8b Reviewed-on: https://chromium-review.googlesource.com/460045 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460045" owner_email="tarun.vyas@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/45/460045/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ibcaf3e6e3e76c3db1664b14fdf1df17d25f94a6e" commit="d5ef48b3b18506ad67f13ab2f25cb2e8dbc86a82" commit_message="UPSTREAM: drm/i915: Add a FIXME about crtc !active vs. watermarks When the crtc is enabled but !active, we should still compute the watermarks as if the planes were visible. That would make it more likely that the we can later transition to active without errors. Add a FIXME to remind people that we're doing the wrong thing now. We should perhaps just move the wm computation for each individual plane into the .check_plane hook, and later we'd just combine the results from all active planes. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1461940278-17122-2-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (cherry picked from commit f818ffea87bb7ee4eb8813eb6258778c5460db2e) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ibcaf3e6e3e76c3db1664b14fdf1df17d25f94a6e Reviewed-on: https://chromium-review.googlesource.com/460046 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460046" owner_email="tarun.vyas@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/46/460046/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I71a61d938b6bb23380fc29e590a0883196015cea" commit="7ca5d33d4b05023e2100d28fcba19b8112fa1f1d" commit_message="UPSTREAM: drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms Move the intel_enable_gtt() call to happen before we touch the GTT during resume. Right now it's done way too late. Before commit ebb7c78d358b ("agp/intel-gtt: Only register fake agp driver for gen1") it was actually done earlier on account of also getting called from the resume hook of the fake agp driver. With the fake agp driver no longer getting registered we must move the call up. The symptoms I've seen on my 830 machine include lowmem corruption, other kinds of memory corruption, and straight up hung machine during or just after resume. Not really sure what causes the memory corruption, but so far I've not seen any with this fix. I think we shouldn't really need to call this during init, but we have been doing that so I've decided to keep the call. However moving that call earlier could be prudent as well. Doing it right after the intel-gtt probe seems appropriate. Also tested this on 946gz,elk,ilk and all seemed quite happy with this change. v2: Reorder init_hw vs. enable_hw functions (Chris) Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: drm-intel-fixes@lists.freedesktop.org Fixes: ebb7c78d358b ("agp/intel-gtt: Only register fake agp driver for gen1") Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462559755-353-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit ac840ae53573d9f435c88c131f6707a79aecb466) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I71a61d938b6bb23380fc29e590a0883196015cea Reviewed-on: https://chromium-review.googlesource.com/460047 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460047" owner_email="tarun.vyas@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/47/460047/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Icc5d46576295ec9d8b6085efb5c9b4676b7b8639" commit="6d16ffc0cc6b2bdee1ebe824bacf7feaed4cce37" commit_message="UPSTREAM: drm/i915: Use drm_i915_private as the native pointer for intel_uncore.c Pass drm_i915_private to the uncore init/fini routines and their subservients as it is their native type. text data bss dec hex filename 6309978 3578778 696320 10585076 a183f4 vmlinux 6309530 3578778 696320 10584628 a18234 vmlinux a modest 400 bytes of saving, but 60 lines of code deleted! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462885804-26750-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit dc97997a21fe1708fc93021baa4ba90db7a3b57f) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Icc5d46576295ec9d8b6085efb5c9b4676b7b8639 Reviewed-on: https://chromium-review.googlesource.com/460048 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460048" owner_email="tarun.vyas@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/48/460048/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I97e37c5ee40aeffc8378c12c2e3f465b39e6ffce" commit="a43fa67235c72c26b8000d8f4da71232f8bbb187" commit_message="UPSTREAM: drm/i915: Make IS_GENx macros work on a mask If instead of numerical comparison me make these test a bitmask, we enable the compiler to optimize all instances of IS_GENx || IS_GENy. v2: Make bit zero of gen mask mean gen 1. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit ae5702d245c2328f1b4afa4ae7d39792a8064d48) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I97e37c5ee40aeffc8378c12c2e3f465b39e6ffce Reviewed-on: https://chromium-review.googlesource.com/460049 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460049" owner_email="tarun.vyas@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/49/460049/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I48bc23d65e878102b24abf2ec050e04eef75566b" commit="b9b651d991831acc43dfd5c60a281f5ac9fb911c" commit_message="UPSTREAM: drm/i915: Promote IS_BROADWELL to a simple macro If we allow it a dedicated flag in dev_priv we enable the compiler to nicely optimize conditions like IS_HASSWELL || IS_BROADWELL. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit ab0d24ac38e34c03a6ced9b9c458a07ab3d431ea) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I48bc23d65e878102b24abf2ec050e04eef75566b Reviewed-on: https://chromium-review.googlesource.com/460050 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460050" owner_email="tarun.vyas@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/50/460050/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I8b2b246485249d5c1220a665459263d7cc11b602" commit="14aebd2e924b4819f62b2b61781df9f00b405c63" commit_message="UPSTREAM: drm/i915: Do not use a bitfield for INTEL_INFO->num_pipes It just makes more work for the compiler and generates more code. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit ac208a8b9a5553acace164870b8b7e86f024b99f) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I8b2b246485249d5c1220a665459263d7cc11b602 Reviewed-on: https://chromium-review.googlesource.com/460051 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460051" owner_email="tarun.vyas@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/51/460051/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I87d07a88974b08d1b0172d12e772e602aeccc2af" commit="0e5c050c4e0ee2b74602a4707d32404a0515ad5d" commit_message="UPSTREAM: drm/i915: Introduce IS_GEN macro To be used for more efficient Gen range checking. v2: Remove spurious chunk. (Chris Wilson) v3: Rebase. v4: Renamed from INTEL_GEN_RANGE and added GEN_FOREVER. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v3) Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462874228-6601-1-git-send-email-tvrtko.ursulin@linux.intel.com (cherry picked from commit ac657f6461e5f7e0e8cb308b46b63ba71a6f6906) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I87d07a88974b08d1b0172d12e772e602aeccc2af Reviewed-on: https://chromium-review.googlesource.com/460052 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460052" owner_email="tarun.vyas@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/52/460052/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I86eb711bb9f1dab23b738740f4d407e8a2874f37" commit="a512e20ff79ee5e93ae27e1f9bc6085eeaa01375" commit_message="UPSTREAM: drm/i915: Convert intel_overlay.c to use native drm_i915_private pointers Another day, another long overdue conversion. Not much to update inside intel_overlay.c, but still text data bss dec hex filename 6309547 3578778 696320 10584645 a18245 vmlinux 6309291 3578778 696320 10584389 a18145 vmlinux a couple of hundred bytes of pointer misdirection. Whilst here, rename the ioctl entry points to include the _ioctl suffix so that the user entry points are clear (following the idiom). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1463053403-25086-1-git-send-email-chris@chris-wilson.co.uk Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 1ee8da6df17dc481948aa2d04005e87bc7d387a4) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I86eb711bb9f1dab23b738740f4d407e8a2874f37 Reviewed-on: https://chromium-review.googlesource.com/460053 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460053" owner_email="tarun.vyas@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/53/460053/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="If69a7483aad17f57373b1226804d5d841f9b8768" commit="0d7d707f550afaebff98ad31b220476e590d9a50" commit_message="UPSTREAM: drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c The get-reset-stats ioctl reports upon the statistics (number of hangs, be it as a victim or the guilty party) of a particular context. It is semantically better as being part of i915_gem_context.c user interface, as opposed to the hardware level access of intel_uncore.c Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit d538704ba0afdb5fc5b91be0b91e82fd19ad1707) from drm-intel-next-2016-05-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: If69a7483aad17f57373b1226804d5d841f9b8768 Reviewed-on: https://chromium-review.googlesource.com/460054 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="1" gerrit_number="460054" owner_email="tarun.vyas@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/54/460054/6" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="I613798fcb3a9a689bc4c0ba8611d8aba980721de" commit="337c5d5fbd618b396bd1d53dcc51b86c9c419f6f" commit_message="media-gfx/imagemagick: update to 6.9.7.4 Previous version of ImageMagick (6.7.8.7) uses an older version of pnglib (1.5) and has problems with loading certain type of images with chromaticities map. This is a reason why it was generating warnings. BUG=chromium:717247 TEST=Run graphics_Sanity test with new version of ImageMagick.\ Conversion warning disappered Change-Id: I613798fcb3a9a689bc4c0ba8611d8aba980721de Signed-off-by: Robert Tarasov <tutankhamen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/497171 Commit-Ready: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="5" gerrit_number="497171" owner_email="tutankhamen@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/71/497171/1" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="Idf5aaf70d2725b10021ca8f1bc939edd13d1e52a" commit="9fc5461539b3315b35b35c54cc6e6dd9b4d51574" commit_message="samba: Add patches for net ads gpo list Adds three patches that fix issues with the gpo list of the net ads tool. samba-4.5.3-reorder_ads_get_gpo_list.patch: Changes order to match GPO application order. The order of GPOs in a gpo_list generated by ads_get_gpo_list did not match the order of application. Since GPOs are pushed to the FRONT of gpo_list, GPOs have to be pushed in the opposite order of application. (Pushing to front is useful to get inheritance blocking right). samba-4.5.3-fix_block_inheritance.patch: Fixes issue with GPOPTIONS_BLOCK_INHERITANCE. GP links with the GPOPTIONS_BLOCK_INHERITANCE option set were blocking GPOs from the same link (i.e. an OU with the flag set would block its own GPOs). This CL makes sure the GPOs from the link are added to the list. samba-4.5.3-list_forced_gpos_last: ads_get_gpo_list: Put enforced GPOs at the end of the list Enforced GPOs should be applied on top of all non-enforced GPOs, so that they override policies set in non-enforced GPOs. BUG=chromium:710469,chromium:710434,chromium:708476 TEST=Made sure that GPO order matches application order. Change-Id: Idf5aaf70d2725b10021ca8f1bc939edd13d1e52a Reviewed-on: https://chromium-review.googlesource.com/480092 Commit-Ready: Lutz Justen <ljusten@chromium.org> Tested-by: Lutz Justen <ljusten@chromium.org> Reviewed-by: Zentaro Kavanagh <zentaro@google.com> " fail_count="1" gerrit_number="480092" owner_email="ljusten@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/92/480092/2" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="Id9a7693f9f54ab22e944472b0d76259e87bab184" commit="210c09032ee28010171d5bdb6cd1d0e162fcc373" commit_message="debugd: minor cleanup Changing some comments, fixing a misplaced pointer asterisk, and adding the leading slash to the ObjectManager path in the service config. BUG=None TEST=emerge Change-Id: Id9a7693f9f54ab22e944472b0d76259e87bab184 Reviewed-on: https://chromium-review.googlesource.com/500428 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Eric Caruso <ejcaruso@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="6" gerrit_number="500428" owner_email="ejcaruso@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/28/500428/1" remote="cros" total_fail_count="6"/><pending_commit branch="master" change_id="If68944865db9ca4df1973f86279f657029604269" commit="b2bad8bcb4e5f1f523c356492ae7a819802a27d4" commit_message="graphics_utils.py: Remove X11 remnants Remove the X support from there. BUG=chromium:655820 TEST=test_that Change-Id: If68944865db9ca4df1973f86279f657029604269 Reviewed-on: https://chromium-review.googlesource.com/493899 Commit-Ready: Ilja H. Friedel <ihf@chromium.org> Tested-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="0" gerrit_number="493899" owner_email="pwang@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/99/493899/3" remote="cros" total_fail_count="2"/><lkgm version="9547.0.0-rc3"/></manifest> |
