| <?xml version="1.0" encoding="utf-8"?><manifest revision="ca15aa6f42d6ece24e131214905cf7598c84cabd"> |
| <notice>Your sources have been sync'd successfully.</notice> |
| <remote fetch="https://android.googlesource.com" name="aosp" review="https://android-review.googlesource.com"/> |
| <remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/> |
| <remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/> |
| <default remote="cros" revision="refs/heads/master" sync-j="8"/> |
| <project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="0f36410cec3fe0c95afa666f17198706c7669656" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="d710b3bbaf7a8253830cbe9d2e720ac8bde16251" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="8263a04a1e4e6e40ed479f62ac529874eb7675ef" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="a9a4938a099d1bf1a87798e021791bbe2e467d00" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="b02dfadbd697ff664d6b00a595a9c36e7011faf6" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="aa6cda6f638bd57d3a024f0d201f723a5c3bb875" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="1dddb51900f6aebf3cf6be2a2eab0d60568cf0f2" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="013ebf9cc81b1be2eaef6a0e1d19ff806a8fcdb8" 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="92e3c8b8d1eaef9ba42778a658940973d974b978" 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="66e00236a69489c9fe86ea9717f9384f363f966b" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="5702f0baefc0c1321374d838f8fc27c18d79a2ae"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="596b73353e6f8a44bac448dd9bf5afc99821a624" 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="1a3a32c0f95a361b0e7584afadc8012cbd405eb7" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="6024a1b8244b5f81e8dc667d7395012cfb989104" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="704dbb824410432fcd5902ed41509f40735e7fd8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="34bf37975758ea446430286c6b314278a6d3a3d9" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="0eed4f0d61ca98bf6a76ab474a213c90cc37a191" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="a2356a69fb42b90ed3fc663643165f0f7da7276f" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="32535317c22a0479f925fc942963e73c181755e0" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="e2d95c585898d9a7e71a9ef3ac180b344b27635b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="153617a10a1d76f5d9f2977df528fd57cfd211b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="71fd092c961a919924db791083643f0c2f3bc51c" 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="ed30b5473c7973e2e77d8fae59a495da31fbd243" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="50e26c0020940a88729ac3f2e194c5b5d475d8db" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="2f1ee8448a886ce1abad9c0e8741582244f8ab40" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="ea800d26846cc4bab2d5f3190062779dda49918b" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="15fa4b1847c4780bf1ef7ee0f7c27af63eb78ada" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="be4a4c97be4afa6ac4808808841a97bdf5661e04" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="f2690a008b7be6c22097063fdc4e5d1969b1b64f" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="3a9622e6c568753f9683d462de619133d8b96de1" 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="326d08f73eef5d9e4ae26d80dab20a4740b01e26" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="c6a8c03ac92f189aee428895f0c03eb23acd4566" 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="b42a93ec02246a8c0de2042d3e30ee15c1761001" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="3285ffdd0924313a4f34f5f3ddce21b1ae53c452" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="d6d3bc5e9014cec419b8430a840f72a33d336591" 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="8db205eab822637ea75c84a733878a3326196e3b" 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="06551d8f9821df12e02b101dc4a5f4f17d07d433" 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="3c5be5ae2ba591bd9cacfd82476b61734768be89" 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="f9efb7420e23447f6781695187746e88d467ee31" 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="4f1e106c96d72a1b5ac4b79bc8facf81b9458edb" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="c050715684a5dde3a4fc818f3de816a407fdb2de" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="638d4895cdde26daa446099844d0a1cef6d1397d" 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="7932b17bafff34101ba727e5d802952203c30949" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="9546ffbb37d5fef191ad1607eeb0b76a6f3a9872" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="4a4e4cd4aae6f8b5fb5ca0f34b8e937835b08f08" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="3522e574a21a65ae4ef76ac396101c68e1c985a1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="0ed732a09b5cd199e4741624437aa0a85866e3c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="e2b1fe70d712d2d8f32084ec1ab500e8e74c12f9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="7a87834574153f6563c922f38527641eb3daf3f5" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="20532baaae557c9c75121bca7bbe93225600c46e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="a2dbfc3e3a058fa20712ccae6e7dc7738e2669b1" 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="b1187232fdf819586ba8c8ece4a27a7515cbdc6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="3edc73c526151052bbade0a32929ec5a5a16122f" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="dfc85e1ea795da6c7bcc34641ed32d55e5ec1d8c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="534d81c399fee7b82d5beae4f455e5f1bfb0b466" upstream="refs/heads/chromeos-5.44"/> |
| <project name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="4787bb2258e5c1ee42f2c5cbdcaada177749d484" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="f21d857fde838f7cb141f81c49070abbdf343fce" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="904f49fd770dd559800523edd91c1226e131655d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="b6e26e656c0696ccd1715a6d2c9acee75ab0c092" 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="879b0b1b115250a532c0f7985bf03640bc3411f2" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="a07f7158fe3af528a2cd2c3fcf9c1011bcd0c09e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="58a69e18e4c8cfe8626ddabcbbcd10b268e48d13" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="3b060f1ea7ff88a2af71b102eed84038749c775d" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="6e14b4cf04c068db1dcc77a86206fd8a98961f74" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="89a00d84b54e15129177aeedbf4dac880926752e" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="6a72431e39b92d27f861d5ae4b62147fd719e360" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="fc8e184e393a410a32b46842087e6217c415f8ae" 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="44b84986b429c153e6c63d9207639b3f432d5021" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="ddb03e7d818f26bac8a7ff04ba0135ac3e73047b" 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="24de1a72ac19d5e0e0bbc833b0563ebb05fc904a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="6f6a1b0463ea19bbc53bdbc4ca48718e5ffa407a" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="1b03323e17c096000d7c5b6b60cc2fb9fcc9f2d1" 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="c34103385fcb6930651cad57516ad4f094f144fa" 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="2c7221537edf60cd01fdf317454fa514f363a3b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="3ccfed9fd25d8e3c01e5be7d737e8d478fb46f70" upstream="refs/heads/chromeos-2.2.12"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="b9b8f1de0ab9d4b0e1739d7c0dc4ec232b85a5c3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="793f51c53f7e0c6ff1662c0efcff0bfe1f61e0cd" 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="09ce67b14d036f502f3c1ba63c3e89da9247da9f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="cb2de5a810df1898cd3ae47d517603b8b12371c0" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="31f4933a54cce7b157619eb1dd14ea32bec39279" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="f6e2acc3f21e8b7c9eec4a8871a65f50381daacf" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="9bcb266cd778f8de9dab4b8c7e5664ddf50e888a" 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="5efe2bca2282dd8aa613ae85b267780f6c1d1307" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="61a6197566d4230c9a86a61e6c5f605778ab3733" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="0aea6aeca494754446dd1e5fe638fe68da128036" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="refs/heads/master"/> |
| <project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="e61fd6681305084ac5bf97a8043882cd6d4370e2" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="1661a29f471199a57719ff27eed5af7d7714376e" 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="Ie9739f8f07c3096c2ce61c3a10d580aa55ea2d93" commit="f51a2108bb68d8ad0243b6c4648cfd39fc7c2289" commit_message="UPSTREAM: drm/i915/gen9: fix the watermark res_blocks value We forgot the "res_blocks += y_tile_minimum" that's described on step V of our documentation. Again, this should only affect the Y tiling cases. It looks like the relevant code was introduced in 0fda65680e92, but there's always the possibility that it matched our specification when it was introduced, and then the specification changed while the code stayed the same. So we can't really say this was a regression, but let's try to add a "Fixes" tag anyway to help backporting. v2: Try to add a "Fixes" tag (Maarten). Fixes: 0fda65680e92 ("drm/i915/skl: Update watermarks for Y tiling") Cc: stable@vger.kernel.org Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Lyude <cpaul@redhat.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474578035-424-8-git-send-email-paulo.r.zanoni@intel.com (cherry picked from commit 75676ed423a6acf9e2b1df52fbc036a51e11fb7a) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ie9739f8f07c3096c2ce61c3a10d580aa55ea2d93 Reviewed-on: https://chromium-review.googlesource.com/460761 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460761" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/460761/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I2330d6dfe0e88778c76ba7dfdbeb7b5e81f57bde" commit="93649c872787ae4af586fec753b3d7f7f6c93bb0" commit_message="UPSTREAM: drm/i915/gen9: implement missing case for SKL watermarks calculation This should affect linear and X tiled planes on really small htotal cases. It doesn't seem to be a very feasible case, but let's implement it since it's on the specification and it's better to have it and never need than not have it and realize we needed it. Reviewed-by: Lyude <cpaul@redhat.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474578035-424-9-git-send-email-paulo.r.zanoni@intel.com (cherry picked from commit f1db3eafe5a2ad39caa8315f9b5403759e0c5520) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I2330d6dfe0e88778c76ba7dfdbeb7b5e81f57bde Reviewed-on: https://chromium-review.googlesource.com/460762 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460762" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/460762/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I1fd932f131b3934dceae3500fb7de53ad2c57cc2" commit="c5ce6f020dcf28c08d1084cf2f9f47074501ab9c" commit_message="UPSTREAM: drm/i915/gen9: fail the modeset instead of WARNing on unsupported config Now that this code is part of the compute stage we can return -EINVAL to prevent the modeset instead of giving a WARN and trying anyway. v2: - Fix typo (Paul Menzel). - Add MISSING_CASE() (Ville, Maarten). Reported-by: Lyude <cpaul@redhat.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474578035-424-10-git-send-email-paulo.r.zanoni@intel.com (cherry picked from commit 86a462bcad329ca9232547857d466cc3012d7c2e) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I1fd932f131b3934dceae3500fb7de53ad2c57cc2 Reviewed-on: https://chromium-review.googlesource.com/460763 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460763" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/460763/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I81f1ff061b75c3757efcd63f9125a348e7ea4220" commit="0ef6c080ae488656c966974334c3b90b1d365422" commit_message="UPSTREAM: drm/i915: don't report compression when fbc is disabled When i915_fbc_status is read while fbc is disabled, it reports compressing to be true, which is confusing. Report compressing only when fbc is enabled. v2 (from Paulo): commit message capitalization. Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474534193-9527-1-git-send-email-vathsala.nagaraju@intel.com (cherry picked from commit bc4ec7c83976fe03d2be75a8f64ea825f7b42867) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I81f1ff061b75c3757efcd63f9125a348e7ea4220 Reviewed-on: https://chromium-review.googlesource.com/536821 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536821" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/536821/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I5c91c742c15eb2cacb9978e7744f3543894b610f" commit="f1a5b6b0fa86ea1ddb00066a060183db8dd14d9d" commit_message="UPSTREAM: drm/i915: add a few missing platform tags to workaround tags Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474891672-23414-1-git-send-email-jani.nikula@intel.com (cherry picked from commit 4ff40a41527ae24969431ae879d06169e14dfc08) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I5c91c742c15eb2cacb9978e7744f3543894b610f Reviewed-on: https://chromium-review.googlesource.com/536822 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536822" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/22/536822/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic53609f32245b83f22b0fefb2b688911e8c08f65" commit="4518e98618b50cbbb1541d3f512c128cc8bc6760" commit_message="UPSTREAM: drm/i915/skl: tell the user about pre-production hardware We just removed the implementation for all the pre-production workarounds, so now tell the user that we expect his machine to not work properly. Also convert this to DRM_ERROR so we can more easily spot these problems in bug reports and CI/QA runs. Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474891672-23414-2-git-send-email-jani.nikula@intel.com (cherry picked from commit 4fc7e845f3e2c4c928bf792e43c69af969999a2c) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic53609f32245b83f22b0fefb2b688911e8c08f65 Reviewed-on: https://chromium-review.googlesource.com/536823 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536823" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/23/536823/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I4f6e5c6aae1418819ab5d4ba51b17be17cd348fd" commit="c7775a157cd3f02112ba2ac6ff885f81c8743d57" commit_message="UPSTREAM: drm/i915/bxt: Fix HDMI DPLL configuration a277ca7dc01d should've been a no-functional-change commit, but it removed the initialization of the dpll_hw_state for HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating the dpll_hw_state initialization. v2: - Make bxt_ddi_hdmi_set_dpll_hw_state() static. Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Cc: Durgadoss R <durgadoss.r@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Fixes: a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()") Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474901671-22719-1-git-send-email-imre.deak@intel.com (cherry picked from commit a04139c4cf289119cdfb6081af602f7a452fb7c2) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I4f6e5c6aae1418819ab5d4ba51b17be17cd348fd Reviewed-on: https://chromium-review.googlesource.com/536824 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536824" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/24/536824/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I60c94ecc38eed84fd7f5958d6f767454e277fe03" commit="7cb41e447c606c36f1c5c621c875952b951b47c9" commit_message="UPSTREAM: drm/i915: Code cleanup to use dev_priv and INTEL_GEN Replace dev with dev_priv and INTEL_INFO with INTEL_GEN v1: * Rebased on drm-nightly (Jani Nikula) * Separated from the link training patch series Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475019413-19811-1-git-send-email-manasi.d.navare@intel.com (cherry picked from commit 577c543005dbb809b7880ac17c3f760b20af60e2) from 577c543005dbb809b7880ac17c3f760b20af60e2 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I60c94ecc38eed84fd7f5958d6f767454e277fe03 Reviewed-on: https://chromium-review.googlesource.com/536825 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536825" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/25/536825/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Id8dc43521dc33d3574b52811b48777a1c843f8f2" commit="d98699ebc971b25986f4d2c360ffb99c48eac634" commit_message="UPSTREAM: drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED DPLL_SDVO_HIGH_SPEED must be set for SDVO/HDMI/DP, but nowhere is it forbidden to set it for LVDS/CRT as well. So let's also set it on CRT to make it possible to share the DPLL between HDMI and CRT. What that bit apparently does is enable the x5 clock to the port, which then pumps out the bits on both edges of the clock. The DAC doesn't need that clock since it's not pumping out bits, but I don't think it hurts to have the DPLL output that clock anyway. This is fairly important on IVB since it has only two DPLLs with three pipes. So trying to drive three or more PCH ports with three pipes is only possible when at least one of the DPLLs gets shared between two of the pipes. SNB doesn't really need to do this since it has only two pipes. It could be done to avoid enabling the second DPLL at all in certain cases, but I'm not sure that's such a huge win. So let's not do it for SNB, at least for now. On ILK it never makes sense as the DPLLs can't be shared. v2: Just always enable the high speed clock to keep things simple (Daniel) Beef up the commit message a bit (Daniel) Cc: Nick Yamane <nick.diego@gmail.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Tested-by: Nick Yamane <nick.diego@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97204 Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1474878646-17711-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> (cherry picked from commit 7d7f8633a82763577727762ff3ac1df3017cb8fe) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Id8dc43521dc33d3574b52811b48777a1c843f8f2 Reviewed-on: https://chromium-review.googlesource.com/460764 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460764" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/64/460764/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I6a27e60b6e23351caf1377b3b6c2111ebf2c7117" commit="586552d608f49223655699d7ac7d72ae999bfe0b" commit_message="UPSTREAM: drm/i915/gen9: only add the planes actually affected by ddb changes We were previously adding all the planes owned by the CRTC even when the ddb partitioning didn't change for them. As a consequence, a lot of functions were being called when we were just moving the cursor around the screen, such as skylake_update_primary_plane(). This was causing flickering on the primary plane when moving the cursor. I'm not 100% sure which operation caused the flickering, but we were writing to a lot of registers, so it could be any of these writes. With this patch, just moving the mouse won't add the primary plane to the commit since it won't trigger a change in DDB partitioning. v2: Use skl_ddb_entry_equal() (Lyude). v3: Change Reported-and-bisected-by: to Reported-by: for checkpatch Fixes: 05a76d3d6ad1 ("drm/i915/skl: Ensure pipes with changed wms get added to the state") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97888 Cc: Mike Lothian <mike@fireburn.co.uk> Cc: stable@vger.kernel.org Reported-by: Mike Lothian <mike@fireburn.co.uk> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Lyude <cpaul@redhat.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475177808-29955-1-git-send-email-paulo.r.zanoni@intel.com (cherry picked from commit 7f60e200e254cd53ad1bd74a56bdd23e813ac4b7) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I6a27e60b6e23351caf1377b3b6c2111ebf2c7117 Reviewed-on: https://chromium-review.googlesource.com/460765 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460765" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/460765/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic4687cd3c65468d89e9abd845c3c37cc8f4809f0" commit="2a65a53cd0a977362ebe7488c0642427fd8c4f88" commit_message="UPSTREAM: drm/i915: Just clear the mmiodebug before a register access When we enable the per-register access mmiodebug, it is to detect which access is illegal. Reporting on earlier untraced access outside of the mmiodebug does not help debugging (as the suspicion is immediately put upon the current register which is not at fault)! References: https://bugs.freedesktop.org/show_bug.cgi?id=97985 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Cc: stable@vger.kernel.org Link: http://patchwork.freedesktop.org/patch/msgid/20161003124516.12388-1-chris@chris-wilson.co.uk (cherry picked from commit dda960335e020835f7f1c12760e7f0b525b451e2) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic4687cd3c65468d89e9abd845c3c37cc8f4809f0 Reviewed-on: https://chromium-review.googlesource.com/536826 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536826" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/26/536826/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I5746c797e63eff58e99c110f7efcc45a7bf9c91b" commit="18615483d99d0c84946c61acafa5f27459f8922e" commit_message="UPSTREAM: drm/i915: Unalias obj->phys_handle and obj->userptr We use obj->phys_handle to choose the pread/pwrite path, but as obj->phys_handle is a union with obj->userptr, we then mistakenly use the phys_handle path for userptr objects within pread/pwrite. Testcase: igt/gem_userptr_blits/forbidden-operations Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97519 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@vger.kernel.org Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161003124516.12388-2-chris@chris-wilson.co.uk (cherry picked from commit 5f12b80a0b42da253691ca03828033014bb786eb) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I5746c797e63eff58e99c110f7efcc45a7bf9c91b Reviewed-on: https://chromium-review.googlesource.com/460766 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460766" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/460766/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I5e1dcbcc20a895c994d7166c2aed44d6cdbf3f46" commit="39141506d1e33332bf517a9a49593125cc7ac0e0" commit_message="UPSTREAM: drm/i915: Use correct index for backtracking HUNG semaphores When decoding the semaphores inside hangcheck, we need to use the hw-id and not the local array index. Fixes: de1add360522 ("drm/i915: Decouple execbuf uAPI ...") Testcase: igt/gem_exec_whisper/hang # gen6-7 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161003124516.12388-3-chris@chris-wilson.co.uk (cherry picked from commit 348b9b1192144e13b779f8f9be301d492bebaff2) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I5e1dcbcc20a895c994d7166c2aed44d6cdbf3f46 Reviewed-on: https://chromium-review.googlesource.com/460767 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460767" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/460767/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ie51ed317b0143f002ff2b17914428e40bfcf674c" commit="2a834cb4cca10f788c77c3ddc0beeec6737f7a1d" commit_message="UPSTREAM: drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together Move the outcast intel_fbdev_output_poll_changed() stub for CONFIG_DRM_FBDEV_EMULATION=n next to its friends. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475567628-5529-1-git-send-email-jani.nikula@intel.com (cherry picked from commit d9c409d67131e62f357b43cf03af4c0caab45721) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ie51ed317b0143f002ff2b17914428e40bfcf674c Reviewed-on: https://chromium-review.googlesource.com/460768 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460768" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/460768/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I9de5aa9a48e6933f65f40e8036d10ccdd669e181" commit="7a259cc6b6fa64ee2857c19d24a7c1a0d897ae50" commit_message="UPSTREAM: drm/i915: Remove redundant hsw_write* mmio functions They are completely identical to gen6_write* ones. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit e9b825f4e98c53213072dd6f1dedaed82994a450) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I9de5aa9a48e6933f65f40e8036d10ccdd669e181 Reviewed-on: https://chromium-review.googlesource.com/536827 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536827" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/27/536827/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic00eb8f75db4fcf4eb8ee037ef9d91da900623aa" commit="458384815d3f5128477b047d4bd16f4e258ed11c" commit_message="UPSTREAM: drm/i915: Keep track of active forcewake domains in a bitmask There are current places in the code, and there will be more in the future, which iterate the forcewake domains to find out which ones are currently active. To save them from doing this iteration, we can cheaply keep a mask of active domains in dev_priv->uncore.fw_domains_active. This has no cost in terms of object size, even manages to shrink it overall by 368 bytes on my config. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: "Paneri, Praveen" <praveen.paneri@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 003342a50021132603180d98e49bd17d63e38ccf) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic00eb8f75db4fcf4eb8ee037ef9d91da900623aa Reviewed-on: https://chromium-review.googlesource.com/536828 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536828" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/28/536828/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I8ea2b46812425e5dcb772d1248f63f33fd14d8d1" commit="1cf2c506dceaa55b5dbe50ada4da37a21264ddce" commit_message="UPSTREAM: drm/i915: Do not inline forcewake taking in mmio accessors Once we know we need to take new forcewakes, that being a slow operation, it does not make sense to inline that code into every mmio accessor. Move it to a separate function and save some code. v2: Be explicit with noinline and remove stale comment. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit c521b0c898b0339d4d5fc091849211c5f469f1bd) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I8ea2b46812425e5dcb772d1248f63f33fd14d8d1 Reviewed-on: https://chromium-review.googlesource.com/536829 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536829" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/536829/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I55ba9d1b039659e7411a63965b0567cc881fdfcd" commit="8dad013b34d8d34635b3fd071f68e3e37ca5c775" commit_message="UPSTREAM: drm/i915: Data driven register to forcewake domains lookup Move finding the correct forcewake domains to take for register access from code to a mapping table. This will allow more interesting work in the following patches and is easier to review if singled out early. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 9fc1117cf8ca7a5100f2e86682cd4050a75f7f4d) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I55ba9d1b039659e7411a63965b0567cc881fdfcd Reviewed-on: https://chromium-review.googlesource.com/536830 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536830" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/30/536830/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I3d87b7b9cb82f783ceedd88cb4e5a0405ddd97c5" commit="2610986f481ff96b419e1f0cfdd9658449ad0e4d" commit_message="UPSTREAM: drm/i915: Sort forcewake mapping tables Sorting the tables (verified at runtime to help during development) is another prerequisite for interesting work which will follow. v2: * Remove const away cast and improve comments. (Chris Wilson) * Check tables only when debug option is enabled. v3: Use IS_ENABLED. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit b008123966a45bfda9ef71d35a0b76957d639291) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I3d87b7b9cb82f783ceedd88cb4e5a0405ddd97c5 Reviewed-on: https://chromium-review.googlesource.com/536831 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536831" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/31/536831/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I00d56f4d730e0b47014912df2a339dc91b5b9049" commit="5b0b396d611bacb1cc7e35751e5edef40bdfab73" commit_message="UPSTREAM: drm/i915: Use binary search when looking up forcewake domains Instead of the existing linear seach, now that we have sorted range tables, we can do a binary search on them for some potential miniscule performance gain, but more importantly for elegance and code size. Hopefully the perfomance gain is sufficient to offset the function calls which were not there before. v2: Removed const cast away. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 91e630b9e636954708e933015e7f02f8bcd8b320) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I00d56f4d730e0b47014912df2a339dc91b5b9049 Reviewed-on: https://chromium-review.googlesource.com/536832 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536832" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/32/536832/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ie88c945df4db9bc60b29852c34e3b2d927bfb3a8" commit="b3ef60360641a39c87ed2d48048eb6c86fa55c0e" commit_message="UPSTREAM: drm/i915: Eliminate Gen9 special case If we insert blitter forcewake domain entries in the range table we can eliminate that special case and simplify the code in a few macros. This will enable more unification later. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 0dd356bb6ff556e064672b0aa70908ca4567c7ff) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ie88c945df4db9bc60b29852c34e3b2d927bfb3a8 Reviewed-on: https://chromium-review.googlesource.com/536833 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536833" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/33/536833/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I3041833ffc638b1aae8962d9ebadfd910c9d6628" commit="a5bb75dc7a49d7232a29d0a31677e9b23cecdae2" commit_message="UPSTREAM: drm/i915: Store the active forcewake range table pointer If we store this in the uncore structure we are on a good way to show more commonality between the per-platform implementations. v2: Constify table pointer and correct coding style. (Chris Wilson) v3: Rebase. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 15157970f7c517a1e5759f506833086956c7d60a) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I3041833ffc638b1aae8962d9ebadfd910c9d6628 Reviewed-on: https://chromium-review.googlesource.com/536834 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536834" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/34/536834/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I8e679e1dd82e0b91b078868b6afab20202a520af" commit="9ef8c7263ffa7e379eda27ea819b4427903254a8" commit_message="UPSTREAM: drm/i915: Remove identical macros Remove some macros which are now obviously identical. v2: Added HAS_FWTABLE macro and simplified intel_uncore_forcewake_for_read. (Joonas Lahtinen) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 895833bd97fb03bb391710f5d4f9bc092813d847) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I8e679e1dd82e0b91b078868b6afab20202a520af Reviewed-on: https://chromium-review.googlesource.com/536835 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536835" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/536835/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic7776cf28532e3950736b71af8a38eee87e67f5c" commit="c525b9e28da2d18f591b8da1d36098af49ca8bfb" commit_message="UPSTREAM: drm/i915: Remove identical mmio read functions It is now obvious VLV, CHV and Gen9 mmio read fcuntions are completely identical so we can remove the three copies and just keep the newly named generic implementation. v2: Use fwtable naming consistently. (Joonas Lahtinen) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 6044c4a3710212cf4a68340744ba0bdc069d5928) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic7776cf28532e3950736b71af8a38eee87e67f5c Reviewed-on: https://chromium-review.googlesource.com/536836 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536836" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/536836/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I2d1393b360cdd952edf7147229862a9f7998e02c" commit="56daad5205aa866da7f23d63b0b578a0a2606a9c" commit_message="UPSTREAM: drm/i915: Remove identical write mmmio functions We notice two identical copies of the shadow register table and following from that removal can also unify CHV and Gen9 write mmio functions and macros into a single implementation. v2: Name fwtable consistently and use HAS_FWTABLE. (Joonas Lahtinen) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 22d48c55ba5fbc9ecff51b0bdca829abd2b508cb) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I2d1393b360cdd952edf7147229862a9f7998e02c Reviewed-on: https://chromium-review.googlesource.com/536837 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536837" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/37/536837/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ia90994ad4935aed9d60cf1141dd6c595ff4cda38" commit="b3a401a8313e35581a8de6fb848d79dff8228ad1" commit_message="UPSTREAM: drm/i915: Sort the shadow register table Also verify the order at runtime. This was we can start using binary search on it in a following patch. v2: Add comment on the sorted array and only check it when debug option is enabled. v3: Use IS_ENABLED. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> (v1) Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 47188574a966b9b9ba0aa5a0fa88d934a331dc07) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ia90994ad4935aed9d60cf1141dd6c595ff4cda38 Reviewed-on: https://chromium-review.googlesource.com/536838 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536838" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/38/536838/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I09117a31d9ceef8825184dbe309702bfdf10796c" commit="6f7ec68079dd3cf527bf2ffb190bdcf3e7b8da6e" commit_message="UPSTREAM: drm/i915: Use binary search when looking for shadowed registers Simply replace the linear search with the kernel's binary search implementation. There is only six registers currently in that table so this may not be that interesting. It adds a function call so hopefully remains performance neutral for now. v2: No need for manual conversion to bool for return. (Joonas Lahtinen) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 5a659383816aa548e7a1049d3dd5dd552966acac) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I09117a31d9ceef8825184dbe309702bfdf10796c Reviewed-on: https://chromium-review.googlesource.com/536839 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536839" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/536839/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="If6402bdbe6248f4720f7c0e86b7b30a1b3496feb" commit="a4efce198fda545b45ee8713046220ecdeecc44a" commit_message="UPSTREAM: drm/i915: Inline binary search Instead of using bsearch library function make a local generator macro out of it so the comparison callback can be inlined. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1475569769-31108-1-git-send-email-tvrtko.ursulin@linux.intel.com (cherry picked from commit 9480dbf074417ef8b06ba3923b8648f49c85265b) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: If6402bdbe6248f4720f7c0e86b7b30a1b3496feb Reviewed-on: https://chromium-review.googlesource.com/536840 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536840" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/536840/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ibf5dfb3a6413e55031e67e162ab0efa65b129fd6" commit="f4d5b5e4ecf287daaeff89fb7d66c56aae7c5ad7" commit_message="UPSTREAM: drm/i915: make skl_ddb_add_affected_planes static Fix sparse warning: drivers/gpu/drm/i915/intel_pm.c:3970:1: warning: symbol 'skl_ddb_add_affected_planes' was not declared. Should it be static? Fixes: 7f60e200e254 ("drm/i915/gen9: only add the planes actually affected by ddb changes") Cc: Lyude <cpaul@redhat.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475573357-30562-1-git-send-email-jani.nikula@intel.com (cherry picked from commit bb7791bd2bd424938edb269a17ab154c0d341327) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ibf5dfb3a6413e55031e67e162ab0efa65b129fd6 Reviewed-on: https://chromium-review.googlesource.com/460769 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460769" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/460769/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I003953daf61333af497ad02383222f7dd1101142" commit="a87cfc810afec9dedd6adcf9d4a15e27076b431c" commit_message="UPSTREAM: drm/i915: silence io mapping/unmapping sparse warnings on different address spaces drivers/gpu/drm/i915/i915_gem_execbuffer.c:432:52: warning: incorrect type in argument 1 (different address spaces) drivers/gpu/drm/i915/i915_gem_execbuffer.c:432:52: expected void [noderef] <asn:2>*vaddr drivers/gpu/drm/i915/i915_gem_execbuffer.c:432:52: got void * drivers/gpu/drm/i915/i915_gem_execbuffer.c:477:15: warning: incorrect type in assignment (different address spaces) drivers/gpu/drm/i915/i915_gem_execbuffer.c:477:15: expected void *vaddr drivers/gpu/drm/i915/i915_gem_execbuffer.c:477:15: got void [noderef] <asn:2>* Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475574853-4178-2-git-send-email-jani.nikula@intel.com (cherry picked from commit 615e5000830dd24b8dc6876a6a1babbeda998fdf) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I003953daf61333af497ad02383222f7dd1101142 Reviewed-on: https://chromium-review.googlesource.com/536841 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536841" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/536841/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I330d447884a79dda76257112709116c92d0859b7" commit="3bf7d98eea4fa99690b5f52fc66e11316efa8901" commit_message="UPSTREAM: drm/i915: Share the computation of ring size for RING_CTL register Since both legacy and execlists want to populate the RING_CTL register, share the computation of the right bits for the ring->size. We can then stop masking errors and explicitly forbid them during creation! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-1-chris@chris-wilson.co.uk (cherry picked from commit 62ae14b1edca0aaf27b84b3fa069177dd794e37f) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I330d447884a79dda76257112709116c92d0859b7 Reviewed-on: https://chromium-review.googlesource.com/460770 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460770" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/460770/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I82c6f3273a2fec9e77ae8a1f259ca161b28dc000" commit="a1cdb7da29d73ac66b57dbf550a8ef89366dd502" commit_message="UPSTREAM: drm/i915/execlists: Reinitialise context image after GPU hang On Braswell, at least, we observe that the context image is written in multiple phases. The first phase is to clear the register state, and subsequently rewrite it. A GPU reset at the right moment can interrupt the context update leaving it corrupt, and our update of the RING_HEAD is not sufficient to restart the engine afterwards. To recover, we need to reset the registers back to their original values. The context state is lost. What we need is a better mechanism to serialise the reset with pending flushes from the GPU. Fixes: 821ed7df6e2a ("drm/i915: Update reset path to fix incomplete requests") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-2-chris@chris-wilson.co.uk (cherry picked from commit a3aabe86a3406b9946a4f7707762a833a58dfe9c) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I82c6f3273a2fec9e77ae8a1f259ca161b28dc000 Reviewed-on: https://chromium-review.googlesource.com/460771 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460771" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/460771/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I9fe67edc507da0e9a4a63502f9de302504705638" commit="fb9f3e26ab4e665868ed8d49bc3117e7948291f2" commit_message="UPSTREAM: drm/i915/execlists: Move clearing submission count from reset to init After a GPU reset, we want to replay our queue of requests. However, the GPU reset clobbered the state and we only fixup the state for the guilty request - and engines deemed innocent we try to leave untouched so that we recover as completely as possible. However, we need to clear the sw tracking of the ELSP ports even for innocent requests, so move the clear to the common path of init_hw (from reset_hw). Reported-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-3-chris@chris-wilson.co.uk (cherry picked from commit c87d50cc9fcc634e09d239e6d10293319eafae5f) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I9fe67edc507da0e9a4a63502f9de302504705638 Reviewed-on: https://chromium-review.googlesource.com/460772 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460772" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/460772/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I88f471f5796bf11451ed5f79e0d072758fe6c8cc" commit="8ba9889816775ba8445b4a986fe407c19466c34b" commit_message="UPSTREAM: drm/i915: Disable irqs across GPU reset Whilst we reset the GPU, we want to prevent execlists from submitting new work (which it does via an interrupt handler). To achieve this we disable the irq (and drain the irq tasklet) around the reset. When we enable it again afters, the interrupt queue should be empty and we can reinitialise from a known state without fear of the tasklet running concurrently. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-4-chris@chris-wilson.co.uk (cherry picked from commit 9e60ab0387817c6a9440f448aff7c8514b32d31b) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I88f471f5796bf11451ed5f79e0d072758fe6c8cc Reviewed-on: https://chromium-review.googlesource.com/460773 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460773" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/460773/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I71df97eb7f40078f8af2b8f247dce018b7acadca" commit="8ee635e841292264c5d1184f127ed5992fa10f25" commit_message="UPSTREAM: drm/i915: Double check hangcheck.seqno after reset Check that there was not a late recovery between us declaring the GPU hung and processing the reset. If the GPU did recover by itself, let the request remain on the active list and see if it hangs again! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-5-chris@chris-wilson.co.uk (cherry picked from commit 77c607013e208ed212845ce2565f24145393fee1) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I71df97eb7f40078f8af2b8f247dce018b7acadca Reviewed-on: https://chromium-review.googlesource.com/460774 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460774" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/74/460774/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I67baec66c676f47c27a532b2626b5dc0b193d63c" commit="0d9f6bcb6b299d101fbcc5696e118a7c5bed1b6d" commit_message="UPSTREAM: drm/i915: Show bounds of active request in the ring on GPU hang Include the position of the active request in the ring, and display that alongside the current RING registers (on a GPU hang). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-6-chris@chris-wilson.co.uk (cherry picked from commit cdb324bde5700725f04172bbeb6ef0bbbb6886c3) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I67baec66c676f47c27a532b2626b5dc0b193d63c Reviewed-on: https://chromium-review.googlesource.com/460775 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460775" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/460775/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I586eebbff27c501c3f78d701b4444ec30106d4dd" commit="cab246141468c8857b72c49193293e6a35ea0447" commit_message="UPSTREAM: drm/i915: Show RING registers through debugfs Knowing where the RINGs are pointing is extremely useful in diagnosing if the engines are executing the ringbuffers you expect - and igt may be suppressing the usual method of looking in the GPU error state. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161004201132.21801-7-chris@chris-wilson.co.uk (cherry picked from commit 1b36595ffb350c8bec5be8894c5a43f0581864c0) from intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I586eebbff27c501c3f78d701b4444ec30106d4dd Reviewed-on: https://chromium-review.googlesource.com/536842 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536842" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/536842/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I62454354486c096f678a6ee9648f3fc9dbe61aa1" commit="d30f93d6902a3ead46f27390e3cb0f0fa0b1ad2b" commit_message="UPSTREAM: drm/i915: Show waiters in i915_hangcheck_info It is convenient to know what processes are waiting when looking at hangcheck status in debugfs. 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/20161004201132.21801-8-chris@chris-wilson.co.uk (cherry picked from commit 33f53719d13a61979ca6578b280ed247eb81cdd4) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I62454354486c096f678a6ee9648f3fc9dbe61aa1 Reviewed-on: https://chromium-review.googlesource.com/460777 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460777" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/460777/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I07e6f111f5f4ae111d4b339db9770a50e033cf0f" commit="6222052ec66a1823335d27517b7baecf87803a9b" commit_message="UPSTREAM: drm/i915: Move long hpd handling into the hotplug work We can't rely on connector->status in the detect() hook if the long hpd was already handled by the dig_port_work as that won't update connector->status. Thus we have to defer the long hpd handling entirely until the hotplug work runs to avoid the double long hpd handling the "detect_done" flag is trying to prevent. We'll start to depend on connector->status being up to date in a following patch. Cc: Damien Cassou <damien@cassou.me> Cc: freedesktop.org@gp.mailgun.org Cc: Arno <blouin.arno@gmail.com> Cc: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com> Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com> Cc: stable@vger.kernel.org Tested-by: Arno <blouin.arno@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83348 Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475481316-8194-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> (cherry picked from commit 27d4efc5591a5853de54713bc717de73c8951e17) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I07e6f111f5f4ae111d4b339db9770a50e033cf0f Reviewed-on: https://chromium-review.googlesource.com/460778 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460778" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/78/460778/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I1b492cd0ef27d896af08b2583eba22238592cbfa" commit="7efd018edd6b4be045c59590b095dd16e0a7c381" commit_message="UPSTREAM: drm/i915: Allow DP to work w/o EDID Allow returning "connected" or "unknown" connector status for DP branch devices that don't have an EDID. Currently we'd claim the thing as "disconnected" if there is no EDID. This stuff used to broken already, I think, but it got more broken by commit f21a21983ef1 ("drm/i915: Splitting intel_dp_detect") Cc: Damien Cassou <damien@cassou.me> Cc: freedesktop.org@gp.mailgun.org Cc: Arno <blouin.arno@gmail.com> Cc: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com> Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com> Cc: stable@vger.kernel.org Tested-by: Arno <blouin.arno@gmail.com> Fixes: f21a21983ef1 ("drm/i915: Splitting intel_dp_detect") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83348 Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475481316-8194-2-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> (cherry picked from commit 5cb651a7959310ef4dbb0b93f005b10286789656) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I1b492cd0ef27d896af08b2583eba22238592cbfa Reviewed-on: https://chromium-review.googlesource.com/460779 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460779" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/79/460779/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I8dab51c336599b630057032b72f637b40610fe23" commit="dc154537e6c4bc8f71170c6ef323e4563ecb7b8c" commit_message="UPSTREAM: drm/i915: Distinguish last emitted request from last submitted request In order not to trigger hangcheck on a idle-but-waiting engine, we need to distinguish between the pending request queue and the actual execution queue. This is done later in "drm/i915: Enable multiple timelines" but for now we need a temporary fix to prevent blaming the wrong engine for a GPU hang. (Note that this causes a temporary subtle change in how we decide when to allow a waitboost to be re-awarded back to the waiter, the temporary effect is that if the wait is upon the most current execution the wait is given for free, instead of checking to see if the client stalled itself. This will be repaired in "drm/i915: Enable multiple timelines".) Fixes: 0a046a0e93d2 ("drm/i915: Nonblocking request submission") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98104 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161007065327.24515-1-chris@chris-wilson.co.uk (cherry picked from commit 8687b3ec852e89630bac650f15136811c7b4c1dc) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I8dab51c336599b630057032b72f637b40610fe23 Reviewed-on: https://chromium-review.googlesource.com/460780 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460780" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/80/460780/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I087428df5591c61dbf30fe725a977b05bb1ba56a" commit="9507eab43b94f28df5e5cc70eeb4438f524c92dc" commit_message="UPSTREAM: drm/i915: Force relocations via cpu if we run out of idle aperture If we run out of enough aperture space to fit the entire object, we fallback to trying to insert a single page. However, if that also fails, we currently fail to userspace with an unexpected ENOSPC. (ENOSPC means to userspace that their batch could not be fitted within the GTT.) Prior to commit e8cb909ac3ab ("drm/i915: Fallback to single page GTT mmappings for relocations") the approach is to fallback to using the slow CPU relocation path in case of iomapping failure, and that is the behaviour we need to restore. Fixes: e8cb909ac3ab ("drm/i915: Fallback to single page GTT mmappings...") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98101 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161007065327.24515-2-chris@chris-wilson.co.uk (cherry picked from commit d7f7633557503bd231347d8896b9a6fb08f84e00) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I087428df5591c61dbf30fe725a977b05bb1ba56a Reviewed-on: https://chromium-review.googlesource.com/460781 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460781" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/81/460781/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I1bdf9b4a0c6fe58059a7332d69dc1b83b8b8d0e7" commit="84f34755c157be0cea381b19c87b7c7dd52b5ef9" commit_message="UPSTREAM: drm/i915: Reset the breadcrumbs IRQ more carefully Along with the interrupt, we want to restore the fake-irq and wait-timeout detection. If we use the breadcrumbs interface to setup the interrupt as it wants, the auxiliary timers will also be restored. v2: Cancel both timers as well, sanitize the IMR. Fixes: 821ed7df6e2a ("drm/i915: Update reset path to fix incomplete requests") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161007065327.24515-3-chris@chris-wilson.co.uk (cherry picked from commit ad07dfcddf1394e6fed094e7fb426b4242a6814e) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I1bdf9b4a0c6fe58059a7332d69dc1b83b8b8d0e7 Reviewed-on: https://chromium-review.googlesource.com/460782 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460782" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/82/460782/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I029b49765da0446ee975fe6538bb322ae7aa16d2" commit="867f8fde4acf5d3507952f869b3505208c49fd41" commit_message="UPSTREAM: drm/i915/guc: Unwind GuC workqueue reservation if request construction fails We reserve space in the GuC workqueue for submitting the request in the future. However, if we fail to construct the request, we need to give that reserved space back to the system. Fixes: dadd481bfe55 ("drm/i915/guc: Prepare for nonblocking execbuf submission") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97978 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Micha Winiarski <michal.winiarski@intel.com> Reviewed-by: Micha Winiarski <michal.winiarski@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161007065327.24515-4-chris@chris-wilson.co.uk (cherry picked from commit 5ba899082cbffb779ccb39420fe1718850daf857) from drm-intel-next-2016-10-10 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I029b49765da0446ee975fe6538bb322ae7aa16d2 Reviewed-on: https://chromium-review.googlesource.com/460783 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460783" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/83/460783/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic4bb295cbf80a5b55ab9c0d36352461f779fb882" commit="02eb854e0ebf179bb49825c770bdfa75d979a38e" commit_message="UPSTREAM: drm/i915: Remove self-harming shrink_all on get_pages_gtt fail When we notice the system under memory pressure, we try to evict some driver pages before asking the VM to shrink all caches. As a final step in that process, we tried to evict everything, including active buffers. This is harming ourselves, and we can mix shrinking all caches as well as our residual buffers (after the first pass of trying to shrink just our own buffers). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Micha Winiarski <michal.winiarski@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161011082021.14606-1-chris@chris-wilson.co.uk (cherry picked from commit 465350d0db06e280dfd7998392269358bba30813) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ic4bb295cbf80a5b55ab9c0d36352461f779fb882 Reviewed-on: https://chromium-review.googlesource.com/460784 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460784" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/84/460784/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I120c99bd5677159a0ee35aee130e36e4a7b3df58" commit="0e9c55e10e719ae2d796d7a3ec7822baded085d7" commit_message="UPSTREAM: drm/i915: Allow compaction upto SWIOTLB max segment size commit 1625e7e549c5 ("drm/i915: make compact dma scatter lists creation work with SWIOTLB backend") took a heavy handed approach to undo the scatterlist compaction in the face of SWIOTLB. (The compaction hit a bug whereby we tried to pass a segment larger than SWIOTLB could handle.) We can be a little more intelligent and try compacting the scatterlist up to the maximum SWIOTLB segment size (when using SWIOTLB). v2: Tidy sg_mark_end() and cpp Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> CC: Imre Deak <imre.deak@intel.com> CC: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161011082021.14606-2-chris@chris-wilson.co.uk (cherry picked from commit 871dfbd67d4ecbcc83fc9e80a310ca9bf3c44c40) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I120c99bd5677159a0ee35aee130e36e4a7b3df58 Reviewed-on: https://chromium-review.googlesource.com/460785 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460785" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/85/460785/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I6fe0903dfa410febdc82d45e509e18cf80812f60" commit="d02ab935d8c55bc837177fcfab3666311722065d" commit_message="UPSTREAM: drm/i915: Convert open-coded use of vma_pages() If we want to know how many pages a VMA spans, we can use vma_pages() to find out. We have one such invocation inside our faulthandler, so convert it. (We have two other that want the size in bytes rather than pages, food for future thought.) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20161011090656.29554-1-chris@chris-wilson.co.uk Reviewed-by: Matthew Auld <matthew.auld@intel.com> (cherry picked from commit 908b1232252edf6c7e29800e091cfbbb9f5f3570) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I6fe0903dfa410febdc82d45e509e18cf80812f60 Reviewed-on: https://chromium-review.googlesource.com/536843 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="536843" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/536843/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ife1c4ae1de2b56422ab87682e4897dcd0525b339" commit="97336e8e1db32421400f0cc93667827c03ff88cf" commit_message="UPSTREAM: drm/i915/gen9: fix DDB partitioning for multi-screen cases With the previous code we were only recomputing the DDB partitioning for the CRTCs included in the atomic commit, so any other active CRTCs would end up having their DDB registers zeroed. In this patch we make sure that the computed state starts as a copy of the current partitioning, and then we only zero the DDBs that we're actually going to recompute. How to reproduce the bug: 1 - Enable the primary plane on pipe A 2 - Enable the primary plane on pipe B 3 - Enable the cursor or sprite plane on pipe A Step 3 will zero the DDB partitioning for pipe B since it's not included in the commit that enabled the cursor or sprite for pipe A. I expect this to fix many FIFO underrun problems on gen9+. v2: - Mention the cursor on the steps to reproduce the problem (Paulo). - Add Testcase tag provided by Maarten (Maarten). Testcase: kms_cursor_legacy.cursorA-vs-flipB-atomic-transitions Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96226 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96828 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97450 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97596 Bugzilla: https://www.phoronix.com/scan.php?page=news_item&px=Intel-Skylake-Multi-Screen-Woes Cc: stable@vger.kernel.org Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Lyude <cpaul@redhat.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475602652-17326-1-git-send-email-paulo.r.zanoni@intel.com (cherry picked from commit 5a920b85f2c6e3fd7d9dd9bb3f3345e9085e2360) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ife1c4ae1de2b56422ab87682e4897dcd0525b339 Reviewed-on: https://chromium-review.googlesource.com/460786 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460786" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/86/460786/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I2c5b135059fb8dc4209685d61ca2974934ff751a" commit="5c63ad855d94e2eaffd4f87fc4ae5d4dbe8309f1" commit_message="UPSTREAM: drm/i915: Stop the machine whilst capturing the GPU crash dump The error state is purposefully racy as we expect it to be called at any time and so have avoided any locking whilst capturing the crash dump. However, with multi-engine GPUs and multiple CPUs, those races can manifest into OOPSes as we attempt to chase dangling pointers freed on other CPUs. Under discussion are lots of ways to slow down normal operation in order to protect the post-mortem error capture, but what it we take the opposite approach and freeze the machine whilst the error capture runs (note the GPU may still running, but as long as we don't process any of the results the driver's bookkeeping will be static). Note that by of itself, this is not a complete fix. It also depends on the compiler barriers in list_add/list_del to prevent traversing the lists into the void. We also depend that we only require state from carefully controlled sources - i.e. all the state we require for post-mortem debugging should be reachable from the request itself so that we only have to worry about retrieving the request carefully. Once we have the request, we know that all pointers from it are intact. v2: Avoid drm_clflush_pages() inside stop_machine() as it may use stop_machine() itself for its wbinvd fallback. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161012090522.367-3-chris@chris-wilson.co.uk (cherry picked from commit 9f267eb8d2ea0a87f694da3f236067335e8cb7b9) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I2c5b135059fb8dc4209685d61ca2974934ff751a Reviewed-on: https://chromium-review.googlesource.com/460787 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460787" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/87/460787/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ifa96ebe6d92f04321ce2f6812335e1bbb7351e26" commit="5841c29f7b5453b3ded69e2716722ffd37c2ab98" commit_message="UPSTREAM: drm/i915: Always use the GTT for error capture Since the GTT provides universal access to any GPU page, we can use it to reduce our plethora of read methods to just one. It also has the important characteristic of being exactly what the GPU sees - if there are incoherency problems, seeing the batch as executed (rather than as trapped inside the cpu cache) is important. 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/20161012090522.367-4-chris@chris-wilson.co.uk (cherry picked from commit 95374d759ac795c33ad4fd6f684bc5a5e280e7a4) from drm-intel-next-2016-10-24 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ifa96ebe6d92f04321ce2f6812335e1bbb7351e26 Reviewed-on: https://chromium-review.googlesource.com/460788 Commit-Ready: Sean Paul <seanpaul@chromium.org> Tested-by: Casey G Bowman <casey.g.bowman@intel.com> Tested-by: Sean Paul <seanpaul@google.com> Reviewed-by: Sean Paul <seanpaul@google.com> " fail_count="0" gerrit_number="460788" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/88/460788/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I7695c21a0030a6428993ab615b3b170a170d2d60" commit="bcc62933939ff74ecb370f0c8e54f674dac67418" commit_message="UPSTREAM: google/fizz: Enable cr50 over i2c BUG=b:62456589, b:35775024 BRANCH=None TEST=Reboot and ensure verstage doesn't have any TPM errors CQ-DEPEND=CL:530185 Change-Id: I7695c21a0030a6428993ab615b3b170a170d2d60 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: db287aad2547d6bc4a710c8a511448b5ff5ebead Original-Change-Id: Icfde0f62bd058d960fcb0c6fc67f9d8f6b9462f5 Original-Signed-off-by: Shelley Chen <shchen@chromium.org> Original-Reviewed-on: https://review.coreboot.org/20133 Original-Reviewed-by: Furquan Shaikh <furquan@google.com> Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-on: https://chromium-review.googlesource.com/542382 Commit-Ready: Shelley Chen <shchen@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Shelley Chen <shchen@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="1" gerrit_number="542382" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/82/542382/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I4db8cdbf957a717335b8480f2b3545a18dc16bdc" commit="9bc02b921e4e261a1668e3018e563d8b37dceedf" commit_message="Revert "Fizz: USE flags: remove tpm2" This reverts commit 79a8fdf7d129c2d3552383d6258095cb0228310b. Reason for revert: Enabling cr50 on Fizz BUG=b:62456589 BRANCH=None TEST=emerge-fizz chromeos-bootimage and boot to kernel CQ-DEPEND=CL:530185, CL:542382, CL:*391888 Original change's description: > Fizz: USE flags: remove tpm2 > > Lets disable the tpm2 flag untill the tpm is actually ready: > > [ 249.142375] init: tpm_managerd main process (3280) killed by ABRT > signal > [ 249.151880] init: tpm_managerd main process ended, respawning > [ 249.488781] init: attestationd main process (3290) killed by ABRT > signal > [ 249.496934] init: attestationd main process ended, respawning > [ 253.042361] hwrng: no data available > [ 263.047817] hwrng: no data available > [ 273.052514] hwrng: no data available > [ 279.240614] init: tpm_managerd main process (3511) killed by ABRT > signal > [ 279.250467] init: tpm_managerd main process ended, respawning > [ 279.627193] init: attestationd main process (3523) killed by ABRT > signal > [ 279.636207] init: attestationd main process ended, respawning > [ 283.057529] hwrng: no data available > [ 283.491512] init: debugd main process (683) killed by TERM signal > [ 285.759081] init: console-ttyS0 main process (460) killed by TERM > signal > [ 285.768791] init: powerd main process (627) killed by TERM signal > [ 285.776400] init: crash-sender main process (882) killed by TERM > signal > > BUG=b:37485140 > TEST=Boots > > Change-Id: I5884f81db8a397f2ce9910652c05c70b5ab866c1 > Reviewed-on: https://chromium-review.googlesource.com/491648 > Commit-Ready: Rajat Jain <rajatja@chromium.org> > Tested-by: Rajat Jain <rajatja@chromium.org> > Reviewed-by: Furquan Shaikh <furquan@chromium.org> > Reviewed-by: Rajat Jain <rajatja@chromium.org> > Reviewed-by: YH Lin <yueherngl@chromium.org> Bug: b:37485140 Change-Id: I4db8cdbf957a717335b8480f2b3545a18dc16bdc Reviewed-on: https://chromium-review.googlesource.com/543536 Commit-Ready: Shelley Chen <shchen@chromium.org> Tested-by: Shelley Chen <shchen@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Rajat Jain <rajatja@chromium.org> Reviewed-by: YH Lin <yueherngl@chromium.org> " fail_count="0" gerrit_number="543536" owner_email="shchen@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/36/543536/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iefe3de773b7796b131067aaaafcce752a39e31bf" commit="0f9994d72560551d08e57f62400760decf834e41" commit_message="fizz: Enable cr50 over i2c BUG=b:62456589, b:35775024 BRANCH=None TEST=reboot and make sure can boot to kernel CQ-DEPEND=CL:542382, CL:543536, CL:*391888 Change-Id: Iefe3de773b7796b131067aaaafcce752a39e31bf Signed-off-by: Shelley Chen <shchen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/530185 Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="0" gerrit_number="530185" owner_email="shchen@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/depthcharge" project_url="https://chromium-review.googlesource.com/chromiumos/platform/depthcharge" ref="refs/changes/85/530185/6" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ife646828b0ea92a4f0f83e26289e7794247de1e7" commit="be42a746fa680801c1b04c662dc236b36b1096b0" commit_message="Add sentry and wizpig paladins BUG=chromium:730076 TEST=None Change-Id: Ife646828b0ea92a4f0f83e26289e7794247de1e7 Reviewed-on: https://chromium-review.googlesource.com/537893 Commit-Ready: Bernie Thompson <bhthompson@chromium.org> Tested-by: Bernie Thompson <bhthompson@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="0" gerrit_number="537893" owner_email="bhthompson@chromium.org" pass_count="0" patch_number="4" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/93/537893/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I275a6edcf52e9a0627723d800d375c2343ebac29" commit="aeaffef24552ba5586446b0fb0105e45f91405ce" commit_message="Add bob and hana paladin builders BUG=chromium:730076 TEST=None Change-Id: I275a6edcf52e9a0627723d800d375c2343ebac29 Reviewed-on: https://chromium-review.googlesource.com/540669 Commit-Ready: Bernie Thompson <bhthompson@chromium.org> Tested-by: Bernie Thompson <bhthompson@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="0" gerrit_number="540669" owner_email="bhthompson@chromium.org" pass_count="0" patch_number="2" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/69/540669/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I3f51230e2daac7bd77c4b96780268944b10c7a23" commit="573de23fdcb31e5fbdcd4f5f1f4d57b775b2ff4f" commit_message="Add touch_firmware_calibration user & group This CL add touch_firmware_calibration user & group to run override_max_pressure. BUG=chromium:717193 TEST=build image and test CQ-DEPEND=CL:542475 Change-Id: I3f51230e2daac7bd77c4b96780268944b10c7a23 Reviewed-on: https://chromium-review.googlesource.com/542495 Commit-Ready: Jingkui Wang <jkwang@google.com> Tested-by: Jingkui Wang <jkwang@google.com> Reviewed-by: Charlie Mooney <charliemooney@chromium.org> " fail_count="0" gerrit_number="542495" owner_email="jkwang@google.com" pass_count="0" patch_number="3" project="chromiumos/overlays/eclass-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/eclass-overlay" ref="refs/changes/95/542495/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I947a743a67ac26c9b8d792041606513089183b07" commit="90e5ba94ef66fe9ae31af0a5d7f91770d223affa" commit_message="Add touch_firmware_calibration user/group to AccountsBaseline touch_firmware_calibration is new user for running override_max_pressure on devices that need to override evdev absinfo. This CL adds the user and group to the test. BUG=chromium:717193 TEST=test_that -b pbody ${DUT_IP} security_AccountsBaseline CQ-DEPEND=CL:542495 Change-Id: I947a743a67ac26c9b8d792041606513089183b07 Reviewed-on: https://chromium-review.googlesource.com/542475 Commit-Ready: Jingkui Wang <jkwang@google.com> Tested-by: Jingkui Wang <jkwang@google.com> Reviewed-by: Charlie Mooney <charliemooney@chromium.org> " fail_count="0" gerrit_number="542475" owner_email="jkwang@google.com" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/75/542475/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ide765316291d0bcbd9d123e65d0e14500a9a12bc" commit="e40fc08752c2c8f29514df0392648162e72d5f4c" commit_message="swap.sh: fix uninitialized variable bug This prevented parameters from being correctly passed to the kernel. I am not sure how I missed it when testing because it affects all parameters. Also piggy-backing improved usage message and improved 'tr' usage. BUG=none TEST=verified that sysfs/procfs parameters are initialized correctly now Change-Id: Ide765316291d0bcbd9d123e65d0e14500a9a12bc Reviewed-on: https://chromium-review.googlesource.com/544097 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="544097" owner_email="semenzato@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/97/544097/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I37761589c0a2edb876990c1440aa8d8ee06a672f" commit="bd84be7605969397f031f302c6332c9ec4739b6f" commit_message="net-print/cups: Fix seccomp policy for different archs newfstatat does not exist on aarch64/arm which causes seccomp policy fail to load. On hana(aarch64), it also calls lstat64 BUG=chromium:734843 TEST=None Change-Id: I37761589c0a2edb876990c1440aa8d8ee06a672f Reviewed-on: https://chromium-review.googlesource.com/540670 Commit-Ready: Xiaochu Liu <xiaochu@chromium.org> Tested-by: Xiaochu Liu <xiaochu@chromium.org> Reviewed-by: Sean Kau <skau@chromium.org> " fail_count="0" gerrit_number="540670" owner_email="xiaochu@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/70/540670/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I23172388674e1f3a4c2489e139dd197a84029f54" commit="2ccf5e168f490214e7f58ab7528ea16be2b2d54b" commit_message="g: cr50: update INFO1 mask when corrupting the second image The INFO1 mask field contents serves as input for the rollback protection mechanism, when the RO decides if an RW is allowed to run on the device. The existing code updates INFO1 mask to match the lowest rollback priority of the two images (RW_A and RW_B) present on the device. INFO1 mask should be also updated when the current image is endorsed by the host. In this case the alternative RW is destroyed, so the INFO1 mask could be set based solely on the currently running image. This patch refactors the code to allow setting INFO1 mask based on one or both RW headers' contents. BRANCH=cr50 BUG=b:62138152 TEST=verified that "normal" INFO1 mask updates still work as before, the mask is modified to match the image with the lowest rollback priority. Also verified that when the VENDOR_CC_INVALIDATE_INACTIVE_RW command is received the INFO1 mask is updated based on the currently running image. Change-Id: I23172388674e1f3a4c2489e139dd197a84029f54 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/541738 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Mary Ruthven <mruthven@chromium.org> " fail_count="0" gerrit_number="541738" owner_email="vbendeb@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/38/541738/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic48c99aae1d741cbfe282ab46015df353eddcdef" commit="8aac1f0967dafb22dbf4034fcca4020a39140f8d" commit_message="[autotest] Remove unused site code from monitor_db BUG=chromium:672727 TEST=None Change-Id: Ic48c99aae1d741cbfe282ab46015df353eddcdef Reviewed-on: https://chromium-review.googlesource.com/438786 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> " fail_count="0" gerrit_number="438786" owner_email="ayatane@chromium.org" pass_count="0" patch_number="39" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/86/438786/39" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib43552651b7b1bae594254253b0d623f5e72f8a5" commit="ea9871e66dbf430f1a7ee713da961751adb217b4" commit_message="autoupdate: Install stateful_update from the right location stateful_update can be locally stored at 2 locations: /usr/sbin/stateful_update installed by package chromeos-base/devserver, or by python modules: either during unit test or by build_externals.py on the labserver. BUG=chromium:689105 TEST=Unit test. Test stateful_update is executable. Check powerwash machines are updating properly. Change-Id: Ib43552651b7b1bae594254253b0d623f5e72f8a5 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/527422 Reviewed-by: Richard Barnette <jrbarnette@google.com> " fail_count="0" gerrit_number="527422" owner_email="gwendal@chromium.org" pass_count="0" patch_number="9" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/22/527422/9" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I97f03a875fb2da39636c1b815cb7fe88bfec6ae1" commit="06635334c95848ff8e0ae3c887e85eb516feb476" commit_message="system_api: Remove kResolveNetworkProxy constant. This is no longer used. BUG=chromium:703217 TEST=none Change-Id: I97f03a875fb2da39636c1b815cb7fe88bfec6ae1 Reviewed-on: https://chromium-review.googlesource.com/535915 Commit-Ready: Dan Erat <derat@chromium.org> Tested-by: Dan Erat <derat@chromium.org> Reviewed-by: Justin TerAvest <teravest@chromium.org> " fail_count="0" gerrit_number="535915" owner_email="derat@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/system_api" project_url="https://chromium-review.googlesource.com/chromiumos/platform/system_api" ref="refs/changes/15/535915/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I201af66a1d8dd250b05f4f872ea133ada5922475" commit="0ba7f44082b8eb3582b577f546bedb4045073cfc" commit_message="Move BuildFailureMessage to build_failure_message Create a separate module to place BuildFailureMessage to avoid circular dependency among failure_message_lib, failures_lib and portage_util. BUG=chromium:694730 TEST=unit_tests Change-Id: I201af66a1d8dd250b05f4f872ea133ada5922475 Reviewed-on: https://chromium-review.googlesource.com/540676 Commit-Ready: Ningning Xia <nxia@chromium.org> Tested-by: Ningning Xia <nxia@chromium.org> Reviewed-by: Aviv Keshet <akeshet@chromium.org> " fail_count="0" gerrit_number="540676" owner_email="nxia@chromium.org" pass_count="0" patch_number="1" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/76/540676/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I27d61c78666208abca710f4ee41f711a61051607" commit="dee8cc1753c01ae8908ca0d24806128662d485aa" commit_message="Samba: Apply patch for CVE-2017-9461 See https://bugzilla.samba.org/show_bug.cgi?id=12572 and https://git.samba.org/?p=samba.git;a=commit;h=10c3e3923022485c720f322ca4f0aca5d7501310 for details. The issue probably does not cause any harm to Chrome OS yet since it is a Samba server bug and authpolicy, being the only Samba user so far, only acts as a client. BUG=chromium:734016 TEST=emerge-amd64-generic samba Change-Id: I27d61c78666208abca710f4ee41f711a61051607 Reviewed-on: https://chromium-review.googlesource.com/540739 Commit-Ready: Lutz Justen <ljusten@chromium.org> Tested-by: Lutz Justen <ljusten@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org> " fail_count="0" gerrit_number="540739" owner_email="ljusten@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/39/540739/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iff55dc53d28b5ea423b4bbc3fa888ed3c8ec4b85" commit="7032609e51aedf3b548caa22b8305aa97f90b570" commit_message="dynamic_suite: don't use deprecated functions in unit test These were generating warnings. We should probably "do the right thing" in our examples, if we expect anyone else to get it right. BUG=chromium:734662 TEST=./suite_unittest.py Change-Id: Iff55dc53d28b5ea423b4bbc3fa888ed3c8ec4b85 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/540752 Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="0" gerrit_number="540752" owner_email="briannorris@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/52/540752/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I61913464344412d2c4a86afa58fcabcadf3de945" commit="2d9db3f6950f82c85792f9d126d298e7c01aa080" commit_message="system_api: Add powerd IgnoreNextPowerButtonPress method Add a constant for a new IgnoreNextPowerButtonPress powerd D-Bus method used by the integrated second-factor authentication daemon. BUG=b:35545754 TEST=emerge-eve system_api power_manager Change-Id: I61913464344412d2c4a86afa58fcabcadf3de945 Reviewed-on: https://chromium-review.googlesource.com/541223 Commit-Ready: Vincent Palatin <vpalatin@chromium.org> Tested-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="1" gerrit_number="541223" owner_email="vpalatin@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/system_api" project_url="https://chromium-review.googlesource.com/chromiumos/platform/system_api" ref="refs/changes/23/541223/2" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I42a620d783d77ba318dcbe7dc12545bb32edca9e" commit="22cca41d14ef61d887cbe09519b52c92478adbf9" commit_message="Add plugdev group for openocd-0.10.0 This patch adds plugdev group, which is required by openocd-0.10.0. BUG=chromium:735090 TEST=emerge-fizz openocd Change-Id: I42a620d783d77ba318dcbe7dc12545bb32edca9e Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/541939 " fail_count="0" gerrit_number="541939" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/eclass-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/eclass-overlay" ref="refs/changes/39/541939/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ie3084d7ed20ac6f1530fdaf3e1f449d1daa2a31f" commit="6b77f15bb4ea5793e5f4273bce819bf72e3de587" commit_message="autotest: Extract master ssh connection handling into a class. This is preparation to share the master ssh connection across Host instances. BUG=chromium:726481 TEST=Ran bots. Change-Id: Ie3084d7ed20ac6f1530fdaf3e1f449d1daa2a31f Reviewed-on: https://chromium-review.googlesource.com/542172 Commit-Ready: Hidehiko Abe <hidehiko@chromium.org> Tested-by: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Aviv Keshet <akeshet@chromium.org> " fail_count="0" gerrit_number="542172" owner_email="hidehiko@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/72/542172/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I43d8c7f5a30cc0da983fef5c2784e4bac7ced5f9" commit="7ec28a9baf1838ac388ba5a0fd17ff2b2459c6f1" commit_message="security_AccountsBaseline: Check new users. For users not in the baseline, the user ID should match the group ID, and the user's home directory and shell should be invalid. BUG=chromium:709990 TEST=Passes on kevin. TEST=Add daemon user, test passes. TEST=Add user with non-matching GID, test fails. TEST=Add user with valid home dir, test fails. TEST=Add user with valid shell, test fails. Change-Id: I43d8c7f5a30cc0da983fef5c2784e4bac7ced5f9 Reviewed-on: https://chromium-review.googlesource.com/543615 Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org> Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="543615" owner_email="jorgelo@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/15/543615/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I73b6212ff00ed0d5ffcff2254cb8cd3bb5e4190e" commit="9547b502adb2819470996c1ba104835768b420d6" commit_message="[Autotest] Removing platform_input suite Changing all platform_Input* tests to run on bvt-perbuild and removing platform_input suite. BUG=None TEST=None Change-Id: I73b6212ff00ed0d5ffcff2254cb8cd3bb5e4190e Reviewed-on: https://chromium-review.googlesource.com/543680 Commit-Ready: Ruchi Jahagirdar <rjahagir@chromium.org> Tested-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Kalin Stoyanov <kalin@chromium.org> " fail_count="0" gerrit_number="543680" owner_email="rjahagir@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/80/543680/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Idb216157bf6073c883b2a30715f78993bd80c9e6" commit="acd7d1d312792f113a0230d10fb1f1ab964a3805" commit_message="power: suspend_stress_test: Don't check s0ix if driver suspend fails In the case where the system fails to suspend due to a driver failure, the system will not even try to enter s0ix, and then s0ix counter will not increment, as expected. In such situation, however, we should not categorise this as s0ix failure, because the system actually never tried to enter s0ix. So we should not display "s0ix counters did not increment..." and should not increment s0ix_errors. Thus change the code so that s0ix counters are checked only if the system actually did try to enter s0ix. BUG=b:36630881 TEST=Try S0ix test with driver failures on Soraka Change-Id: Idb216157bf6073c883b2a30715f78993bd80c9e6 Reviewed-on: https://chromium-review.googlesource.com/544016 Commit-Ready: Rajat Jain <rajatja@chromium.org> Tested-by: Rajat Jain <rajatja@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="544016" owner_email="rajatja@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/16/544016/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I7b8400db64594f4d1268a62838ac379e713738c1" commit="bbefed7e06b3e884be5ffacf2e73f9919477ac41" commit_message="Create a new module for lxc code. Create a new python module for lxc code. Move lxc.py and related code into that module. Script-style functionality in site_utils/lxc.py and lxc_cleanup.py was left as-is. BUG=chromium:720219 TEST=sudo python site_utils/lxc_functional_test.py -v 2017-06-15 15:29:52,700 All tests passed. TEST=Install autotest-server code onto moblab, run a test. Test runs successfully. Change-Id: I7b8400db64594f4d1268a62838ac379e713738c1 Reviewed-on: https://chromium-review.googlesource.com/538127 Commit-Ready: Ben Kwa <kenobi@chromium.org> Tested-by: Ben Kwa <kenobi@chromium.org> Reviewed-by: Ben Kwa <kenobi@chromium.org> " fail_count="0" gerrit_number="538127" owner_email="kenobi@chromium.org" pass_count="0" patch_number="8" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/27/538127/8" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I6ff976c839efcd23ae26cef3ee428e7ae02e68f8" commit="91f1b24478f0803f20db7cbad5fbdb0865a614b1" commit_message="UPSTREAM: cr50: process uninitialized values gracefully The vboot code tries reading rollback protection indices from the TPM, and if the attempt to read returns TPM_E_BADINDEX, it decides that the TPM has not yet been initialized for the Chromebook use, and needs to be taken through the factory initialization sequence. TPM_E_BADINDEX is an internal representation of the TPM error 0x28b, generated on attempts to read a non existing NVMEM space. If the space exists, but has never been written the TPM returns error 0x14a. This condition (the space exists but not written) could happen if the previous factory initialization attempt was interrupted right after the space was created. Let's map this error to the same internal representation (TPM_E_BADINDEX) so that the Chrome OS device could recover when this condition occurs. BRANCH=reef, gru BUG=b:37443842 TEST=verified that the Pyro device stuck in TPM error state recovered when this patch was applied. Change-Id: I6ff976c839efcd23ae26cef3ee428e7ae02e68f8 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://review.coreboot.org/20299 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> (cherry picked from commit 08f93599a9728682783505fe7e6fa3e3b025a497) Reviewed-on: https://chromium-review.googlesource.com/543777 " fail_count="0" gerrit_number="543777" owner_email="vbendeb@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/77/543777/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.10" change_id="I7feb5d461a6af3755955401314bd9c37e0988d55" commit="90cb980c7033d42b5613191d8228874e6b16416c" commit_message="UPSTREAM: mm: fix new crash in unmapped_area_topdown() Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of mmap testing. That's the VM_BUG_ON(gap_end < gap_start) at the end of unmapped_area_topdown(). Linus points out how MAP_FIXED (which does not have to respect our stack guard gap intentions) could result in gap_end below gap_start there. Fix that, and the similar case in its alternative, unmapped_area(). BUG=chromium:726072, chromium:724093 TEST=Build and run Change-Id: I7feb5d461a6af3755955401314bd9c37e0988d55 Cc: stable@vger.kernel.org Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas") Reported-by: Dave Jones <davej@codemonkey.org.uk> Debugged-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Guenter Roeck <groeck@chromium.org> (cherry picked from commit f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89) Reviewed-on: https://chromium-review.googlesource.com/543669 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="543669" owner_email="groeck@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/543669/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I69a73165ecea2bba5e6ba5849681cf22869dfe97" commit="9ba69d07510a084bc0dc13ecb0cd2386c5cd348c" commit_message="cros-board.eclass: Add zoombini board. BUG=b:62462260 TEST=none Change-Id: I69a73165ecea2bba5e6ba5849681cf22869dfe97 Reviewed-on: https://chromium-review.googlesource.com/541960 Commit-Ready: Patrick Berny <pberny@chromium.org> Tested-by: Patrick Berny <pberny@chromium.org> Reviewed-by: YH Lin <yueherngl@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="0" gerrit_number="541960" owner_email="pberny@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/60/541960/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I7feb5d461a6af3755955401314bd9c37e0988d55" commit="c6cdda689127da71a0b96451e276db7a2d8318da" commit_message="UPSTREAM: mm: fix new crash in unmapped_area_topdown() Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of mmap testing. That's the VM_BUG_ON(gap_end < gap_start) at the end of unmapped_area_topdown(). Linus points out how MAP_FIXED (which does not have to respect our stack guard gap intentions) could result in gap_end below gap_start there. Fix that, and the similar case in its alternative, unmapped_area(). BUG=chromium:726072, chromium:724093 TEST=Build and run Change-Id: I7feb5d461a6af3755955401314bd9c37e0988d55 Cc: stable@vger.kernel.org Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas") Reported-by: Dave Jones <davej@codemonkey.org.uk> Debugged-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Guenter Roeck <groeck@chromium.org> (cherry picked from commit f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89) Reviewed-on: https://chromium-review.googlesource.com/543442 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="543442" owner_email="groeck@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/543442/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.14" change_id="I7feb5d461a6af3755955401314bd9c37e0988d55" commit="2e80fdff26c6796b732a60df1402abf2ef7970b7" commit_message="UPSTREAM: mm: fix new crash in unmapped_area_topdown() Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of mmap testing. That's the VM_BUG_ON(gap_end < gap_start) at the end of unmapped_area_topdown(). Linus points out how MAP_FIXED (which does not have to respect our stack guard gap intentions) could result in gap_end below gap_start there. Fix that, and the similar case in its alternative, unmapped_area(). BUG=chromium:726072, chromium:724093 TEST=Build and run Change-Id: I7feb5d461a6af3755955401314bd9c37e0988d55 Cc: stable@vger.kernel.org Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas") Reported-by: Dave Jones <davej@codemonkey.org.uk> Debugged-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Guenter Roeck <groeck@chromium.org> (cherry picked from commit f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89) Reviewed-on: https://chromium-review.googlesource.com/543668 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="543668" owner_email="groeck@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/543668/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I16763a1e4e02bc9f0652d2bfa2efa72140761d2f" commit="d1f25a7860d3f26c2ecc30855841280f97f2d57e" commit_message="[Autotest] Remove ChromeVox Indicator check Indicators don't work like they used to, which broke the indicator check. Remove it to prevent this test from failing. Since we no longer need to have focus on a page, remove the test page. TEST=ran it BUG=chromium:735577 Change-Id: I16763a1e4e02bc9f0652d2bfa2efa72140761d2f Reviewed-on: https://chromium-review.googlesource.com/543565 Commit-Ready: Katherine Threlkeld <kathrelkeld@chromium.org> Tested-by: Katherine Threlkeld <kathrelkeld@chromium.org> Reviewed-by: Ruchi Jahagirdar <rjahagir@chromium.org> " fail_count="0" gerrit_number="543565" owner_email="kathrelkeld@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/65/543565/2" remote="cros" total_fail_count="0"/><lkgm version="9673.0.0-rc4"/></manifest> |
