| <?xml version="1.0" encoding="utf-8"?><manifest revision="02329453a3e055d76b039e8e8c1cb0264955e077"> |
| <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"/> |
| <remote fetch="https://weave.googlesource.com" name="weave" review="https://weave-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="275101a142d7d9c195c9c08a5af40ef9d070edd7" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="1c8c1f93cff10c5a9b6fe396b6d3b739c2380792" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="7b88bc885b9d8dc551beab840b853a79fa06494d" 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="685fba094dc8bcc556ff23e4330811d96bd17599" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="9c38f1737782f93f9ef2a8d154830a4b72203635" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="3d8e6ae763671ec2e7160e0cb93cf358865f7851" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="d67a946fdc4776afe19d07c21289c03caa0b0c5d" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="4d34c18e5ce29d138c7946cc817dee8b3fce7cf0" 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="5162fccd14657dfbd9c50cc1057d92368a4659b8" 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/third_party/hwcplus" remote="chromium" revision="264120496730522ef3e5cc60b80a3953af1ac2cc" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="4049359ebe55663d6797038794e0e01be20c5050" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="1c822ade1f731ec35a3d2d3be8805f773df22c4c"/> |
| <project groups="minilayout,buildtools,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="13bdf0cb02a068bc165bd8822bc44f80d6e9d495" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/docs" path="docs" revision="c10be9e419b9eaa5b2a620538af2536d84e5c75e" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="e6f98087c8bd9420bebf4e0f28cc52cbca61fa20" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="f61a998565223c4cf6c7e1b43f2e288d94a8f08f" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="d1b1621d2d75b642639ab3ff956b85da451573f8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="15ace8f6ac905b975ccc96e257f09ffb761aae47" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="170a5ad59ec88fdfc3e986915bd28b38e6b93517" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="95c8279c122d15b271323e9e7266fde468823939" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="b90d9c99ffad28b4f6ad262f04c2bbc733271e36" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="97ff6b0103f9fc59c2fe28110065ab3aa3db1ae7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="4de0d7b7810e29a776f49702119c1e48cedb8a31" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="15a7dd9e43c7d67c57687ee1ef015d17b33c010b" 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="b178478ad8dc99ec4a5d0f39cbed80c5a86c43c5" 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="bff0490b31dbe0c5aef32e794060648eef2e56fa" 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="78c97d8495a3ff08bc634acee5bf5ae4432288f6" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="c3d5d9177b22f784b3a23309f07dc6cbd37e901b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="99b035ff0a65dec419fe0e32cbd37d2a5ad6d142" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="447ad9d610433e6d34e4db04057357ef9f73a0f2" 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="9a1cf162a93aa9bd192bcb157e261a58efe35e56" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="876157085e0ce53de870f23993a6badc5683f16d" 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="72f74c4cd9af99add787d7241c87e79215e64efa" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="262f49ab9054bd5363569eb7e115d9e1d7e0b719" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="ee3a125c137a057dfc31ef3521a29c7add09ca84" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="3ccfd38dce51bdcf28f0c1c5beec0a08a128bec3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5a656849c7d2b0d0ddbe0ac6d300c1e2fada0bb4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="cc1deb44521d41125f5d617940a654c58c794325" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="eac26041fd4d1d5c0328e529696ca82d353cb632" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="a0f0b6ba3da4e4bcf9ffd277e903b19c75501fca" 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="9e21dc27a8cdc1409251fcd5e90e23f313100b59" 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="2a30f8a988418fa09cb8748585e397ca5b856f91" 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="1aeb7578dfcf0390254a6d826f2be9ae601a8b0b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="e2da245689e83bc4eb7abb4cd73e06124618550b" 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="8da2c778eafaa0eb961308fcb5426dde45b08c5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="3703e8a79698c78864d3e5610341c64338f4600a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="5a230ee17756dc43ff732932dcb52899c06a4d09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="8a239050035017d648fffcc674eb4b1c50f8b6d6" 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="12833c807a65117b7c4d27bb4471309f815bab39" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="75d8f1bfbbb3dfc870fcbc22f53cd16b66ac7f23" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="d2e7d94a834b54511ca57e6359839f9ca86d6d04" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="50d1282e856953616d3d3e7be31aa0f9fefd0f9a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="510ca879933b137d8bc841fda6911a5e290f51c9" 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="f7a00485784f1d159ae86492d70bd599e4389b2a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="f89306fc25651b2f7bfbcb56e9ff8be7e03b5165" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="f9d41b3c36126579c60665c847834b624bf7b174" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="77fa3d86f29287aa87004c9e1b9abf543f08cd3b" 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="a8de89c97461b7cc13a596db8771c30843b06405" upstream="refs/heads/upstream_mirror/master"> |
| <annotation name="branch-mode" value="create"/> |
| </project> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="e0f32d96db2abf92548b8962ca8a0da7916e87d1" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="637d22c759498c5c34c20f93f9f22a66363dc819" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="6835f09b9097a9613817221bfe3d3bfe4de65c47" upstream="refs/heads/chromeos-5.41"/> |
| <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="926d53ac4571a91d72c1879fcc4e2840808357c7" 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 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="caf3f93f753df5ff089df615e465d46122bee123" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="d0642be32d99400f808ea6bc4d71c1261dd403a1" 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="c688d95950f714706c1893aa7caf1d529feeb9cc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="7e62cc7051730828a9d6cf86d19cdb0c6e0ed620" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hwcplus-drm" path="src/third_party/hwcplus-drm" revision="7376a8da1c961115a61d7a3cb23bb13e4153583d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="e1b19fc4a20de4f7f021bfbf71260f2a0b48b9ea" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="6aa9821937eed30af00f04f10932909bdb47f999" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="16fb19ea1fb63b98868c5e5125974f3dfa0e3673" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="2961c26bc528985ab07912a8183301453bcdc751" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="120cf8eefd7dbad83dda1376162168bd56988167" 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="05661cbc54ade1371995b65348ed524d25bfc034" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="0c7748b56694e9b00537f27bbe9edb11c78ce08f" upstream="refs/heads/chromeos-2.4.70"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="afc1b877083133dbb52958d1a9e1b621761c06ab" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="064b61254f513fe6d2c7f3ccbb63c91da0fce61b" 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="3aaa522989516d3ab6b09c7be87f37f82ef82547" 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="2b9ed2c6be718b42ec633887938f132725927b9d" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="9baf1ff8fc06d8c986e55465f77427d416ecd710" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/> |
| <project name="chromiumos/third_party/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="382aba7033803c84057b015c74d861d5907e7784" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ply-image" path="src/third_party/ply-image" revision="6cf4e4cd968bb72ade54e423e2b97eb3a80c6de9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="5d7d7ff513315abd103d0c95e92ae646c1a7688c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="78a898a0b196b4b683a08dfa34128e39bad9c340" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="86fe1ed1707823392bdac5d5ffd227707104fea3" 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="1a68fe6fa860f563e8b45e3826110ceec75d61a8" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="71d4fee1dc6db9bd22f6866571895b753f222ff5" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="bcf721d62d6a4c4c162c63714371fa4349df53bc" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="de86b28517076f30dbef77443512667c15b634cb" 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="f0e8f0727e2358d659e5c6f4b434196f2f5df8b2" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="218dfb0239d17e53cf5ffea4e5e3699312d4318e" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="9575f95555d46b57a7d3d01564a7bbbcf326f222" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="8d35c2ec75c854b746489e583bef716eb278b422" upstream="refs/heads/master"/> |
| <project name="platform/system/core" path="src/platform/core" remote="aosp" revision="ac13718d0ae648522050bd1db6e57d1611112f46" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="9bf6cbf6dd88777719c5757922aff0190ec46539" 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" remote="weave" revision="8b213b097455da06d13c19f48ecfce235e2b1faa" upstream="refs/heads/refactor-01-2017"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.18" change_id="I629b891fb514d66ef55dd18bed277750ecdfca9c" commit="6506c35481f33d6ab7772a0d32ec6fd500c3f3be" commit_message="Reland "BACKPORT: drm: Make the connector dpms callback return a value, v2." This is required to properly handle failing dpms calls. When making a wait in i915 interruptible, I've noticed that the dpms sequence could fail with -ERESTARTSYS because it was waiting interruptibly for flips. So from now on allow drivers to fail in their connector dpms callback. Encoder and crtc dpms callbacks are unaffected. Changes since v1: - Update kerneldoc for the drm helper functions. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> [danvet: Resolve conflicts due to different merge order.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 9a69a9ac20f7f3435dd18019f902351c61a9ad1d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Removed drivers/gpu/drm/radeon/radeon_dp_mst.c Did not apply the patch on drivers/gpu/drm/tegra/dsi.c Did not apply the patch on drivers/gpu/drm/tegra/sor.c Change-Id: I629b891fb514d66ef55dd18bed277750ecdfca9c Reviewed-on: https://chromium-review.googlesource.com/334057 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408824 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408824" owner_email="matthew.s.atwood@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/24/408824/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I9bda39b127bf147acfd975fc14ce989437b1efe8" commit="8d94c5c91b96b554f6a86de821c446a6a5c24617" commit_message="Reland "BACKPORT: drm/i915: Validate the state after an atomic modeset only, and pass the state." First step in removing dpms and validating atomic state. There can still be a mismatch in the connector state because the dpms callbacks are still used, but this can not happen immediately after a modeset. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ee165b1a6e0269e5badde679f72fe39d3d15a7d4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in drivers/gpu/drm/i915/intel_drv.h Change-Id: I9bda39b127bf147acfd975fc14ce989437b1efe8 Reviewed-on: https://chromium-review.googlesource.com/334058 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408825 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408825" owner_email="matthew.s.atwood@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/25/408825/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I40c672769dad38475dfadf46f5d108cde432603c" commit="22b79ff255852df2bf452df390d157b55617a12b" commit_message="Reland "UPSTREAM: drm/i915: Remove some unneeded checks from check_crtc_state." This is handled by the atomic core now, no need to check this for ourself. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7b89b8de4e90d3c08f845e2b559929c8f77981ae) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I40c672769dad38475dfadf46f5d108cde432603c Reviewed-on: https://chromium-review.googlesource.com/334039 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408826 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408826" owner_email="matthew.s.atwood@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/26/408826/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I7b2e86113b0dab551a5526f1c7cdb66e1016bf8e" commit="4be8138f5d45f4767775c9e0cd0a175234fed1bc" commit_message="Reland "UPSTREAM: drm/i915: Remove connectors_active from state checking." Connectors are updated atomically now, so the only interaction with the encoder is through base.crtc. If it's NULL the encoder's not part of any crtc, and if it's not NULL then active should be equal to crtc_state->active. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7c60d1984afa482f0648d963206124df6dca325e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I7b2e86113b0dab551a5526f1c7cdb66e1016bf8e Reviewed-on: https://chromium-review.googlesource.com/334038 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408827 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408827" owner_email="matthew.s.atwood@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/27/408827/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ie7e0d20e6b22c56a7ef4045f0d56a3c5a07261d6" commit="fdb5e2d381106759d17186a6a1cf8b65a36d513e" commit_message="Reland "UPSTREAM: drm/i915: Make crtc checking use the atomic state, v2." Instead of allocating pipe_config on the stack use the old crtc_state, it's only going to freed from this point on. All crtc' are now only checked once during modeset, because false positives can happen with encoders after dpms changes and to limit the amount of errors for 1 failure. Changes since v1: - crtc_state -> old_crtc_state - state -> old_state Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 4d20cd860bbe908ef62aa4673eeac8f8f2c43735) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ie7e0d20e6b22c56a7ef4045f0d56a3c5a07261d6 Reviewed-on: https://chromium-review.googlesource.com/334050 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408828 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408828" owner_email="matthew.s.atwood@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/28/408828/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="If1dbb7471fcc329b3bd72fb49f8e14f415e2645b" commit="bba5f1919fa730a95e85bd33b6760dd74f082d51" commit_message="Reland "UPSTREAM: drm/i915: Also call frontbuffer flip when disabling planes." We also need to call the frontbuffer flip to trigger proper invalidations when disabling planes. Otherwise we will miss screen updates when disabling sprites or cursor. On core platforms where HW tracking also works, this issue is totally masked because HW tracking triggers PSR exit however on VLV/CHV that has only SW tracking we miss screen updates when disabling planes. It was caught with kms_psr_sink_crc sprite_plane_onoff and cursor_plane_onoff subtests running on VLV/CHV. This is probably a regression since I can also get this with the manual test case, but with so many changes on atomic modeset I couldn't track exactly when this was introduced. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 8be6ca8537e1230da8e92c753df4125151a3f6b1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If1dbb7471fcc329b3bd72fb49f8e14f415e2645b Reviewed-on: https://chromium-review.googlesource.com/334080 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408829 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408829" owner_email="matthew.s.atwood@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/29/408829/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I2737b7720b76b4833a210a70b081e0ef5a05c42b" commit="c74918a2c5506d953ffb97a2fbbc4e9ad24c8d12" commit_message="Reland "BACKPORT: drm/i915: Future proof panel fitter." This is another case where we can consider the default is the newest available and not actually a missed case. No functional change. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 1c132b44f0eabaaf801e79a3e4b98770431a4274) Conflicts: Minor conflict in haswell_get_pipe_config drivers/gpu/drm/i915/intel_display.c Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I2737b7720b76b4833a210a70b081e0ef5a05c42b Reviewed-on: https://chromium-review.googlesource.com/334052 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408830 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408830" owner_email="matthew.s.atwood@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/30/408830/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="If4a6cd9f4093bc32791356f8463fd39173d8e60c" commit="0c037f2285eb31202c7a7f39cc2eb1afe7d19827" commit_message="Reland "UPSTREAM: drm/i915: Dump pfit state as hex" The pfit state is stored as register values, so dump them as hex instead of decimal to make some sense of the error messages. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 333b8ca8cfcafc8c556d4333fe660283fea691d4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If4a6cd9f4093bc32791356f8463fd39173d8e60c Reviewed-on: https://chromium-review.googlesource.com/334051 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408831 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408831" owner_email="matthew.s.atwood@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/31/408831/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I20284585412fc29eebe68ca35142c047654bdae4" commit="94eab4192284d94a7fbb04d111704abbfff407d4" commit_message="Reland "BACKPORT: drm/atomic: Make prepare_fb/cleanup_fb only take state, v3." This removes the need to separately track fb changes i915. That will be done as a separate commit, however. Changes since v1: - Add dri-devel to cc. - Fix a check in intel's prepare and cleanup fb to take rotation into account. Changes since v2: - Split out i915 changes to a separate commit. Cc: dri-devel@lists.freedesktop.org Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com> [danvet: Squash in msm fixup from Maarten.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 844f9111f6f54f88eb2f0fac121b82ce77193866) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Removed the file drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c Used the master copy of drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c Used the master copy of drivers/gpu/drm/omapdrm/omap_plane.c Change-Id: I20284585412fc29eebe68ca35142c047654bdae4 Reviewed-on: https://chromium-review.googlesource.com/334074 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408872 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408872" owner_email="matthew.s.atwood@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/408872/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I136b511dd251c8049c63dd99dfad7cf97c33d3bb" commit="11d050e58ef943afffed7b28f44d27e96998ba35" commit_message="Reland "UPSTREAM: drm/i915: Use atomic plane state in the primary plane update." Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d4b08630fb6e3fe9948456b09feb223fba2b48a6) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I136b511dd251c8049c63dd99dfad7cf97c33d3bb Reviewed-on: https://chromium-review.googlesource.com/334053 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408873 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408873" owner_email="matthew.s.atwood@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/408873/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I1506069788c3c120e500349d70fc6c714b241e12" commit="9ff19cc64c2d651508f47a33d90621f30026f4e4" commit_message="Reland "UPSTREAM: drm/i915: Use the atomic state in intel_update_primary_planes." This function was still using the legacy state, convert it to atomic. While we're at it, fix the FIXME too and disable the primary plane. v2 (Daniel): - Add FIXME explaining that update_primary_planes should soon get removed anyway. - Don't call ->disable_plane since we can't disable the primary plane with a CS flip (noticed by Ville). Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (v1) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 11c22da619101a5a4332df718268e6214e3919f3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I1506069788c3c120e500349d70fc6c714b241e12 Reviewed-on: https://chromium-review.googlesource.com/334035 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408874 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408874" owner_email="matthew.s.atwood@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/408874/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I394006ca1f91a23e93e39be67576b764806ed87b" commit="d611f27d9c1711cc7e50f4da69d214ddce54b99a" commit_message="Reland "UPSTREAM: drm/i915: Use crtc->state for duplication." In async mode crtc->config can be updated after the locks are released, resulting in the wrong state being duplicated. Note that this also removes a spurious assignment of crtc_state->crtc introduced in commit f0c60574eb1216b0904c0d696c64d5096d6e4913 Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Date: Tue Apr 21 17:12:58 2015 +0300 drm/i915: Call drm helpers when duplicating crtc and plane states Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f2a066f3dee8a0e37015d15298e14e9ad6c0a53d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I394006ca1f91a23e93e39be67576b764806ed87b Reviewed-on: https://chromium-review.googlesource.com/334055 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408875 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408875" owner_email="matthew.s.atwood@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/408875/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ie0d9a5eb4d1d613b0395d360fa500ecfdd9a0c3d" commit="2e34175a65c8da7c0c573b41ed71929994705068" commit_message="Reland "BACKPORT: drm/i915: Make updating pipe without modeset atomic." Instead of doing a hack during primary plane commit the state is updated during atomic evasion. It handles differences in pipe size and the panel fitter. This is continuing on top of Daniel's work to make faster modesets atomic, and not yet enabled by default. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> [danvet: - simplify/future-proof if ladder that Jesse spotted - resolve conflict in pipe_config_check and don't spuriously move the code.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit bfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c) Conflicts: Minor context change in drivers/gpu/drm/i915/intel_display.c Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ie0d9a5eb4d1d613b0395d360fa500ecfdd9a0c3d Reviewed-on: https://chromium-review.googlesource.com/334605 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408876 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408876" owner_email="matthew.s.atwood@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/76/408876/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Id851df7782ebca395ef5648f179e2941abef96a9" commit="5dec1ba0299d6cd5fc0eda5a2351caf8cb6b5fdf" commit_message="Reland "UPSTREAM: drm/i915: remove pre-atomic check from SKL update_primary_plane" The comment suggests the check was there for some non-fully-atomic case, and I couldn't find a case where we wouldn't correctly initialize plane_state, so remove the check. Let's leave a WARN there just in case. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Acked-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit a42e5a23ed1939a8eca5a753c19bb8b0e5cee475) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Id851df7782ebca395ef5648f179e2941abef96a9 Reviewed-on: https://chromium-review.googlesource.com/334033 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408877 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408877" owner_email="matthew.s.atwood@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/408877/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="If62728847e1c369d99ccee52603eced4d4573dc3" commit="67d8bb5d7e609bc46cdae754ddf489dad6997c51" commit_message="Reland "UPSTREAM: drm/i915: Add primary plane to mask if it's visible" This fixes the warnings like "plane A assertion failure, should be disabled but not" that on the initial modeset during boot. This can happen if the primary plane is enabled by the firmware, but inheriting it fails because the DMAR is active or for other reasons. Most likely caused by commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Date: Mon Jun 1 12:49:54 2015 +0200 drm/i915: update plane state during init This is a new version of commit 721a09f7393de6c28a07516dccd654c6e995944a Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Date: Tue Sep 15 14:28:54 2015 +0200 drm/i915: Add primary plane to mask if it's visible That was reverted in order to facilitate easier backporting of some commits from -next to v4.3. Reported-by: Andreas Reis <andreas.reis@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429 Reported-and-tested-by: Emil Renner Berthing <kernel@esmil.dk> Tested-by: Andreas Reis <andreas.reis@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> [Jani: cherry-picked from -next to v4.3] Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 18e9345b0db9fe7bd18c3c43967789fe0a2fdb52) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If62728847e1c369d99ccee52603eced4d4573dc3 Reviewed-on: https://chromium-review.googlesource.com/334066 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408878 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408878" owner_email="matthew.s.atwood@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/408878/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I22de102e3e78490b02eda2c37209cae6641919ff" commit="4a386d3025862404455009046a6463787f97079b" commit_message="Reland "UPSTREAM: drm/i915/skl+: Enable pipe CSC on cursor planes. (v2)" Extend this to SKL and BXT as it's needed for these platforms as well. v2: Change if condition to HAS_DDI() instead of listing each platform Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit fc6f93bce582ccf76335843584e6a797ac72813c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I22de102e3e78490b02eda2c37209cae6641919ff Reviewed-on: https://chromium-review.googlesource.com/334034 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408879 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408879" owner_email="matthew.s.atwood@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/408879/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="If20d5dbdb89fca0f7ed766934f365e7cf572ea60" commit="5d07fc6e782e00279d156e6394b922e6a1f4a9b7" commit_message="Reland "UPSTREAM: drm/i915: Make plane fb tracking work correctly, v2." atomic->disabled_planes is a hack that had to exist because prepare_fb was only called when a new fb was set. This messed up fb tracking in some circumstances like aborts from interruptible waits. As a result interruptible waiting in prepare_plane_fb was forbidden, but other errors could still cause frontbuffer tracking to be messed up. Now that prepare_fb is always called, this hack is no longer required and prepare_fb may fail without consequences. Changes since v1: - Clean up a few fb tracking warnings by changing plane->fb to plane->state->fb. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 1ee493991470bcae58e716ba24d6d4eb9ad612ab) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If20d5dbdb89fca0f7ed766934f365e7cf572ea60 Reviewed-on: https://chromium-review.googlesource.com/334075 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408880 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408880" owner_email="matthew.s.atwood@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/408880/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I34c631ca765e4c40cff3133f4b5ee93399a01a0c" commit="f9a38a549611a11dab605feee3846f2a59871478" commit_message="Reland "UPSTREAM: drm/i915: Make prepare_plane_fb fully interruptible." Now that we agreed on not preserving framebuffers pinning is finally allowed to fail because of signals. Use this to make pinning and acquire the mutex in an interruptible way too. Unpinning is still uninterruptible, because it happens as a cleanup of old state, or undoing pins after one of the pins failed. The intel_pin_and_fence_fb_obj in page_flip will also wait interruptibly, and can be aborted now. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b26a6b35581c84124bd78b68cc02d171fbd572c9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I34c631ca765e4c40cff3133f4b5ee93399a01a0c Reviewed-on: https://chromium-review.googlesource.com/334082 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408881 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408881" owner_email="matthew.s.atwood@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/408881/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I139a7bcf2f1bc5b901621b76a7dae66e2261a00b" commit="96c1dac82b58165d344cf2f5acb82857c0bc8cef" commit_message="Reland "UPSTREAM: drm/i915: Update legacy primary state outside the commit hook, v2." This should allow not running plane commit when the crtc is off. While the atomic helpers update those, crtc->x/y is only updated during modesets, and primary plane is updated after this function returns. Unfortunately non-atomic watermarks and fbc still depend on this state inside i915, so it has to be kept in sync. Changes since v1: - Add comment that the legacy state is updated for fbc. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 61067a5e69f548f5cb7f575f8e147956b60b2876) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I139a7bcf2f1bc5b901621b76a7dae66e2261a00b Reviewed-on: https://chromium-review.googlesource.com/334054 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408882 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408882" owner_email="matthew.s.atwood@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/408882/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ia9d0c65e0b499eddad99fe4281e465f6acb81301" commit="d64a6dec2301074a5229cddec0d655e74fac7f5b" commit_message="Reland "UPSTREAM: drm/i915: Only commit active planes when updating planes during reset." In the next commit commit_plane will no longer check if the crtc is active. To prevent issues with legacy page flips the check should be performed inside update_primary_planes. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f029ee825cdfc486b24ee67a3d4d0b2c05c9bee5) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ia9d0c65e0b499eddad99fe4281e465f6acb81301 Reviewed-on: https://chromium-review.googlesource.com/334036 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408883 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408883" owner_email="matthew.s.atwood@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/408883/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I1dd881d105b7b2e03172ab8394cc555f09a4f3f8" commit="df6c9be2421d83f0479b292dcbd455f70ad9d034" commit_message="Reland "BACKPORT: drm/i915: Only run commit when crtc is active, v2." The crtc->active guards are no longer needed now that all state updates are outside the commit. Changes since v1: - Only check crtc->state->active before calling commit_planes_on_crtc. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 6285262259ca3d12da57073236a55d1b81bf8643) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: The functions intel_pipe_update_{start/end} drivers/gpu/drm/i915/intel_display.c take the vblank_count as an argument. Minor context change in drivers/gpu/drm/i915/intel_sprite.c Change-Id: I1dd881d105b7b2e03172ab8394cc555f09a4f3f8 Reviewed-on: https://chromium-review.googlesource.com/334606 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408884 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408884" owner_email="matthew.s.atwood@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/408884/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I1b71142322ef07d4b9f41f1b63a989011d2b0260" commit="f199416948c3c1c8128e84511dc174ae66e93f9c" commit_message="Reland "UPSTREAM: drm/i915: Only call commit_planes when there are things to commit." The atomic helpers set planes_changed on a crtc_state if there is any plane_state bound to that crtc. If there's none and there is no pipe update required the crtc has nothing to update, so vblank evasion can be skipped. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 6173ee2886ca46e00ba3d8f0b4a9a1cd6f8a76ce) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I1b71142322ef07d4b9f41f1b63a989011d2b0260 Reviewed-on: https://chromium-review.googlesource.com/334037 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408885 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408885" owner_email="matthew.s.atwood@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/408885/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ifffea56b8b64d4296bf014227637ecedae4b0f77" commit="79952f02923b0d4a0525c7c793da03f6325493fa" commit_message="Reland "UPSTREAM: drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4)" Just pull the info out of the state structures rather than staging it in an additional set of structures. To make this more straightforward, we change the signature of several internal WM functions to take the crtc state as a parameter. v2: - Don't forget to skip cursor planes on a loop in the DDB allocation function to match original behavior. (Ander) - Change a use of intel_crtc->active to cstate->active. They should be identical, but it's better to be consistent. (Ander) - Rework more function signatures to pass states rather than crtc for consistency. (Ander) v3: - Add missing "+ 1" to skl_wm_plane_id()'s 'overlay' case. (Maarten) - Packed formats should pass '0' to drm_format_plane_cpp(), not 1. (Maarten) - Drop unwanted WARN_ON() for disabled planes when calculating data rate for SKL. (Maarten) v4: - Don't include cursor plane in total relative data rate calculation; we've already handled the cursor allocation earlier. - Fix 'bytes_per_pixel' calculation braindamage. Somehow I hardcoded the NV12 format as a parameter rather than the actual fb->pixel_format, and even then still managed to get the format plane wrong. (Ville) - Use plane->state->fb rather than plane->fb in skl_allocate_pipe_ddb(); the plane->fb pointer isn't updated until after we've done our watermark recalculation, so it has stale values. (Bob Paauwe) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by(v3): Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Paauwe, Bob J <bob.j.paauwe@intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> References: http://lists.freedesktop.org/archives/intel-gfx/2015-September/077060.html References: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077721.html Smoke-tested-by(v4): Paulo Zanoni <paulo.r.zanoni@intel.com> (SKL) Link: http://patchwork.freedesktop.org/patch/61968/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 024c9045221fe45482863c47c4b4c47d37f97cbf) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ifffea56b8b64d4296bf014227637ecedae4b0f77 Reviewed-on: https://chromium-review.googlesource.com/327315 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408886 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408886" owner_email="matthew.s.atwood@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/408886/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ib76815be317d3cf756322d626ea539c3e1b1bdb7" commit="b911fcd238bfd3ae082e508981da5cb6f798d392" commit_message="Reland "BACKPORT: drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check" Determine whether we need to apply this workaround at atomic check time and just set a flag that will be used by the main watermark update routine. Moving this workaround into the atomic framework reduces ilk_update_sprite_wm() to just a standard watermark update, so drop it completely and just ensure that ilk_update_wm() is called whenever a sprite plane is updated in a way that would affect watermarks. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60367/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d21fbe87ce18297af0a9b7cc0cd545fd9ac28d33) Conflicts: Minor context change in drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib76815be317d3cf756322d626ea539c3e1b1bdb7 Reviewed-on: https://chromium-review.googlesource.com/334059 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408887 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408887" owner_email="matthew.s.atwood@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/408887/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I3623f4bcf79ee67dd6d21613764593b8ab39e025" commit="5efda48dcf288e6c3bd61607a0bef2ac95408c7a" commit_message="Reland "UPSTREAM: drm/i915: Drop intel_update_sprite_watermarks" The only platform that still has an update_sprite_wm entrypoint is SKL; on SKL, intel_update_sprite_watermarks just updates intel_plane->wm and then performs a regular watermark update. However intel_plane->wm is only used to update a couple fields in intel_wm_config, and those fields are never used by the SKL code, so on SKL an update_sprite_wm is effectively identical to an update_wm call. Since we're already ensuring that the regular intel_update_wm is called any time we'd try to call intel_update_sprite_watermarks, the whole call is redundant and can be dropped. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60372/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 791a32be6eb233773dd5698375d051af99e68d3b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I3623f4bcf79ee67dd6d21613764593b8ab39e025 Reviewed-on: https://chromium-review.googlesource.com/334060 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408888 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408888" owner_email="matthew.s.atwood@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/408888/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ib1ddfd939800d7dd2cf797e9f8f9411802a1efbf" commit="a477af6adbf6ca96be53ce250da7a8b28b91129e" commit_message="Reland "UPSTREAM: drm/i915: Refactor ilk_update_wm (v3)" Split ilk_update_wm() into two parts; one doing the programming and the other the calculations. v2: Fix typo in commit message v3 (by Matt): Heavily rebased for current codebase. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60366/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b9d5c839f18c8bbd79a61013371eb8cadf6d897d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ib1ddfd939800d7dd2cf797e9f8f9411802a1efbf Reviewed-on: https://chromium-review.googlesource.com/334061 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408889 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408889" owner_email="matthew.s.atwood@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/89/408889/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I01f24ed5db7e743648de921d29916802b414e0eb" commit="2292a396bc546797c787b9f8881c64597164a7ef" commit_message="Reland "UPSTREAM: drm/i915: Calculate pipe watermarks into CRTC state (v3)" A future patch will calculate these during the atomic 'check' phase rather than at WM programming time, so let's store the watermark values we're planning to use in the CRTC state; the values actually active on the hardware remains in intel_crtc. While we're at it, do some minor restructuring to keep ILK and SKL values in a union. v2: Don't move cxsr_allowed to state (Maarten) v3: Only calculate watermarks in state. Still keep active watermarks in intel_crtc itself. (Ville) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59556/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 4e0963c7663b0538b5a21fb49d17ea4ad64de861) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I01f24ed5db7e743648de921d29916802b414e0eb Reviewed-on: https://chromium-review.googlesource.com/334062 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408890 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408890" owner_email="matthew.s.atwood@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/90/408890/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I29e7ab7d5b53acb79714b76281e7c1cb9de26051" commit="67ca08b131e714aaa646bdb3d21d62d90a9475df" commit_message="Reland "UPSTREAM: drm/i915: Calculate ILK-style watermarks during atomic check (v3)" Calculate pipe watermarks during atomic calculation phase, based on the contents of the atomic transaction's state structure. We still program the watermarks at the same time we did before, but the computation now happens much earlier. While this patch isn't too exciting by itself, it paves the way for future patches. The eventual goal (which will be realized in future patches in this series) is to calculate multiple sets up watermark values up front, and then program them at different times (pre- vs post-vblank) on the platforms that need a two-step watermark update. While we're at it, s/intel_compute_pipe_wm/ilk_compute_pipe_wm/ since this function only applies to ILK-style watermarks and we have a completely different function for SKL-style watermarks. Note that the original code had a memcmp() in ilk_update_wm() to avoid calling ilk_program_watermarks() if the watermarks hadn't changed. This memcmp vanishes here, which means we may do some unnecessary result generation and merging in cases where watermarks didn't change, but the lower-level function ilk_write_wm_values already makes sure that we don't actually try to program the watermark registers again. v2: Squash a few commits from the original series together; no longer leave pre-calculated wm's in a separate temporary structure since it's easier to follow the logic if we just cut over to using the pre-calculated values directly. v3: - Pass intel_crtc instead of drm_crtc to .compute_pipe_wm() entrypoint and use intel_atomic_get_crtc_state() to avoid need for extra casting. (Ander) - Drop unused intel_check_crtc() function prototype. (Ander) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/60363/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 86c8bbbeb8d11b898ac33a52b1410b39a1c73b89) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I29e7ab7d5b53acb79714b76281e7c1cb9de26051 Reviewed-on: https://chromium-review.googlesource.com/334063 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408891 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408891" owner_email="matthew.s.atwood@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/91/408891/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I3087277351f69fb711fda87c94afe1af018c13b7" commit="2e7543d6086ba04fddf6680711ed880601c973cf" commit_message="Reland "UPSTREAM: drm/i915: Don't set plane visible during HW readout if CRTC is off" We already ensure that pstate->visible = false when crtc->active = false during runtime programming; make sure we follow the same logic when reading out initial hardware state. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59564/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 19b8d3875e21f4f7e5c999350892f1a788f4e977) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I3087277351f69fb711fda87c94afe1af018c13b7 Reviewed-on: https://chromium-review.googlesource.com/334067 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408892 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408892" owner_email="matthew.s.atwood@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/92/408892/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I7157072c4b7071101d4dc997f113a1f9b68e45b4" commit="f07d9b3df93f8f48bc40c080164ed79caa9bedb4" commit_message="Reland "UPSTREAM: drm/i915: Calculate watermark configuration during atomic check (v2)" v2: Don't forget to actually check the cstate->active value when tallying up the number of active CRTC's. (Ander) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com> Link: http://patchwork.freedesktop.org/patch/59561/ BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit aa363136866caa636031284f13ea0f730c64fca9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I7157072c4b7071101d4dc997f113a1f9b68e45b4 Reviewed-on: https://chromium-review.googlesource.com/334068 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408893 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408893" owner_email="matthew.s.atwood@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/93/408893/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I4fe1a1650f0877dc012518d0553d1d3accd3bc26" commit="efe35acde0b21fad52d621057452d9dc93130019" commit_message="Reland "UPSTREAM: drm/i915: Make wait_for_flips interruptible." Move it from intel_crtc_atomic_commit to prepare_plane_fb. Waiting is done before committing, otherwise it's too late to undo the changes. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 5008e874edd34705be433bfa74bd29908182b36e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I4fe1a1650f0877dc012518d0553d1d3accd3bc26 Reviewed-on: https://chromium-review.googlesource.com/334081 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408894 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408894" owner_email="matthew.s.atwood@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/94/408894/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I98a4bf0db7ff79e53d1a9aeae6a9eedf7ff96267" commit="cd9165ad222affa8149ac9f32f17cd1144978eb3" commit_message="Reland "UPSTREAM: drm/i915: Change locking for struct_mutex, v3." struct_mutex is being locked for every plane in intel_prepare_plane_fb and intel_cleanup_plane_fb. Require the caller to hold the mutex, and only acquire the mutex for each helper call. This way the lock only needs to be acquired twice in ->atomic_commit(). Once for pinning new framebuffers at the start, the second time for unpinning old framebuffer. Changes since v1: - Use mutex_lock_interruptible instead of i915 variant, to prevent a deadlock when called from the reset code. Changes since v2: - Clarify struct_mutex is locked by the caller. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> #v1 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit f935675f0c07f87da2facc4c144d511e6da48240) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I98a4bf0db7ff79e53d1a9aeae6a9eedf7ff96267 Reviewed-on: https://chromium-review.googlesource.com/334083 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408895 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408895" owner_email="matthew.s.atwood@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/95/408895/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I66d5dacb4c5269aa53b4a67cf7b1477c7b0f1652" commit="a39806291b8548208e800c6b738364f6541b6866" commit_message="Reland "UPSTREAM: drm/i915: Wait for object idle without locks in atomic_commit, v2." Make pinning and waiting a separate step, and wait for object idle without struct_mutex held. Changes since v1: - Do not wait when a reset is in progress. - Remove call to i915_gem_object_wait_rendering for intel_overlay_do_put_image (Chris Wilson) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 7580d774b0466fff28aab19db4f36dac37a3d1a9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I66d5dacb4c5269aa53b4a67cf7b1477c7b0f1652 Reviewed-on: https://chromium-review.googlesource.com/334084 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408896 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408896" owner_email="matthew.s.atwood@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/96/408896/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I5c8dbb5c9e96269e6aa2a8faf686ab490ab8315c" commit="838823ad07123665ce7a90c481b1080d4033d3a9" commit_message="Reland "UPSTREAM: drm/i915: Check for FIFO underruns after modeset on IVB/HSW and CPT/PPT" Due to the shared error interrupt on IVB/HSW and CPT/PPT we may not always get an interrupt on a FIFO underrun. But we can always do an explicit check (like we do on GMCH platforms that have no underrun interrupt). v2: Drop stale kerneldoc for i9xx_check_fifo_underruns() (Daniel) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1446225741-11070-1-git-send-email-ville.syrjala@linux.intel.com BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit aca7b684bab9da1e3071ad872f1d78d41ae7a706) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I5c8dbb5c9e96269e6aa2a8faf686ab490ab8315c Reviewed-on: https://chromium-review.googlesource.com/334087 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408897 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408897" owner_email="matthew.s.atwood@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/97/408897/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Idb3fdc09f4039f9a59b9b59342aec6662d489712" commit="9859ad9ccbc36c5344ca994ed9afda9709ad52d8" commit_message="Reland "UPSTREAM: drm/i915/skl: Correct other-pipe watermark update condition check (v2)" If ddb allocation for planes in current CRTC is changed, that doesn't lead to ddb allocation change for other CRTCs, because our DDB allocation is not dynamic according to plane parameters, ddb is allocated according to number of CRTC enabled, & divided equally among CTRC's. In current condition check during Watermark calculation, if number of plane/ddb allocation changes for current CRTC, Watermark for other pipes are recalculated. But there is no change in DDB allocation of other pipe so watermark is also not changed, This leads to warning messages. WARN_ON(!wm_changed) This patch corrects this and check if DDB allocation for pipes is changed, then only recalculate watermarks. v2 (by Matt): Rebased to latest -nightly and fixed a typo Signed-off-by: Kumar, Mahesh <mahesh1.kumar@intel.com> Reviewed-by(v1): Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit e6d900239e7aee6e4c4cd863b2b9bbcc62ec71e1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Idb3fdc09f4039f9a59b9b59342aec6662d489712 Reviewed-on: https://chromium-review.googlesource.com/334069 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408898 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408898" owner_email="matthew.s.atwood@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/98/408898/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Iaad45d3b1fc97e033492614a0c45717318f2ca47" commit="05e6de155ecaa6d13ef7398f6ab8e251cc41bc6a" commit_message="Reland "UPSTREAM: drm/i915: Check for underruns after crtc disable" To get a better idea if underruns occurred during crtc disabling, let's check for them explicitly. This helps in cases where the error interrupt isn't active, or there is no underrun interrupt support at all. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448050160-14124-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 9bbc8258ae5914af1986561767d971417cee7a28) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Iaad45d3b1fc97e033492614a0c45717318f2ca47 Reviewed-on: https://chromium-review.googlesource.com/334078 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408899 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408899" owner_email="matthew.s.atwood@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/99/408899/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I2528986ee542d5e17fd8099f5e4028098fcb2513" commit="8e69705ce3a1243ad8135f1e3c5ad13a1c53ee91" commit_message="Reland "UPSTREAM: drm/i915: Move disable_cxsr to the crtc_state." intel_crtc->atomic will be removed later on, move this member to intel_crtc_state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447945645-32005-2-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ab1d3a0e5a44f5b1a8d1f811e925c8519b56fba4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I2528986ee542d5e17fd8099f5e4028098fcb2513 Reviewed-on: https://chromium-review.googlesource.com/334076 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408900 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408900" owner_email="matthew.s.atwood@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/00/408900/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ia0b93e08b0c2cc684dac6ff613aebf3384c259fc" commit="587bd35a32c2f1ab4cc91e063183a971efdc8e1f" commit_message="Reland "UPSTREAM: drm/i915: Calculate watermark related members in the crtc_state, v4." This removes pre/post_wm_update from intel_crtc->atomic, and creates atomic state for it in intel_crtc. Changes since v1: - Rebase on top of wm changes. Changes since v2: - Split disable_cxsr into a separate patch. Changes since v3: - Move some of the changes to intel_wm_need_update. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/56603A49.5000507@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 92826fcdfc147a7d16766e987c12a9dfe1860c3f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Ia0b93e08b0c2cc684dac6ff613aebf3384c259fc Reviewed-on: https://chromium-review.googlesource.com/334077 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408901 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408901" owner_email="matthew.s.atwood@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/01/408901/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I5c900e7215607b0486a354d8c57198e95104abd2" commit="eb34394411053796720b45fc8f7a5c2f63f457d2" commit_message="Reland "UPSTREAM: drm/i915/skl: Update watermarks before the crtc is disabled." On skylake some of the registers are only writable when the correct power wells are enabled. Because of this watermarks have to be updated before the crtc turns off, or you get unclaimed register read and write warnings. This patch needs to be modified slightly to apply to -fixes. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92181 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: stable@vger.kernel.org Cc: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1447945645-32005-4-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit b900111459e2f4a538697f75b63478f3a6acec3c) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I5c900e7215607b0486a354d8c57198e95104abd2 Reviewed-on: https://chromium-review.googlesource.com/334079 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408902 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408902" owner_email="matthew.s.atwood@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/02/408902/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I2f2abe58f4598a600715b22f57a85d349cec2a6a" commit="a1acd1e4954ec0541d1f156d9bf2580f1d19b91d" commit_message="Reland "UPSTREAM: drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2)" If we fail to reconstruct the BIOS fb (e.g., because the FB is too large), we'll be left with plane state that indicates the primary plane is visible yet has a NULL fb. This mismatch causes problems later on (e.g., for the watermark code). Since we've failed to reconstruct the BIOS FB, the best solution is to just disable the primary plane and pretend the BIOS never had it enabled. v2: Add intel_pre_disable_primary() call (Maarten) Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Ville Syrjl <ville.syrjala@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: drm-intel-fixes@lists.freedesktop.org Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-2-git-send-email-matthew.d.roper@intel.com BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 200757f5d7c6f7f7032a0a07bbb8c02a840bbf7d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I2f2abe58f4598a600715b22f57a85d349cec2a6a Reviewed-on: https://chromium-review.googlesource.com/334070 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408903 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408903" owner_email="matthew.s.atwood@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/03/408903/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I359d6162a822edebcff32293bacbf9bfa64af097" commit="02b1376a25a2bf92bce602e97b6df324990a8b64" commit_message="Reland "BACKPORT: drm/i915: Do not acquire crtc state to check clock during modeset, v4." Parallel modesets are still not allowed, but this will allow updating a different crtc during a modeset if the clock is not changed. Additionally when all pipes are DPMS off the cdclk will be lowered to the minimum allowed. Changes since v1: - Add dev_priv->active_crtcs for tracking which crtcs are active. - Rename min_cdclk to min_pixclk and move to dev_priv. - Add a active_crtcs mask which is updated atomically. - Add intel_atomic_state->modeset which is set on modesets. - Commit new pixclk/active_crtcs right after state swap. Changes since v2: - Make the changes related to max_pixel_rate calculations more readable. Changes since v3: - Add cherryview and missing WARN_ON to readout. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 565602d7501a3e83580289d7d6da9b15838cfbe3) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Context change in intel_atomic_commit drivers/gpu/drm/i915/intel_display.c Change-Id: I359d6162a822edebcff32293bacbf9bfa64af097 Reviewed-on: https://chromium-review.googlesource.com/334085 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408904 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408904" owner_email="matthew.s.atwood@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/04/408904/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Id2891f8e65dc58faec42bf8d1df1519964e3e3bb" commit="d99915a9b4ae406503c702f8854042ce944ee0dd" commit_message="Reland "UPSTREAM: drm/i915: Setup clipped src/dest coordinates during FB reconstruction (v2)" Plane state objects contain two copies of src/dest coordinates: the original (requested by userspace) coordinates in the base drm_plane_state object, and a second, clipped copy (i.e., what we actually want to program to the hardware) in intel_plane_state. We've only been setting up the former set of values during boot time FB reconstruction, but we should really be initializing both. Note that the code here probably still needs some more work since we make a lot of assumptions about how the BIOS programmed the hardware that may not always be true, especially on gen9+; e.g., * Primary plane might not be positioned at 0,0 * Primary plane could have been rotated by the BIOS * Primary plane might be scaled * The BIOS fb might be a single "extended mode" FB that spans multiple displays. * ...etc... v2: Reword/expand commit message description of assumptions we make Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by(v1): Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-4-git-send-email-matthew.d.roper@intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 0a8d8a8667c7e66f4fa2498be18d47f8b296b430) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Id2891f8e65dc58faec42bf8d1df1519964e3e3bb Reviewed-on: https://chromium-review.googlesource.com/334071 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408905 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408905" owner_email="matthew.s.atwood@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/05/408905/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I5af6da0e2efecfd7b0d0173f06f9e97b9542f364" commit="8d6a254d6238588e46693f4d86e10cd19f1cbd39" commit_message="Reland "UPSTREAM: drm/i915: Add extra paranoia to ILK watermark calculations" Our low-level watermark calculation functions don't get called when the CRTC is disabled or the relevant plane is invisible, so they should never see a zero htotal or zero bpp. However add some checks to ensure this is true so that we don't wind up dividing by zero if we make a mistake elsewhere in the driver (which the atomic watermark series has revealed we might be). References: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077370.html Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449171462-30763-6-git-send-email-matthew.d.roper@intel.com Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 151268821e6f08956b28b6ff90fae187a5b230b8) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I5af6da0e2efecfd7b0d0173f06f9e97b9542f364 Reviewed-on: https://chromium-review.googlesource.com/334072 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408906 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408906" owner_email="matthew.s.atwood@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/06/408906/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Id5f7778c6103791cfdd07cc0891845467d58630d" commit="b9b6cb67d6197719e2881ba7645ac4fb259d8f53" commit_message="Reland "UPSTREAM: drm/i915: Sanitize watermarks after hardware state readout (v4)" Although we can do a good job of reading out hardware state, the graphics firmware may have programmed the watermarks in a creative way that doesn't match how i915 would have chosen to program them. We shouldn't trust the firmware's watermark programming, but should rather re-calculate how we think WM's should be programmed and then shove those values into the hardware. We can do this pretty easily by creating a dummy top-level state, running it through the check process to calculate all the values, and then just programming the watermarks for each CRTC. v2: Move watermark sanitization after our BIOS fb reconstruction; the watermark calculations that we do here need to look at pstate->fb, which isn't setup yet in intel_modeset_setup_hw_state(), even though we have an enabled & visible plane. v3: - Don't move 'active = optimal' watermark assignment; we just undo that change in the next patch anyway. (Ville) - Move atomic helper locking fix to separate patch. (Maarten) v4: - Grab connection_mutex before calling atomic helper to duplicate state. The connector loop inside the helper will throw a WARN if we don't hold something to protect the connector list (and the helper itself doesn't try to lock the list). - Make failure to calculate watermarks for inherited state a WARN() since it probably indicates a serious problem in either our state readout code or our watermark code for this platform. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d93c037246104e403436ffe339bcb832185d0627) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: Id5f7778c6103791cfdd07cc0891845467d58630d Reviewed-on: https://chromium-review.googlesource.com/334073 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408907 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408907" owner_email="matthew.s.atwood@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/07/408907/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I9e9c16d5301ac4f718c79e5cac6cd0f4fca660db" commit="c37d24e3ca928482a381cee0921ba6ac5b9a0d28" commit_message="Reland "BACKPORT: drm/i915: Use the active wm config for merging on ILK-BDW" ilk_program_watermarks() is supposed to merge the active watermarks from all pipes. Thus we need to use the active config too instead of some precomputed stuff. Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)") Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1452776015-22076-2-git-send-email-ville.syrjala@linux.intel.com Conflicts: Minor conflict in signature of ilk_program_watermarks drivers/gpu/drm/i915/intel_pm.c BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit d890565c44447db08fd9d07f5b02928a07a88c7e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: I9e9c16d5301ac4f718c79e5cac6cd0f4fca660db Reviewed-on: https://chromium-review.googlesource.com/344376 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408908 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408908" owner_email="matthew.s.atwood@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/08/408908/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I527faa19b39f6db3d20f3d8d6226155512724b80" commit="98b2fd0cd50f9e8d0b79d0f1e03e81f27f34811d" commit_message="Reland "BACKPORT: drm/i915: Add two-stage ILK-style watermark programming (v11)" In addition to calculating final watermarks, let's also pre-calculate a set of intermediate watermark values at atomic check time. These intermediate watermarks are a combination of the watermarks for the old state and the new state; they should satisfy the requirements of both states which means they can be programmed immediately when we commit the atomic state (without waiting for a vblank). Once the vblank does happen, we can then re-program watermarks to the more optimal final value. v2: Significant rebasing/rewriting. v3: - Move 'need_postvbl_update' flag to CRTC state (Daniel) - Don't forget to check intermediate watermark values for validity (Maarten) - Don't due async watermark optimization; just do it at the end of the atomic transaction, after waiting for vblanks. We do want it to be async eventually, but adding that now will cause more trouble for Maarten's in-progress work. (Maarten) - Don't allocate space in crtc_state for intermediate watermarks on platforms that don't need it (gen9+). - Move WaCxSRDisabledForSpriteScaling:ivb into intel_begin_crtc_commit now that ilk_update_wm is gone. v4: - Add a wm_mutex to cover updates to intel_crtc->active and the need_postvbl_update flag. Since we don't have async yet it isn't terribly important yet, but might as well add it now. - Change interface to program watermarks. Platforms will now expose .initial_watermarks() and .optimize_watermarks() functions to do watermark programming. These should lock wm_mutex, copy the appropriate state values into intel_crtc->active, and then call the internal program watermarks function. v5: - Skip intermediate watermark calculation/check during initial hardware readout since we don't trust the existing HW values (and don't have valid values of our own yet). - Don't try to call .optimize_watermarks() on platforms that don't have atomic watermarks yet. (Maarten) v6: - Rebase v7: - Further rebase v8: - A few minor indentation and line length fixes v9: - Yet another rebase since Maarten's patches reworked a bunch of the code (wm_pre, wm_post, etc.) that this was previously based on. v10: - Move wm_mutex to dev_priv to protect against racing commits against disjoint CRTC sets. (Maarten) - Drop unnecessary clearing of cstate->wm.need_postvbl_update (Maarten) v11: - Now that we've moved to atomic watermark updates, make sure we call the proper function to program watermarks in {ironlake,haswell}_crtc_enable(); the failure to do so on the previous patch iteration led to us not actually programming the watermarks before turning on the CRTC, which was the cause of the underruns that the CI system was seeing. - Fix inverted logic for determining when to optimize watermarks. We were needlessly optimizing when the intermediate/optimal values were the same (harmless), but not actually optimizing when they differed (also harmless, but wasteful from a power/bandwidth perspective). Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1456276813-5689-1-git-send-email-matthew.d.roper@intel.com Conflicts: Minor context change in drivers/gpu/drm/i915/i915_drv.h Minor conflict intel_crtc_duplicate_state in drivers/gpu/drm/i915/intel_atomic.c Minor conflict intel_plane_atomic_calc_changes drivers/gpu/drm/i915/intel_display.c Minor context change in drivers/gpu/drm/i915/intel_drv.h BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit ed4a6a7ca853253f9b86f3005d76345482a71283) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reviewed-on: https://chromium-review.googlesource.com/334086 Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Change-Id: I527faa19b39f6db3d20f3d8d6226155512724b80 Reviewed-on: https://chromium-review.googlesource.com/408909 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408909" owner_email="matthew.s.atwood@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/09/408909/4" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="If02ba7cd1e64bed87914422ce714b40b486745e2" commit="9fc418fc3621295df6c6f1eae8b1695177265a3d" commit_message="Reland "UPSTREAM: drm/i915: Add missing NULL check before calling initial_watermarks" Not all platforms set this callback, so NULL check it before calling it. v2: - Call intel_update_watermarks() on HSW+ where the callback is not set. (Matt) CC: Matt Roper <matthew.d.roper@intel.com> Fixes: commit ed4a6a7ca853 ("drm/i915: Add two-stage ILK-style watermark programming (v11)") Signed-off-by: Imre Deak <imre.deak@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1456776633-3401-1-git-send-email-imre.deak@intel.com Reviewed-by: Matt Roper <matthew.d.roper@intel.com> BUG=chrome-os-partner:45364,chrome-os-partner:52008 TEST=Hot plugging 4K displays via HDMI/DP to Skl systems should not cause TEST=flicker. (cherry picked from commit 1d5bf5d9d9ef0c1e639d36178a224d83888c5a29) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Change-Id: If02ba7cd1e64bed87914422ce714b40b486745e2 Reviewed-on: https://chromium-review.googlesource.com/360024 Commit-Ready: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Tested-by: Prathyushi Nangia <prathyushi.nangia@intel.com> Reviewed-by: Stphane Marchesin <marcheu@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/408910 Tested-by: Jenny Q Cao <jenny.q.cao@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="408910" owner_email="matthew.s.atwood@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/10/408910/4" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I4758ba5a39cfd2c45f7d8a00a8fa9fc2c9435dfc" commit="6a61ff7ad2438c41c3c70c0e0b522195b213ec1e" commit_message="[autotest] Add HostInfo.get_label_value We often have 'key:value' as labels. This provides an method for a oft repeated pattern to obtain the first value for the given key. BUG=chromium:678430 TEST=unittests Change-Id: I4758ba5a39cfd2c45f7d8a00a8fa9fc2c9435dfc Reviewed-on: https://chromium-review.googlesource.com/442652 Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org> Tested-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> " fail_count="0" gerrit_number="442652" owner_email="pprabhu@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/442652/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic0b51b777054d81c8184b9ea23ef21f7de6e44c6" commit="3db01ca6b928b7973d6da73a088357cb248daf5d" commit_message="[autotest] Use HostInfo for AFE interaction in wifi_client BUG=chromium:678430 TEST=None Change-Id: Ic0b51b777054d81c8184b9ea23ef21f7de6e44c6 Reviewed-on: https://chromium-review.googlesource.com/442653 Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org> Tested-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="0" gerrit_number="442653" owner_email="pprabhu@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/53/442653/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iac26bb0419daa99967b061ce7784eb6cc3529593" commit="9287dccecb45bea1da543ac8a5eeaad1b6ac49e0" commit_message="[autotest] Use HostInfo to get AFE information in WifiCellTestBase BUG=chromium:678430 TEST=None Change-Id: Iac26bb0419daa99967b061ce7784eb6cc3529593 Reviewed-on: https://chromium-review.googlesource.com/442654 Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org> Tested-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="0" gerrit_number="442654" owner_email="pprabhu@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/54/442654/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic3fb979165bfebc16711a3c2d4c0ee000261f005" commit="d7b0aac3ee8bb4d95827e32a91f59cbe393653cd" commit_message="enterprise_LongevityTrackerServer: Use HostInfo to get host information BUG=chromium:678430 TEST=None Change-Id: Ic3fb979165bfebc16711a3c2d4c0ee000261f005 Reviewed-on: https://chromium-review.googlesource.com/442655 Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org> Tested-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> " fail_count="0" gerrit_number="442655" owner_email="pprabhu@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/55/442655/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I3502e1d6baddd9f598634077854030005ceef290" commit="2763a42e513364a11cf93abd55aa8ad3c01833bc" commit_message="Replaces usage of afe_utils.get_labels with HostInfo properties BUG=chromium:678430 TEST=None Change-Id: I3502e1d6baddd9f598634077854030005ceef290 Reviewed-on: https://chromium-review.googlesource.com/440563 Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org> Tested-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="0" gerrit_number="440563" owner_email="pprabhu@chromium.org" pass_count="0" patch_number="7" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/63/440563/7" remote="cros" total_fail_count="7"/><pending_commit branch="chromeos-4.4" change_id="If06114f3521156558038313a7338bc26bc25c43e" commit="1969ee492ea6616237c1316a5326a96054567a29" commit_message="FROMLIST: Documentation: bindings: add uphy-dp-sel for Rockchip USB Type-C PHY rockchip,uphy-dp-sel is the register of type-c phy enable DP function. BUG=chrome-os-partner:62797 TEST=check DP display on kevin, main port and sub port work well Signed-off-by: Chris Zhong <zyw@rock-chips.com> (am from https://patchwork.kernel.org/patch/9566083/) Change-Id:If06114f3521156558038313a7338bc26bc25c43e Reviewed-on: https://chromium-review.googlesource.com/440686 Commit-Ready: Chris Zhong <zyw@rock-chips.com> Tested-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="440686" owner_email="zyw@rock-chips.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/86/440686/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I5e05ec3faaa7f2a5012a695b28e041e579797fce" commit="d3a0f7eb99ba6f32ec3984cd32422e40f1dd3f85" commit_message="FROMLIST: arm64: dts: rockchip: add rockchip,uphy-dp-sel for Type-C phy rockchip,uphy-dp-sel is the register of type-c phy enable DP function. BUG=chrome-os-partner:62797 TEST=check DP display on kevin, main port and sub port work well Signed-off-by: Chris Zhong <zyw@rock-chips.com> (am from https://patchwork.kernel.org/patch/9566093/) Change-Id:I5e05ec3faaa7f2a5012a695b28e041e579797fce Reviewed-on: https://chromium-review.googlesource.com/440687 Commit-Ready: Chris Zhong <zyw@rock-chips.com> Tested-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="440687" owner_email="zyw@rock-chips.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/87/440687/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I3f6228fb5e3aad7ece4af971cb991ee5efa0847d" commit="502589160dc9b4d43369b5d4d9c41d1d7ed7f0ff" commit_message="FROMLIST: phy: rockchip-typec: support DP phy switch There are 2 Type-c PHYs in RK3399, but only one DP controller. Hence only one PHY can connect to DP controller at one time, the other should be disconnected. The GRF_SOC_CON26 register has a switch bit to do it, set this bit means enable PHY 1, clear this bit means enable PHY 0. BUG=chrome-os-partner:62797 TEST=check DP display on kevin, main port and sub port work well Signed-off-by: Chris Zhong <zyw@rock-chips.com> (am from https://patchwork.kernel.org/patch/9566095/) Change-Id:I3f6228fb5e3aad7ece4af971cb991ee5efa0847d Reviewed-on: https://chromium-review.googlesource.com/440688 Commit-Ready: Chris Zhong <zyw@rock-chips.com> Tested-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> Reviewed-by: Brian Norris <briannorris@chromium.org> " fail_count="0" gerrit_number="440688" owner_email="zyw@rock-chips.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/88/440688/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I3cb0b0efc9bbdeb29b5b232676012d1cb46a6a05" commit="9670f464c0459aea826e0fa8e8c8ac66b55f37e6" commit_message="FROMLIST: drm/rockchip: cdn-dp: remove the DP phy switch There are 2 Type-c PHYs in RK3399, but only one DP controller. Hence only one PHY can connect to DP controller at one time, the other should be disconnected. The GRF_SOC_CON26 register has a switch bit to do it, set this bit means enable PHY 1, clear this bit means enable PHY 0. If the board has 2 Type-C ports, the DP driver get the phy id from devm_of_phy_get_by_index, and then control this switch according to this id. But some others board only has one Type-C port, it may be PHY 0 or PHY 1. The dts node id can not tell us the correct PHY id. Hence move this switch to PHY driver, the PHY driver can distinguish between PHY 0 and PHY 1, and then write the correct register bit. BUG=chrome-os-partner:62797 TEST=check DP display on kevin, main port and sub port work well Signed-off-by: Chris Zhong <zyw@rock-chips.com> (am from https://patchwork.kernel.org/patch/9566097/) Change-Id:I3cb0b0efc9bbdeb29b5b232676012d1cb46a6a05 Reviewed-on: https://chromium-review.googlesource.com/440689 Commit-Ready: Chris Zhong <zyw@rock-chips.com> Tested-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> Reviewed-by: Brian Norris <briannorris@chromium.org> " fail_count="0" gerrit_number="440689" owner_email="zyw@rock-chips.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/89/440689/7" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I715ef2ec89cc07d5a747f9f685133d57ee4e51ca" commit="3cf49893efc89720f3c2c9e4151ed86f35a826f1" commit_message="arm-trusted-firmware: Uprev pinned HEAD to 95fba14bc4 This patch uprevs the pinned HEAD for the arm-trusted-firmware repository to the newest upstream master commit: Merge pull request #852 from dp-arm/dp/fiptool-embed-image CQ-DEPEND=CL:*335484 BUG=None TEST=None Change-Id: I715ef2ec89cc07d5a747f9f685133d57ee4e51ca Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/452659 Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="452659" owner_email="jwerner@chromium.org" pass_count="0" patch_number="3" project="chromiumos/manifest" project_url="https://chromium-review.googlesource.com/chromiumos/manifest" ref="refs/changes/59/452659/3" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-2016.05" change_id="I39c4cb530f41a7b0f7f3064125072dd85b62276f" commit="9030841f3e53889ea75e15efd399de900cbc47e6" commit_message="rockchip/rk3399: soc: resize reserve memory Reserve the whole TZRAM area because it will be marked as secure-only by BL31 and can not be accessed by the non-secure kernel. CQ-DEPEND=CL:452659 BUG=chrome-os-partner:57361 BRANCH=firmware-gru-8785.B TEST=the reserve memory is resized Change-Id: I39c4cb530f41a7b0f7f3064125072dd85b62276f Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/418102 Reviewed-by: Julius Werner <jwerner@chromium.org> (cherry picked from commit ea9fe064a9b1e1ce81fca74f829a0fb6e78ce426) Reviewed-on: https://chromium-review.googlesource.com/452640 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> " fail_count="0" gerrit_number="452640" owner_email="jwerner@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/40/452640/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib01e03abd9bb8503f4464e3023cb5fb0307c66c5" commit="a26787fc6deedd4fbf7741adcb09de21edb83a72" commit_message="package_to_container: add sysfs to config.json run_oci will no longer mount sysfs automatically. BUG=chromium:698104 TEST=container from package_to_container still works CQ-DEPEND=CL:431318 Change-Id: Ib01e03abd9bb8503f4464e3023cb5fb0307c66c5 Reviewed-on: https://chromium-review.googlesource.com/449057 Commit-Ready: Stephen Barber <smbarber@chromium.org> Tested-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="0" gerrit_number="449057" owner_email="smbarber@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/crosutils" project_url="https://chromium-review.googlesource.com/chromiumos/platform/crosutils" ref="refs/changes/57/449057/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I091534f26aef75419c788851722d30568ba7aa23" commit="7ff60c09f7d51dfa74d327b651c48f72f0e1a5e7" commit_message="container_utils: don't mount sysfs by default The OCI spec confusingly says that certain filesystems must be "made available" in containers, but it appears the onus is still on the container's config.json to say whether or not it wants those filesystems. However, to enforce a bare minimum of sanity, we will sanitize the mount options for the sysfs and procfs mounts if they are specified in the config. BUG=chromium:698104 TEST=container starts when sysfs is a mount in config.json CQ-DEPEND=CL:449057 Change-Id: I091534f26aef75419c788851722d30568ba7aa23 Reviewed-on: https://chromium-review.googlesource.com/431318 Commit-Ready: Stephen Barber <smbarber@chromium.org> Tested-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="0" gerrit_number="431318" owner_email="smbarber@chromium.org" pass_count="0" patch_number="8" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/18/431318/8" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="If6bcee4710fbbc976a736b48a95e612c999243e4" commit="3ca1caf72ac330f85f5e5e7f8b029294fdef28e2" commit_message="CRAS: test_client - Add log for number of overruns of streams Logs number of overruns of streams in audio thread log. Also, makes the device and stream info easier to read. BUG=chrome-os-partner:60786 TEST=cras_test_client --dump_a /tmp/log and check stream info contains num_overruns Change-Id: If6bcee4710fbbc976a736b48a95e612c999243e4 Reviewed-on: https://chromium-review.googlesource.com/447185 Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org> Tested-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="0" gerrit_number="447185" owner_email="cychiang@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/adhd" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/adhd" ref="refs/changes/85/447185/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I1a6e7056cd0bab40e2e597ca08ef524b7ff1207f" commit="f31ffb21efce3d16fd4d1d4faea1dc4633817f80" commit_message="CRAS: dev_stream - Avoid bursting captured data to stream When there are enough captured samples, only send captured data to input stream when time is late enough. Otherwise, client can not handle this much data. Note that stream with BULK_AUDIO_OK flag can still send data when there is enough data. BUG=chrome-os-partner:60786 TEST=make check TEST=Play sine tone use sox command. At the same time, use cras_test_client --loopback_f /tmp/lb.raw to record using loopback device. Check num_overruns in audio thread log. Also, check CAPTURE_POST in audio thread log and see the interval is roughly sleep interval. Change-Id: I1a6e7056cd0bab40e2e597ca08ef524b7ff1207f Reviewed-on: https://chromium-review.googlesource.com/447184 Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org> Tested-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="0" gerrit_number="447184" owner_email="cychiang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/third_party/adhd" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/adhd" ref="refs/changes/84/447184/6" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I7b2f1570c431738038f729bcdc3d4f5d9a399393" commit="7155f1f83e293928a25c38b52df7ae0d4590ae5b" commit_message="usb: create a dedicated folder for HAL implementations Create a dedicated folder to host all the HAL implementations. Move the existing usb HAL under the new hal/ folder. BUG=None CQ-DEPEND=CL:452277 TEST=`emerge-<board> arc-camera3-hal-usb` Change-Id: I7b2f1570c431738038f729bcdc3d4f5d9a399393 Reviewed-on: https://chromium-review.googlesource.com/452059 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@chromium.org> " fail_count="0" gerrit_number="452059" owner_email="jcliang@chromium.org" pass_count="0" patch_number="5" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/59/452059/5" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib1a17b6ecbcc48f8aed2295824b446e5cc935367" commit="357508584779b029ee59acd1a3f82f580335da38" commit_message="arc-camera3-hal-usb: install lib from the new build output location A new folder is created to host all the HAL implementations and the existing usb HAL is moved under it. The build output location is changed so update the ebuild accordingly. BUG=None CQ-DEPEND=CL:452059 TEST=`emerge-<board> arc-camera3-hal-usb` Change-Id: Ib1a17b6ecbcc48f8aed2295824b446e5cc935367 Reviewed-on: https://chromium-review.googlesource.com/452277 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@chromium.org> " fail_count="0" gerrit_number="452277" owner_email="jcliang@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/77/452277/3" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I60d5c6724fd047770ddd0af1d204571d59c6e25e" commit="936b77bf61a2916fb64b277db258e5dd358aa21a" commit_message="Electro: DP CTS testing failed in HBR2 deterministic Jitter Uploading CL according EE's requirement. Need to overwrite PS8751 Address: 0x16, offset: 0xD3, Data: 0x98 BUG=b:36044164 BRANCH=firmware-reef-9042.B TEST=`make -j BOARD=reef` Change-Id: I60d5c6724fd047770ddd0af1d204571d59c6e25e Signed-off-by: Ryan Zhang <Ryan.Zhang@quantatw.com> Reviewed-on: https://chromium-review.googlesource.com/451047 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Commit-Queue: Ryan Zhang <ryan.zhang@quanta.corp-partner.google.com> Tested-by: Ryan Zhang <ryan.zhang@quanta.corp-partner.google.com> (cherry picked from commit 1c39223ff9f970be69a62cbf4302fa3aa8f57647) Reviewed-on: https://chromium-review.googlesource.com/452647 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="452647" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/47/452647/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ifc4b11870d511d47e9607a2001d845ee1e153f7f" commit="2cd61eb71972e5d83c1e9c30cafdd759299ff49d" commit_message="g: fix sps interrupt assertion logic The SPI initialization interrupt needs to be generated only when there was actual data received while CS was asserted and after transaction finished (i.e. CS is de-asserted). BRANCH=cr50 BUG=b:35774896 TEST=verified on a bob with updated AP firmware Change-Id: Ifc4b11870d511d47e9607a2001d845ee1e153f7f Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/452792 Reviewed-by: Mary Ruthven <mruthven@chromium.org> " fail_count="0" gerrit_number="452792" 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/92/452792/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I33d96b9a8bb37836e062ed0afadaa677dde5776f" commit="1da79f6d18d5e4ec661ec6a9ee1064bd4fb47352" commit_message="mtools: update to 4.0.18-r2 for clang fixes BUG=chromium:644387 TEST=`emerge-amd64-generic mtools` works w/clang Change-Id: I33d96b9a8bb37836e062ed0afadaa677dde5776f Reviewed-on: https://chromium-review.googlesource.com/452160 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Yunlian Jiang <yunlian@chromium.org> " fail_count="0" gerrit_number="452160" owner_email="vapier@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/60/452160/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I35ea7571f53583496a2bc3ad571da7e57c682a0b" commit="89fcc157e744d2ef3f3762c6de2394c0e223cd0e" commit_message="status: remove unused global statement and sort import BUG=None TEST=status_unittest.py Change-Id: I35ea7571f53583496a2bc3ad571da7e57c682a0b Reviewed-on: https://chromium-review.googlesource.com/452280 Commit-Ready: Shun-Hsing Ou <shunhsingou@chromium.org> Tested-by: Shun-Hsing Ou <shunhsingou@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> " fail_count="0" gerrit_number="452280" owner_email="shunhsingou@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/80/452280/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ia3df2d5359cba5372bf68a5b8f9ddf6125beab9f" commit="19cc8efab60ec426fe323000428c2ce9d947dace" commit_message="installer: fix typos Fix some typos. BUG=none TEST=none Change-Id: Ia3df2d5359cba5372bf68a5b8f9ddf6125beab9f Reviewed-on: https://chromium-review.googlesource.com/452418 Commit-Ready: Youcheng Syu <youcheng@chromium.org> Tested-by: Youcheng Syu <youcheng@chromium.org> Reviewed-by: Pi-Hsun Shih <pihsun@chromium.org> " fail_count="0" gerrit_number="452418" owner_email="youcheng@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/18/452418/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iec132596ddb467ae5c419d52ac2d3f349c737893" commit="d9a9d5c71bd15e201bfa1a00e5e970ab84461673" commit_message="Fixed bug where file name was appended to some URLs When downloading a file the file name is appended to the url if it does not end with that file name. URLs are always lowercase, however files are not, thus if the case didn't match the file name would be appended again. BUG=b:35950125 TEST=None Change-Id: Iec132596ddb467ae5c419d52ac2d3f349c737893 Reviewed-on: https://chromium-review.googlesource.com/452745 Commit-Ready: Benjamin Peake <bpeake@chromium.org> Commit-Ready: Kris Rambish <krisr@chromium.org> Tested-by: Benjamin Peake <bpeake@chromium.org> Tested-by: Kris Rambish <krisr@chromium.org> Reviewed-by: Kris Rambish <krisr@chromium.org> " fail_count="0" gerrit_number="452745" owner_email="bpeake@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/45/452745/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Icb598cfa44b7d5060b44814aeecc93a27ca90e24" commit="d9ca7d27e2274c9d7f078afcc861f8fa208e4936" commit_message="Remove bot_config.py. It is now being managed by luci-config. Change-Id: Icb598cfa44b7d5060b44814aeecc93a27ca90e24 Reviewed-on: https://chromium-review.googlesource.com/444261 Commit-Ready: Kevin Cheng <kevcheng@chromium.org> Tested-by: Marc-Antoine Ruel <maruel@chromium.org> Reviewed-by: Kevin Cheng <kevcheng@chromium.org> " fail_count="1" gerrit_number="444261" owner_email="maruel@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/61/444261/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.14" change_id="I7f7ddff44c27b89717ae5add51d1b77e4f05e178" commit="36063d36446eed6c7a07e32e2610917027815355" commit_message="CHROMIUM: go2001: Disable fixed temporal layers. Temporal layers are not signalled to higher layers, resulting in worse prediction. Local testing show same quality (SSIM/PSNR) at 50-70% of bitrate (depending on clip) when running VideoEncodeAccelerator. BUG=chromium:700042 TEST=VEA unittests, manual SSIM/PSNR comparison, trybots Signed-off-by: Peter Bostrm <pbos@chromium.org> Change-Id: I7f7ddff44c27b89717ae5add51d1b77e4f05e178 Reviewed-on: https://chromium-review.googlesource.com/452439 Commit-Ready: Peter Boström <pbos@chromium.org> Tested-by: Peter Boström <pbos@chromium.org> Reviewed-by: Pawel Osciak <posciak@chromium.org> " fail_count="0" gerrit_number="452439" owner_email="pbos@chromium.org" 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/39/452439/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I27d2534a887a86f1233fa191309ec62f5739a104" commit="13ae3920a069832862852432141ad1268cd2fc56" commit_message="Increasing ping packet interval and uploading ping_loss to perf 1.Changing PING_INTERVAL to 0.5 from 0.2 to reduce ping packet loss 2.Upload the lost ping packet percentage to chrome performance dashboard. This will allow us to track the lost package percentage for all the boards over time. 3.Test n/A the result in case the ping packet loss greater than THRESHOLD BUG=chromium:496409 TEST=Tested against a device in lab (chromeos9-row1-cart2-host2) Change-Id: I27d2534a887a86f1233fa191309ec62f5739a104 Reviewed-on: https://chromium-review.googlesource.com/452807 Commit-Ready: Debayan Banerjee <debayanb@chromium.org> Tested-by: Debayan Banerjee <debayanb@chromium.org> Reviewed-by: Harpreet Grewal <harpreet@chromium.org> " fail_count="0" gerrit_number="452807" owner_email="debayanb@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/07/452807/5" remote="cros" total_fail_count="0"/><lkgm version="9353.0.0-rc3"/></manifest> |
