| <?xml version="1.0" encoding="utf-8"?><manifest revision="8bfe955fbac8d7e79525b66e6896f4495b3e1eb7"> |
| <notice>Your sources have been sync'd successfully.</notice> |
| <remote fetch="https://android.googlesource.com" name="aosp" review="https://android-review.googlesource.com"/> |
| <remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/> |
| <remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/> |
| <default remote="cros" revision="refs/heads/master" sync-j="8"/> |
| <project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="0f36410cec3fe0c95afa666f17198706c7669656" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="d710b3bbaf7a8253830cbe9d2e720ac8bde16251" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="8263a04a1e4e6e40ed479f62ac529874eb7675ef" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="a9a4938a099d1bf1a87798e021791bbe2e467d00" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="7e8cc3a53d98377729aee5a78f919febf6e8f4ea" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="aa6cda6f638bd57d3a024f0d201f723a5c3bb875" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="9d07a15cc8480a4ab913bcad00e1f4c4f26fc4ff" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="a763c2ddabdb9cb51057823e0d79e53d089427af" 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="d7d69e976d9de665df79b38834a8a6da6f88bc07" upstream="refs/heads/master"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="4a93e2cfc133473ae58f17374c32669eea9a8912" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="f246a322b16c15723800ea6c6414af3a29d79ee9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="5702f0baefc0c1321374d838f8fc27c18d79a2ae"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="f0c5aff204aa17afeaa3dd53ac107ffad7f3b1d7" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/docs" path="docs" revision="2e4d46ab32491f64aa29f40cbf6ae03c47cadd06" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="197d3841775d8d6dad43910b7e2d56c3489ab54d" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="6024a1b8244b5f81e8dc667d7395012cfb989104" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="704dbb824410432fcd5902ed41509f40735e7fd8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="34bf37975758ea446430286c6b314278a6d3a3d9" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="d5cd6b9c466cbc2c2437ed8da0da26156230dad7" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="09fa67dbdf1c040f71223e3813f312c514e30c20" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="3b2e58a6b66946911bd85c91926e64922083ee7e" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="3ace8d3fd8b6ec9593424d089d5a0255641758c4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="baa643f940a88a2ee5d4f9707ecdbac099d23186" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="07f5d5eb201c6f5c978df8f86e9e81907df54db1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="a2834cbe4e9cb85356e115afd4f4b2398745cf75" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="32463c6de8e8c98d4b1711937bc7678afc121a85" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="2f616acb24a31c40b9e47a2d2e001a0a3b6d159e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="50e26c0020940a88729ac3f2e194c5b5d475d8db" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="2f1ee8448a886ce1abad9c0e8741582244f8ab40" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="ea800d26846cc4bab2d5f3190062779dda49918b" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="f584aba61b21ceaca54a86cad71a1af41be0903a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="71501e0937c2df6b9d52caa6b684bf8092f4cbf8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="e9c27f993b264d36e04d1e0ae2ca04525f4f4c92" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="ee4e761b2853edc3889b54e77a930882928d04b0" 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="afcea5b99422fa047be11bbe965c9daea609b413" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="3423baba30cf213a8458ca09c35c73880d3e3fc3" 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="a658b716e03dbc9ace702f867cc9e327ac2e598a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="3285ffdd0924313a4f34f5f3ddce21b1ae53c452" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="569c40d63f6e26a21662c3c62ce3997331bbca6a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="da55e6cd18a13750b0fc417f8db6a310ad284231" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="43e38ba29ec1efeedca5fa72b68833b6199d1899" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="cc1deb44521d41125f5d617940a654c58c794325" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="a290471be8063ef1a1173d891e70ee6607d129ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="06551d8f9821df12e02b101dc4a5f4f17d07d433" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="c7ff5188fb31541c3c6173e8171155f965760883" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="df423df7f8f0c1a49fa8f0e5c9f67ee1527e2d3b" 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="2f9149b879159c08212599e75e97c119cb130210" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="17cc088dc198f626513d4154644d57553b69fefd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtplot" path="src/platform/mtplot" revision="5e4f631e633384751f582bd9db5f4d6eb2112494" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="8e83b1936d92fa4992d6597862d10b801fbaa097" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="4f1e106c96d72a1b5ac4b79bc8facf81b9458edb" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="c050715684a5dde3a4fc818f3de816a407fdb2de" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="638d4895cdde26daa446099844d0a1cef6d1397d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="95a5fb7a1e4526ed8c8e641431f66f22f302cddc" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="706ec30569f2a99ba83b66b94eb3c5f1d744ad5a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="9546ffbb37d5fef191ad1607eeb0b76a6f3a9872" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="4a4e4cd4aae6f8b5fb5ca0f34b8e937835b08f08" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="04b3835b69606429f6e47234e1f730b62bd5ee75" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="0ed732a09b5cd199e4741624437aa0a85866e3c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="e2b1fe70d712d2d8f32084ec1ab500e8e74c12f9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="98e29a3dbd0eca277490a184016838821d99f112" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="20532baaae557c9c75121bca7bbe93225600c46e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="a0aab94fc9aaacabb198c01d560d29ac19a89900" 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="4fd4af26cb650d34876c058a7142c91233ba5475" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="0a95fb5fca6f6c7664998f3bce98e5fea36ed300" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="0aa7b86ce8965b35d932c3cc0c422905ed491e77" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="534d81c399fee7b82d5beae4f455e5f1bfb0b466" upstream="refs/heads/chromeos-5.44"/> |
| <project name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="a840167ce019b8e897ee91bba630dbdba9150d0b" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="f21d857fde838f7cb141f81c49070abbdf343fce" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="904f49fd770dd559800523edd91c1226e131655d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="b6e26e656c0696ccd1715a6d2c9acee75ab0c092" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/gdata" path="chromite/third_party/gdata" revision="fe7e5c90a9827feb66ed446b2d297a1618b25272" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/> |
| <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="44f77cf24f45557f5901172057f4b278a388abf5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="a07f7158fe3af528a2cd2c3fcf9c1011bcd0c09e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="161c244c9ec418dee34bd4843c15f61e58bd86ae" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="7295bb75a26abf5c35d6455f50deea508e352b0a" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="35fc55b0f38a5a24903a67ca6846518c62a96e8d" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="7a59b114a1da158fee0a3c161e391b98a397376d" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="172361c8f5ed530157021dfea3eeb3ec7faf9e25" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="45af45ae8cb009598791dbbc8b829dee58ec0bc6" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="9dc621e77e7e4f3c045831021b04d19997d3deb5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="0c7748b56694e9b00537f27bbe9edb11c78ce08f" upstream="refs/heads/chromeos-2.4.70"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="44b84986b429c153e6c63d9207639b3f432d5021" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="ddb03e7d818f26bac8a7ff04ba0135ac3e73047b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libresample" path="src/third_party/libresample" revision="cc9f20f439396b7d45e94b8301edd95d33f26a46" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="b45c53f9418a6eff2c8ed98703a55f96029304b1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="199fe31115c76231746f5953271795d58679561c" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="c9edfa218e5a5972531b6f4a3ece8d33a44ae1b5" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="3279c2825684c7009775b731d0a9e37815778282" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="e79d5093d0c93b9072f45415b29e12b2740db25e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="c5281d524ffc9ecd4873e5fc21587dc0f4a350b5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="6f6a1b0463ea19bbc53bdbc4ca48718e5ffa407a" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="9baf1ff8fc06d8c986e55465f77427d416ecd710" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/> |
| <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="636fe4d2ce8fdbbaf2d1668e4ddf4824d6837378" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="eaf6403e050faa9239890519c00d354b6108df25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="3ccfed9fd25d8e3c01e5be7d737e8d478fb46f70" upstream="refs/heads/chromeos-2.2.12"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="b9b8f1de0ab9d4b0e1739d7c0dc4ec232b85a5c3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="3cd8fe58f994440d2e5e6238e45611b9f2dc709c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="8ccda0f645b65dc82f8676ce321406938a35d0b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="92a823f8fa2e20a695e02f7aaa7687f57ed9f223" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="cb2de5a810df1898cd3ae47d517603b8b12371c0" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="31f4933a54cce7b157619eb1dd14ea32bec39279" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="f6e2acc3f21e8b7c9eec4a8871a65f50381daacf" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="034744b823858c611607d0328aee4d5f01b59cec" 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="8e5fb46e875e2e5c3656c4811d90408102ed3a96" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="9d13629b756685c6b9f23dc9a51cec41ec8e4874" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="1e705dad853445419ccc8d35d82de263e91de3f3" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="refs/heads/master"/> |
| <project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="98f4a938cbc4acaff5f06009af50bb4bf19e173b" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="c80811581709b9346364e3229b888f9ad830cdf5" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="32c89c19b042a12b5a1bf0153299154ea5435c03"/> |
| <project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.18" change_id="I1d765309efdee897fab491098e2954073d266d30" commit="54efbd1e6443aeeefbccd8f90ce5f12d72488077" commit_message="UPSTREAM: drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed To save a bit of power, let's try to turn off the TMDS output buffers in DP++ adaptors when we're not driving the port. v2: Let's not forget DDI, toss in a debug message while at it v3: Just do the TMDS output control based on adaptor type. With the helper getting passed the type, we wouldn't actually have to check at all in the driver, but the check eliminates the debug output more honest Cc: stable@vger.kernel.org Cc: Tore Anderson <tore@fud.no> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Shashank Sharma <shashank.sharma@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462216105-20881-4-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> (cherry picked from commit b2ccb822d376d1bbbe5d1f9118d1488b25e6bc6d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I1d765309efdee897fab491098e2954073d266d30 Reviewed-on: https://chromium-review.googlesource.com/421935 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421935" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/421935/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I0558f30bee19ef8a973d6f0bd69f34908f80f785" commit="1ba3f65fb5603f7ff78fd3b60242d310b9460974" commit_message="UPSTREAM: drm/atomic: Add drm_atomic_helper_best_encoder() Add (struct drm_connector_helper_funcs *)->best_encoder callback helper for connectors that support exactly 1 encoder, statically determined at driver init time. Signed-off-by: Noralf Trnnes <noralf@tronnes.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462982962-10530-6-git-send-email-noralf@tronnes.org (cherry picked from commit 9ecb549867d7f642f0379f574f0e52870009a8bf) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I0558f30bee19ef8a973d6f0bd69f34908f80f785 Reviewed-on: https://chromium-review.googlesource.com/421936 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421936" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/421936/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I0fcb17993e39c78b2d6641876e896f420e6edd35" commit="03232525fc5b3b09927bdab40614653577c45e33" commit_message="UPSTREAM: drm/i915: Drop checks for max_pixclk failures in cdclk computation commit 565602d7501a ("drm/i915: Do not acquire crtc state to check clock during modeset, v4.") removed the possibility that intel_mode_max_pixclk() or ilk_max_pixel_rate() might return an error, so let's get rid of the error checks in the callers as well. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Mika Kahola <mika.kahola@intel.com> Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-2-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit e1ff5f0126cd83b149060171a84a4b33972ea28b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I0fcb17993e39c78b2d6641876e896f420e6edd35 Reviewed-on: https://chromium-review.googlesource.com/421937 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421937" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/37/421937/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I4c5d49ce43e50a7043c811182d474bbd34448048" commit="62a1fb849d2f7dafc085d8c7ea1db6f863c92aa4" commit_message="UPSTREAM: drm/i915: Extract broadwell_calc_cdclk() Try to reduce the amount of duplicated cdclk magic numbers by moving the max_pixclk->cdclk conversion into a helper. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 587c7914154921ffa819aa61ef9057e68e9ad73f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I4c5d49ce43e50a7043c811182d474bbd34448048 Reviewed-on: https://chromium-review.googlesource.com/421938 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421938" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/38/421938/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I797eb5787f304026d4e31e9210198d814c99839d" commit="875d5e257184a0479f22f293c5ec3cdc747ad368" commit_message="BACKPORT: drm/i915: Untangle .fdi_link_train and cdclk vfunc setup Split the .fdi_link_train and .modeset_commit_cdclk/.modeset_calc_cdclk into two separate if ladders. Much easier to read when you're not confusing two totally separate subjects. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-4-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 445e780b894105a7a4e97810a3a190e30b8f47b6) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor conflict in intel_init_display due to IS_CHERRYVIEW check and dev/dev_priv argument change drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I797eb5787f304026d4e31e9210198d814c99839d Reviewed-on: https://chromium-review.googlesource.com/421939 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421939" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/421939/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ia579db94343d43fded836ef1a39e812849a63c35" commit="aa7c935867a1bc2aad897731f89dfa260d83e6ca" commit_message="UPSTREAM: drm/i915: Don't pass dev_priv to broxton_calc_cdclk() broxton_calc_cdclk() doesn't need dev_priv for anything, so let's not bother passing it around. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-5-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit c44deb6caf074430944dd1a4879cf76217dae9d0) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia579db94343d43fded836ef1a39e812849a63c35 Reviewed-on: https://chromium-review.googlesource.com/421940 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421940" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/421940/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I5122cdb87157aa69577483b59187ae80447637ef" commit="30827a252298e645380970493c110d21650f607c" commit_message="BACKPORT: drm/i915: Use ilk_max_pixel_rate() for BXT cdclk calculation BXT uses the "pch" panel fitter configuration, so we can use ilk_max_pixel_rate() instead of intel_mode_max_pixclk() to compute the pipe pixel rate. ilk_max_pixel_rate() will account for the pipe scaler downscaling factor whereas intel_mode_max_pixclk() will not. I'm pretty sure the same limitation is there on GMCH platforms, but no one just bothered to implement the downscaling adjustment for them. Probably should just unify the panel fitter setup more across the platforms and use the exact same code on all platforms for this. But in the meantime, let's at least make BXT a bit more correct. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-6-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 4e5ca60fd35a2f042902e8047c1273aa79409977) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I5122cdb87157aa69577483b59187ae80447637ef Reviewed-on: https://chromium-review.googlesource.com/421941 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421941" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/421941/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I7bd528b887d4209aa7598fccbe10806591a7b0e3" commit="c3c2f8c122980e5f7fc05af981495d998359de95" commit_message="BACKPORT: drm/i915: Use skl_cdclk_decimal() on bxt Both SKL and BXT need to fill in the "decimal" cdclk frequency into the CDCLK_CTL register. SKL uses a small helper to do the kHz->"decimal" conversion, whereas BXT has it open-coded. Use the helper on BXT too. While at it, change it to round to closest rather than down. It doesn't actually matter with the frequencies we have to deal with, but it seems like the right thing to do. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-7-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 92891e45c313e22095c90eb36b283a3b39e90bd4) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Conflict due to change in signature of broxton_set_cdclk drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I7bd528b887d4209aa7598fccbe10806591a7b0e3 Reviewed-on: https://chromium-review.googlesource.com/421942 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421942" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/421942/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Iebd9ee4b1584b34bc937ee6c4d0db1b987883523" commit="48d4efae1f7089414fc105658925238c451a31fc" commit_message="UPSTREAM: drm/i915: Remove 10% cdclk guardband on BXT We don't need any pixel clock vs. cdclk guardband since HSW. BXT still tries to add one though. Get rid of it. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-8-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 760e1477260a1c83503f93c1fa3e94df81ba474d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Iebd9ee4b1584b34bc937ee6c4d0db1b987883523 Reviewed-on: https://chromium-review.googlesource.com/421943 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421943" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/421943/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Icb7e88ec981cfaea794e47421f2eea3d43fbc6d6" commit="15ae9b845306ac1afed2793b4ccdea3008ce48c9" commit_message="UPSTREAM: drm/i915: Extract skl_dpll0_disable() Make thins a bit easier to read by extracting the SKL DPLL0 disable into separate functions. We already have the enable counterpart. Down the line this will also help make the cdclk programming on SKL, BXT, and following platforms look rather consistent. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-9-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 430e05de7607911c9e5b872fc94b8416c153325e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Icb7e88ec981cfaea794e47421f2eea3d43fbc6d6 Reviewed-on: https://chromium-review.googlesource.com/421944 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421944" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/421944/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I03d4656d36de70c8f620be1688e98e614619f893" commit="ec50029f8ddcce9c350411e58e87ae4fd1268c56" commit_message="UPSTREAM: drm/i915: Kill off dead code from skl_dpll0_enable() We calculate the CDCLK_CTL value from scratch so no need to attempt some form of RMW first. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-10-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 4b6cd64eb94cca95e8a9ad0d3888f627e4070cff) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I03d4656d36de70c8f620be1688e98e614619f893 Reviewed-on: https://chromium-review.googlesource.com/421945 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421945" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/421945/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I3d431ff97ac38da041c1173526c4f02761c402a4" commit="ece58c99887a673eb25ec517910dd7fc44b4a575" commit_message="BACKPORT: drm/i915: s/freq/cdclk/ Rename the generic sounding freq/frequency parameters to the cdclk functions to 'cdclk' so that we'll know which clock we're talking about once we have to deal with the vco frequencies as well. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-11-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 9ef56154d4b18c6916c1b64bc0cd4b12ccd6fb2d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Conflict due to change in signature of broxton_set_cdclk in drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I3d431ff97ac38da041c1173526c4f02761c402a4 Reviewed-on: https://chromium-review.googlesource.com/421946 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421946" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/421946/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I859c46aef217badb160f377e677353f87fd6d230" commit="2d983cb48311f93d6dff3e910e97260748dc4911" commit_message="UPSTREAM: drm/i915: s/required_vco/vco/ in skl cdclk code The 'required' part of 'required_vco' should be obvious. Let's just call it 'vco' for brevity. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-12-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 3861fc607e64aeefa1e480657bd57f269d0e4129) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I859c46aef217badb160f377e677353f87fd6d230 Reviewed-on: https://chromium-review.googlesource.com/421947 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421947" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/421947/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I89030751ceb79423b3bbe4d9b7c207f37fb63539" commit="ba4635dc2de49ed2e86088a33599919fc22eca9f" commit_message="UPSTREAM: drm/i915: Program BXT_CDCLK_CD2X_PIPE BXT could change the CD2X divider synchronized with a single pipe. So assuming the DE PLL frequency doesn't need to be changed, we could change cdclk without shutting off the pipe (when only a single pipe is enabled). In the meantime let's configure CDCLK_CTL for non-double buffered CD2X update, although it shouldn't really matter as long as the selected pipe is disabled when reprogramming the divider. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-13-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 7fe6275721c26ba84bd1ce13b2d2ecce382006bf) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I89030751ceb79423b3bbe4d9b7c207f37fb63539 Reviewed-on: https://chromium-review.googlesource.com/421948 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421948" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/421948/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I260e71fb1bdce9d2b0b85689f07fb4cd6d734366" commit="8a17b743f2b67eeff4ef5800f2cc1c73bc691951" commit_message="UPSTREAM: drm/i915: Eliminate the CDCLK_CTL RMW on BXT All the fields in CDCLK_CTL we don't program should be left at zero, so let's just get rid of the RMW. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-14-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit b8e757057d6a1fe2d5fdc195e6a6fc36b349e9cd) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I260e71fb1bdce9d2b0b85689f07fb4cd6d734366 Reviewed-on: https://chromium-review.googlesource.com/421949 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421949" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/421949/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ida1a5c0d78f6796f0ff841f3f4228397c6b8aa82" commit="8d5bc6f1d89dcce4af0dd87fabb3d6e8eda9fa71" commit_message="UPSTREAM: drm/i915/fbdev: Fix num_connector references in intel_fb_initial_config() During boot time, MST devices usually send a ton of hotplug events irregardless of whether or not any physical hotplugs actually occurred. Hotplugs mean connectors being created/destroyed, and the number of DRM connectors changing under us. This isn't a problem if we use fb_helper->connector_count since we only set it once in the code, however if we use num_connector from struct drm_mode_config we risk it's value changing under us. On top of that, there's even a chance that dev->mode_config.num_connector != fb_helper->connector_count. If the number of connectors happens to increase under us, we'll end up using the wrong array size for memcpy and start writing beyond the actual length of the array, occasionally resulting in kernel panics. Note: This is just polish for 4.7, Dave Airlie's drm_connector refcounting fixed these bugs for real. But it's good enough duct-tape for stable kernel backporting, since backporting the refcounting changes is way too invasive. Cc: stable@vger.kernel.org Signed-off-by: Lyude <cpaul@redhat.com> [danvet: Clarify why we need this.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1463065021-18280-2-git-send-email-cpaul@redhat.com (cherry picked from commit 14a3842a1d5945067d1dd0788f314e14d5b18e5b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ida1a5c0d78f6796f0ff841f3f4228397c6b8aa82 Reviewed-on: https://chromium-review.googlesource.com/421950 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421950" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/421950/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I330b5b151e7d41fdadcb7f4fa82bb6d54d1de508" commit="f2214373211d459e6fa57601c0a25dc5b131fc3e" commit_message="UPSTREAM: drm/fb_helper: Fix references to dev->mode_config.num_connector During boot, MST hotplugs are generally expected (even if no physical hotplugging occurs) and result in DRM's connector topology changing. This means that using num_connector from the current mode configuration can lead to the number of connectors changing under us. This can lead to some nasty scenarios in fbcon: - We allocate an array to the size of dev->mode_config.num_connectors. - MST hotplug occurs, dev->mode_config.num_connectors gets incremented. - We try to loop through each element in the array using the new value of dev->mode_config.num_connectors, and end up going out of bounds since dev->mode_config.num_connectors is now larger then the array we allocated. fb_helper->connector_count however, will always remain consistent while we do a modeset in fb_helper. Note: This is just polish for 4.7, Dave Airlie's drm_connector refcounting fixed these bugs for real. But it's good enough duct-tape for stable kernel backporting, since backporting the refcounting changes is way too invasive. Cc: stable@vger.kernel.org Signed-off-by: Lyude <cpaul@redhat.com> [danvet: Clarify why we need this. Also remove the now unused "dev" local variable to appease gcc.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1463065021-18280-3-git-send-email-cpaul@redhat.com (cherry picked from commit 255f0e7c418ad95a4baeda017ae6182ba9b3c423) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I330b5b151e7d41fdadcb7f4fa82bb6d54d1de508 Reviewed-on: https://chromium-review.googlesource.com/421951 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421951" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/421951/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ia272bd69c9d2b1643ba32be2ab04c2441b31479b" commit="be4a48eed6fc3276d8c980faa6f12520d51e0c28" commit_message="UPSTREAM: drm/i915: Simplify control flow in intel_atomic_check a bit. - Unconditionally add plane states. Core helpers would have done this in drm_atomic_helper_check_modeset, doing it once more won't cause harm and is less fragile. - Simplify the continue logic when disabling a pipe. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462779085-2458-1-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit af4a879e0cb29b2cf35ff7559d32304783012534) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia272bd69c9d2b1643ba32be2ab04c2441b31479b Reviewed-on: https://chromium-review.googlesource.com/421952 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421952" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/421952/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Id7d6faa8242fe312a8dc4b0a76c27f55d1d869cb" commit="ffb2c5eea84ef216b204f03afce1a063fed1b789" commit_message="UPSTREAM: drm: Avoid connector reference imbalance on error path Whilst looking at the fallout from using connector references for atomic, I noticed that there is an early return buried in drm_atomic_set_crtc_for_connector() that if hit could cause us to leak a reference on the connector. Fixes: d2307dea14 (drm/atomic: use connector references (v3)) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Stone <daniels@collabora.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dave Airlie <airlied@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462535265-13058-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit e2d800a3ce1b16a9c25fc6ca91f26df5509ca11d) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Id7d6faa8242fe312a8dc4b0a76c27f55d1d869cb Reviewed-on: https://chromium-review.googlesource.com/421953 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421953" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/421953/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ibdc83e584521ed5442eb8abce3c7d0fa58ab067b" commit="78254c2919d7693ad9140b72a2fb46b8e0a8d734" commit_message="UPSTREAM: drm: Fix error handling in drm_connector_register When debugfs or sysfs registration failed, we failed to clean up the idr registration. Reorder to fix this. Cc: Dave Airlie <airlied@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462539302-27764-1-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit fdf2c85f26a656df3c9ef2114ff508a4be26bbff) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ibdc83e584521ed5442eb8abce3c7d0fa58ab067b Reviewed-on: https://chromium-review.googlesource.com/421954 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421954" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/421954/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I32dbf0ffcd95e20f4760aafb081779a8f9d1e934" commit="6a8e5e8bf09678b37151c4733ad78b22124d4dbb" commit_message="UPSTREAM: drm/i915: Fix BXT min_pixclk after state readout commit 4e5ca60fd35a ("drm/i915: Use ilk_max_pixel_rate() for BXT cdclk calculation") tried to change BXT to use ilk_max_pixel_rate() to compute the pipe pixel rate. I failed to notice that there was another place in the state readout code that needs the same treatment. So let's change that one too. Should probably just change things to always compuyte the pipe pixel rates, instead of just doing on platforms that can change cdclk dynamically. But for now let's just move BXT fully over to the side that uses ilk_pipe_pixel_rate(). Cc: Jani Nikula <jani.nikula@intel.com> Fixes: 4e5ca60fd35a ("drm/i915: Use ilk_max_pixel_rate() for BXT cdclk calculation") Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-2-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 9558d15dc2df1bf699b92836f815a5e70c76f17a) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I32dbf0ffcd95e20f4760aafb081779a8f9d1e934 Reviewed-on: https://chromium-review.googlesource.com/421956 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421956" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/421956/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I8941251c8175997d083182930866792a8abcd1e5" commit="40db240e17daa1466843a10aa40780d20d032408" commit_message="BACKPORT: drm/i915/skl: SKL CDCLK change on modeset tracking VCO WARNING: Using ChromeOS with an eDP panel and a 4K@60 DP monitor connected to DDI1 the system will hard hang during a cold boot. Occurs when DDI1 is enabled when the cdclk is less then required. DP connected to DDI2 and HPD on either port works correctly. Set cdclk based on the max required pixel clock based on VCO selected. Track boot vco instead of boot cdclk. The vco is now tracked at the atomic level and all CRTCs updated if the required vco is changed. Not tested with eDP v1.4 panels that require 8640 vco due to availability. V1: initial version V2: add vco tracking in intel_dp_compute_config(), rename skl_boot_cdclk. V3: rebase, V2 feedback not possible as encoders are not aware of atomic. V4: track target vco is atomic state. modeset all CRTCs if vco changes V5: rename atomic variable, cleaner if/else logic, use existing vco if encoder does not return a new vco value. check_patch.pl cleanup V6: simplify logic in intel_modeset_checks. V7: reorder an IF for readability and whitespace fix. V8: use dev_cdclk for tracking new cdclk during atomic V9: correctly handle vco 8640 when crtcs==0 V10: Clean up if else in crtcs==0 V11: Rebase for new intel_dpll_mgr.c Reviewed-by: Ville Syrjl <ville.syrjala@linux.intel.com> Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com> [vsyrjala: rebased due to churn] Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-3-git-send-email-ville.syrjala@linux.intel.com (cherry picked from commit c89e39f32763bbaeba0b66606bda7893a25489ac) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Fixed compilation error in intel_modeset_readout_hw_state Hunk to be applied on intel_atomic_commit applied onto modeset_update_crtc_power_domains drivers/gpu/drm/i915/intel_display.c Minor conflict in struct intel_atomic_state drivers/gpu/drm/i915/intel_drv.h BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I8941251c8175997d083182930866792a8abcd1e5 Reviewed-on: https://chromium-review.googlesource.com/421957 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421957" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/421957/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I2d965442c6c556cdabbb6e4171e3fb6fe68064c2" commit="810de9cf2c629604624444d2918f1e974fdb6f36" commit_message="UPSTREAM: drm/i915: Move the SKL DPLL0 VCO computation into intel_dp_compute_config() Shared plls won't get assigned until the .compute_clocks() hook gets called, which happens from the crtc .atomic_check hook. That's too late as the cdclk computation has already happened. So let's move the DPLL0 VCO computation into intel_dp_compute_config() so that it's done when the cdclk computation happens. Also only do it for eDP since we only pick DPLL0 for eDP. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-4-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 14d41b3b0e2ffbed309e68c87031986016d7bcac) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I2d965442c6c556cdabbb6e4171e3fb6fe68064c2 Reviewed-on: https://chromium-review.googlesource.com/421958 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421958" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/421958/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Iaf9df61b9b11a977c1e3f46fb20be97338033ffd" commit="0b812d7268baa26fc5691043ae2069cf9c113aaf" commit_message="UPSTREAM: drm/i915: Extract skl_calc_cdclk() We have many places where we want to pick a suitable cdclk frequency for skl based on the dotclock and lcpll vco. Split that code into a small helper and call it from all over. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-5-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit a8ca49345253923059df2663f48e72039095f63e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Iaf9df61b9b11a977c1e3f46fb20be97338033ffd Reviewed-on: https://chromium-review.googlesource.com/421959 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421959" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/421959/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ic2c26ce2bf3af40fcde0f2f3b618bef23fd10181" commit="801e7a02a2fd91995f9da92d2d0a5f2b008968bb" commit_message="BACKPORT: drm/i915: Actually read out DPLL0 vco on skl from hardware Currently we're trying to guess which lcpll vco frequency is used use based on the cdclk. That doesn't work for cdclk==540 since both vco frequencies can generate a 540 Mhz output. Let's stop guessing and just read the actual vco frequency from the hardware. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-6-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit ea61791e598e3ddd26578958246c6ea631eeefbb) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor conflict in intel_ddi_pll_init drivers/gpu/drm/i915/intel_dpll_mgr.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ic2c26ce2bf3af40fcde0f2f3b618bef23fd10181 Reviewed-on: https://chromium-review.googlesource.com/421960 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421960" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/421960/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Ie856a253ae0ba12da413bfacc4a0fa963d0dc03f" commit="aa0061468b5fd6019c5344ec221a5954bc05ef07" commit_message="UPSTREAM: drm/i915: Report the current DPLL0 vco on SKL/KBL Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-7-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 2f2a121aba7652608bbe84574241e799cad35a73) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ie856a253ae0ba12da413bfacc4a0fa963d0dc03f Reviewed-on: https://chromium-review.googlesource.com/421961 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421961" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/421961/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I36cbcd436d5f21a59d0bef46d218b95b636ffdc5" commit="76f6cd3db932e555a818771f17608458ee6654e6" commit_message="UPSTREAM: drm/i915: Allow enable/disable of DPLL0 around cdclk changes on SKL In case we originally guessed wrong which lcpll vco frequency to use, we will need to shut down the pll and restart it when reprogamming the cdclk. This also allows us to track the actual vco frequency in dev_priv instead of just a guess. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-8-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 1cd593e009db55d5844056305309bb52639d71a8) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I36cbcd436d5f21a59d0bef46d218b95b636ffdc5 Reviewed-on: https://chromium-review.googlesource.com/421962 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421962" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/421962/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I7136951f70c77de1a5a62a227f728fa9736c1ddd" commit="d8408003104fd9003ff1cde023745438fc37cd07" commit_message="BACKPORT: drm/i915: Keep track of preferred cdclk vco frequency on SKL Now that skl_vco_freq tracks the actual DPLL0 vco frequency, we'll need something that keeps track of which vco frequency we want to use in case the current vco is 0. This would be important across supend/resume since we'll disable DPLL0 around those parts. We'll also update our idea of max cdclk/dotclock when the preferred vco changes. That could happen if out initial guess was wrong, and later eDP would force us to change it. One issue here could be that changing the max dotclock could cause our mode list to change during next time the displays get probed. But I don't see a good way to avoid that, except perhaps by allowing either vco frequency to be used as needed. But the docs suggest that such usage wasn't really inteded. Also need to make sure we don't update our max_cdclk value before we have a preferred vco value, which means moving that to happen after the cdclk sanitation. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-9-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit b204535204fe9c1f647195ca587f210b18249904) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context changes in intel_update_max_cdclk, intel_update_cdclk drivers/gpu/drm/i915/intel_display.c Minor context change in intel_ddi_pll_init drivers/gpu/drm/i915/intel_dpll_mgr.c Minor context change in drivers/gpu/drm/i915/intel_drv.h BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I7136951f70c77de1a5a62a227f728fa9736c1ddd Reviewed-on: https://chromium-review.googlesource.com/421963 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421963" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/421963/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I9cf19f3e80e7c384c520d064aa1b8ad7ee9fc86c" commit="5468d2bf74ff96d7edd4c8b06a33081817f7709f" commit_message="UPSTREAM: drm/i915: Beef up skl_sanitize_cdclk() a bit Also verify the DPLL_CTRL1 register value in skl_sanitize_cdclk(), throw out a few unneeded variables, and write the CDCLK_CTL check a bit more legible way. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-10-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 09492498ee631041bfc60f2dc1960e246b8a7120) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I9cf19f3e80e7c384c520d064aa1b8ad7ee9fc86c Reviewed-on: https://chromium-review.googlesource.com/421964 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421964" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/64/421964/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="Id0f4af01b1d4e31c191698739a571807da467b88" commit="edadbbe4811fe94d93efc961b52ed0634116db7d" commit_message="BACKPORT: drm/i915: Unify SKL cdclk init paths Currently we initialize cdclk on SKL from two different places, depending on whether it's during driver init or resume. Let's unify it to happen from the same place always, and that place will be the display core init function. To do this we first run through the cdclk sanitation code, which will first verify that the PLL is programmed correctly, after which we can read out the current cdclk frequency, and once the cdclk is known we verify that the cdclk "decimal" frequency is programmed correctly. If any of these fail we will force a cdclk change, and to be safe we also force the PLL to be turned off and on again. If the sanitation step didn't notice anything amiss, we'll skip the cdclk programming which will prevent cdclk reprogramming when the displays might be active. We can also toss in a few WARNs about the register values into skl_update_dpll0() since we now know that the PLL state should always be sane when that function is called. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-11-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 9f7eb31af2968a194b29f67ec10776685a81afc9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor context change in intel_ddi_pll_init drivers/gpu/drm/i915/intel_dpll_mgr.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Id0f4af01b1d4e31c191698739a571807da467b88 Reviewed-on: https://chromium-review.googlesource.com/421965 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421965" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/421965/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I491513bb1abbdd7c145dbdd7a7b545372460b416" commit="f44ab7948237ffe5a70b0d47057aacaae39bdce7" commit_message="BACKPORT: drm/i915: Move SKL+ DBUF enable/disable to display core init/uninit SKL and BXT have the same snippets of code for enabling disabling the DBUF. Extract those into helpers and move the calls from init/unit_cdclk() to the display core init/init since this stuff isn't really about cdclk. Also doing the enable twice shouldn't hurt since you're just setting the request bit again when it was already set. We can also toss in a few WARNs about the register values into skl_get_dpll0_vco() now that we know that things should always be sane there. Flatten skl_init_cdclk() while at it. v2: s/skl/gen9/ in function names (Imre) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-12-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 70c2c184065e642642b563ae36ff3db682a5eee0) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Change in broxton_uninit_cdclk due to dev/dev_priv argument change drivers/gpu/drm/i915/intel_display.c Skip applying hunks onto bxt_display_core_[,un]init drivers/gpu/drm/i915/intel_runtime_pm.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I491513bb1abbdd7c145dbdd7a7b545372460b416 Reviewed-on: https://chromium-review.googlesource.com/421966 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="0" gerrit_number="421966" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/421966/8" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I4f8b768794815eded743d334de5d61828dc663fc" commit="905a1868a61113fccd5ec6614fa34ca3c8c90a5e" commit_message="UPSTREAM: drm/i915: Make 308 and 671 MHz cdclks more accurate on SKL The SKL 308.57 MHz cdclk is probably 8640/28 = ~308.571 Mhz. Similartly the 617.14 MHz cdclk is probably 8640/14 = ~617.143 MHz. Let's use the slightly more accurate numbers. Potentially we might change to computing all of these based on dividers, but let's stick to the current theme for now.. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-13-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 487ed2e4e9d62363ddd5fab2407100d3436fd0c9) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I4f8b768794815eded743d334de5d61828dc663fc Reviewed-on: https://chromium-review.googlesource.com/421967 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421967" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/421967/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ia92b048ddb0420a71c5daa0881b6074430518fc3" commit="3e5ad1d8ae77613dd8c18ab36ece1525dc6d0a5d" commit_message="BACKPORT: drm/i915: Rename skl_vco_freq to cdclk_pll.vco We'll want to store the cdclk PLL (whatever PLL that is in reality) vco frequency somewhere on other platforms too, so let's rename the skl_vco_freq to cdclk_pll.vco, and let's store it in kHz instead of MHz to match most of the other clocks. v2: Drop the spurious > vs != change (Imre) Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-14-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 63911d7295524e59205ecfa3b2db437544c52eb8) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Applied the hunk onto modeset_update_crtc_power_domains instead of intel_atomic_commit drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia92b048ddb0420a71c5daa0881b6074430518fc3 Reviewed-on: https://chromium-review.googlesource.com/421968 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421968" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/421968/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I540a80b0d19b7fcdaf5b199c4a27546a9a4777d1" commit="fb76e7750b3c787e32d35e98f8935d2ca046dd3a" commit_message="UPSTREAM: drm/i915: Store cdclk PLL reference clock under dev_priv Future platforms will have multiple options for the cdclk PLL reference clock, so let's start tracking that under dev_priv alreday on SKL, although on SKL it's always 24 MHz. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-15-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 709e05c3c46e866243f369a46ca5552a5c1e6b44) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I540a80b0d19b7fcdaf5b199c4a27546a9a4777d1 Reviewed-on: https://chromium-review.googlesource.com/421969 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421969" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/421969/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I7878dbe1321131eaae7be8ee7af2fe0fcb76c8c3" commit="0e05e9b8217de0ab8adc6d7cb3de0106bb3b665a" commit_message="BACKPORT: drm/i915: Extract bxt DE PLL enable/disable from broxton_set_cdclk() Enabling and disalbing the DE PLL are two nice self contained operations, so let's move them into a few small helper functions. Makes it easier to see the forest from the trees in broxton_set_cdclk(). Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-16-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 2b73001e739d3db8474472b7e6585ef9ee4b946e) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor conflict in drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I7878dbe1321131eaae7be8ee7af2fe0fcb76c8c3 Reviewed-on: https://chromium-review.googlesource.com/421970 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421970" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/421970/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ia7ee66c9cc21337b3f62dbeaff948606992f58c0" commit="c54df75377dc84eb6afc870435532138a424735a" commit_message="UPSTREAM: drm/i915: Store BXT DE PLL vco and ref clocks in dev_priv We have need to know the DE PLL refclk and output frequency in various cdclk calculations, so let's store those in dev_priv. Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-17-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 83d7c81f6a6a28b7c3f3512b1d09d37593aaa43b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia7ee66c9cc21337b3f62dbeaff948606992f58c0 Reviewed-on: https://chromium-review.googlesource.com/421971 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421971" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/421971/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ia68e9b223589d6d7952cbd94c6a88e6e287836bc" commit="3460479fbc645fe08b433749cf221628e5b33cc2" commit_message="UPSTREAM: drm/i915: Rewrite broxton_get_display_clock_speed() in terms of the DE PLL vco/refclk Now that we've read out the DE PLL vco and refclk, we can just use them in the cdclk calculation. While at it switch over to DIV_ROUND_CLOSEST(). Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-19-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit f59862422d6cf4980a6bad23a2e53c25273b9c63) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia68e9b223589d6d7952cbd94c6a88e6e287836bc Reviewed-on: https://chromium-review.googlesource.com/421972 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421972" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/421972/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I4c2d6d7a2d830e696563ac0173dcc8fa6fb54976" commit="49f81af160993e5aeb2fbb4692379a0c58ad5ce1" commit_message="BACKPORT: drm/i915: Make bxt_set_cdclk() operate in terms of the current vs target DE PLL vco Make bxt_set_cdclk() more readable by looking at current vs. target DE PLL vco to determine if the DE PLL needs disabling and/or enabling. We can also calculate the CD2X divider simply as (vco/cdclk) instead of depending on magic numbers. The magic numbers are still needed though, but only to map the supported cdclk frequencies to corresponding DE PLL frequencies. Note that w'll now program CDCLK_CTL correctly even for the bypass case. Actually the CD2X divider should not matter in that case since the hardware will bypass it too, but the "decimal" part should matter (if we want to do gmbus/aux with the bypass enabled). Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-20-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit 5f199dfa8dda965d1b2fc83bd8f8e205d2b8f9f1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor Conflict in broxton_set_cdclk broxton_uninit_cdclk drivers/gpu/drm/i915/intel_display.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I4c2d6d7a2d830e696563ac0173dcc8fa6fb54976 Reviewed-on: https://chromium-review.googlesource.com/421973 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421973" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/421973/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I3ffd94d1f9dc16106d7edd7d52c95641a0b67bf9" commit="3c15a7ceaacf98c81bb2a3d6cdcedb8c424ba728" commit_message="UPSTREAM: drm: fix fb refcount issue with atomic modesetting After commit 027b3f8ba9277410c3191d72d1ed2c6146d8a668 ("drm/modes: stop handling framebuffer special") extra fb refs are left around when doing atomic modesetting. The problem is that the new drm_property_change_valid_get() does not return anything in the '**ref' parameter, which causes drm_property_change_valid_put() to do nothing. For some reason this doesn't cause problems with legacy API. Also, previously the code only set the 'ref' variable for fbs, with this patch the 'ref' is set for all objects. Fixes: 027b3f8ba927 ("drm/modes: stop handling framebuffer special") Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 1e8985a835fdffc99f823c25ace54833656c505a) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I3ffd94d1f9dc16106d7edd7d52c95641a0b67bf9 Reviewed-on: https://chromium-review.googlesource.com/421974 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421974" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/74/421974/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ied0fbe4ac710259bc5e3abce3b50a335a74338f8" commit="b808fbd568d21b5d36f19f0b352770cf6e4332e9" commit_message="UPSTREAM: drm/atomic: Handle funcs->best_encoder == NULL case Fallback drm_atomic_helper_best_encoder() is funcs->best_encoder() is NULL so that DRM drivers can leave this hook unassigned if they know they want to use drm_atomic_helper_best_encoder(). Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20160601180337.28e0917b@bbrezillon (cherry picked from commit a0909cc574a94213423d45ffa12df2564e78679f) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ied0fbe4ac710259bc5e3abce3b50a335a74338f8 Reviewed-on: https://chromium-review.googlesource.com/421975 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421975" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/421975/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I0df2077030163f1364caeab484dcab2eac2b48df" commit="ac31ab8275f9e67ce7937e5029c663c1d040f471" commit_message="BACKPORT: drm/atomic: Fix remaining places where !funcs->best_encoder is valid Adapt drm_pick_crtcs() and update_connector_routing() to fallback to drm_atomic_helper_best_encoder() if funcs->best_encoder() is NULL so that DRM drivers can leave this hook unassigned if they know they want to use drm_atomic_helper_best_encoder(). Update the vtables documentation accordingly. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-2-git-send-email-boris.brezillon@free-electrons.com (cherry picked from commit c61b93fe51b1330cfc4d73084b924931bd65c8f0) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Skip applying hunk onto include/drm/drm_modeset_helper_vtables.h BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I0df2077030163f1364caeab484dcab2eac2b48df Reviewed-on: https://chromium-review.googlesource.com/421976 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421976" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/76/421976/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I757b87796b8e76e833d7319fee98d732ade1a1a0" commit="02e6be8434b80b968c6d68763a57c315ec8220cc" commit_message="UPSTREAM: drm: i915: Rely on the default ->best_encoder() behavior where appropriate For all outputs except dp_mst, we have a 1:1 relationship between connectors and encoders and the driver is relying on the atomic helpers: we can drop the custom ->best_encoder() implementation and let the core call drm_atomic_helper_best_encoder() for us. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-7-git-send-email-boris.brezillon@free-electrons.com (cherry picked from commit cc22a86c2652f027edbe0120adb2b523b404cc7b) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I757b87796b8e76e833d7319fee98d732ade1a1a0 Reviewed-on: https://chromium-review.googlesource.com/421977 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421977" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/421977/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Icfee5086891b325bd87f4347bd93d82b197b28c6" commit="3aafc81d3a432f08c51c1a0a27b2da387cbb4f1b" commit_message="UPSTREAM: drm/crtc: fix connector reference counting mismatch in drm_crtc_helper_set_config Since commit 0955c1250e96 ("drm/crtc: take references to connectors used in a modeset. (v2)"), the reference counts of all connectors in the drm_mode_set given to drm_crtc_helper_set_config are incremented, and then the reference counts of all connectors are decremented on success, but in a temporary copy of the connector structure. This leads to the following error after the first modeset on imx-drm: Unable to handle kernel NULL pointer dereference at virtual address 00000004 pgd = ad8c4000 [00000004] *pgd=3d9c5831, *pte=00000000, *ppte=00000000 Internal error: Oops: 817 [#1] PREEMPT SMP ARM Modules linked in: CPU: 1 PID: 190 Comm: kmsfb-manage Not tainted 4.7.0-rc1+ #657 Hardware name: Freescale i.MX6 Quad/DualLit: [<80506098>] lr : [<80252e94>] psr: 200c0013 sp : adca7ca8 ip : adca7b90 fp : adca7cd4 r10: 00000000 r9 : 00000100 r8 : 00000200 r7 : af3c9800 r6 : aded7848 r5 : aded7800 r4 : 00000000 r3 : af3ca058 r2 : 00000200 r1 : af3ca058 r0 : 00000000 Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: 3d8c404a DAC: 00000051 Process kmsfb-manage (pid: 190, stack limit = 0xadca6210) Stack: (0xadca7ca8 to 0xadca8000) 7ca0: 805190e0 aded7800 aded7820 80501a88 8155a290 af3c9c6c 7cc0: adca7ddc 0000000f adca7cec adca7cd8 80519104 80506044 805190e0 aded7800 7ce0: adca7d04 adca7cf0 80501ac0 805190ec aded7820 aded7814 adca7d24 adca7d08 7d00: 804fdb80 80501a94 aded7800 af3ca010 aded7afc af3c9c60 adca7d94 adca7d28 7d20: 804e3518 804fdb20 00000000 af3c9b1c adca7d50 81506f44 00000000 8093c500 7d40: af3c9c6c ae4f2ca8 ae4f2c18 00000000 00000000 ae637f00 00000000 aded7800 7d60: 00000001 af3c9800 af23c300 ae77fcc0 ae4f2c18 00000001 af3c9800 8155a290 7d80: af1af700 adca6000 adca7db4 adca7d98 804fea6c 804e2de4 adca7e50 adb3d940 7da0: 00000001 af3c9800 adca7e24 adca7db8 8050440c 804fea0c ae77fcc0 00000003 7dc0: adca7e24 adb3d940 af1af700 ae77fcc0 ae77fccc ae4f2c18 8083d44c ae77fcc0 7de0: ae4002 80d03040 adca7e64 adca7e40 adca7e50 80503f08 7e40: 7ebd5630 adca7e50 00000068 c06864a2 7ebd5be8 00000000 00000001 00000018 7e60: 00000026 00000000 00000000 00000000 00000001 000115bc 05010500 05a0059f 7e80: 03200000 03360321 00000337 0000003c 00000000 00000040 30383231 30303878 7ea0: 00000000 00000000 00000000 00000000 00000000 00000000 80173058 80172e30 7ec0: 80d77d32 00004000 adf7d900 00000003 00000000 7ebd5630 af342bb0 adfe3b80 7ee0: 80272f50 00000003 adca6000 00000000 adca7f7c adca7f00 802725ec 804f52cc 7f00: 802809cc 80178450 00000000 00000000 80280880 80145904 adb3d8c0 adf7d990 7f20: ffffffff 00000003 00004000 01614c10 c06864a2 00000003 adca6000 00000000 7f40: adca7f6c adca7f50 80280b04 8028088c 000115bc adfe3b81 7ebd5630 adfe3b80 7f60: c06864a2 00000003 adca6000 00000000 adca7fa4 adca7f80 80272f50 80272548 7f80: 000115bc 00017050 00000001 01614c10 00000036 801089e4 00000000 adca7fa8 7fa0: 80108840 80272f18 00017050 00000001 00000003 c06864a2 7ebd5630 000115bc 7fc0: 00017050 00000001 01614c10 00000036 00000003 00000000 00000026 00000018 7fe0: 00016f38 7ebd562c 0000b5e9 76ef31e6 400c0030 00000003 ff5f37db bfe7dd4d Backtrace: [<80506038>] (drm_connector_cleanup) from [<80519104>] (dw_hdmi_connector_destroy+0x24/0x28) r10:0000000f r9:adca7ddc r8:af3c9c6c r7:8155a290 r6:80501a88 r5:aded7820 r4:aded7800 r3:805190e0 [<805190e0>] (dw_hdmi_connector_destroy) from [<80501ac0>] (drm_connector_free+0x38/0x3c) r4:aded7800 nreference) from [<804e3518>] (drm_crtc_helper_set_config+0x740/0xbf4) r6:af3c9c60 r5:aded7afc r4:af3ca010 r3:aded7800 [<804e2dd8>] (drm_crtc_helper_set_config) from [<804fea6c>] (drm_mode_set_config_internal+0x6c/0xf4) r10:adca6000 r9:af1af700 r8:8155a290 r7:af3c9800 r6:00000001 r5:ae4f2c18 r4:ae77fcc0 [<804fea00>] (drm_mode_set_config_internal) from [<8050440c>] (drm_mode_setcrtc+0x504/0x57c) r7:af3c9800 r6:00000001 r5:adb3d940 r4:adca7e50 [<80503f08>] (drm_mode_setcrtc) from [<804f5404>] (drm_ioctl+0x144/0x4dc) r10:ada2e000 r9:000000a2 r8:af3c9800 r7:8155a290 r6:809320b4 r5:00000051 r4:adca7e50 [<804f52c0>] (drm_ioctl) from [<802725ec>] (do_vfs_ioctl+0xb0/0x9d0) r10:00000000 r9:adca6000 r8:00000003 r7:80272f50 r6:adfe3b80 r5:af342bb0 r4:7ebd5630 [<8027253c>] (do_vfs_ioctl) from [<80272f50>] (SyS_ioctl+0x44/0x6c) r10:00000000 r9:adca6000 r8:00000003 r7:c06864a2 r6:adfe3b80 r5:7ebd5630 r4:adfe3b81 [<80272f0c>] (SyS_ioctl) from [<80108840>] (ret_fast_syscall+0x0/0x1c) r8:801089e4 r7:00000036 r6:01614c10 r5:00000001 r4:00017050 r3:000115bc Code: 0a00000c e5932004 e1a01003 e1a0a004 (e5842004) ---[ end trace 9a7257572ccacb16 ]--- Only the reference count of connectors that weren't previously bound to an encoder should be incremented after a call to drm_crtc_helper_set_config. And only the reference count of connectors that were previously bound to an encoder and are unbound afterwards should ever be decremented. The reference counts of the temporary copies in the save_connectors should not be touched at all. This patch fixes the above error by only incrementing the reference count of those connectors in the set that are initially not bound to any encoder, and also by restoring the reference count of only those connectors in the set in the failure case. "Note that this can only be hit when fbdev emulation is disabled, since then the refcount drops from 1 to 0 and we call the connector destroy functions on the backup copy, which eventually results in tears. With fbdev emulation the refcount only goes down from 2 to 1 ever. And since we unconditionally increment the refcount on the real object, the refcount of that will slowly increase. The backup connector's refcount doesn't matter, since we kfree() that either way in the end of drm_crtc_helper_set_config()." Fixes: 0955c1250e96 ("drm/crtc: take references to connectors used in a modeset. (v2)") Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit fffc5f59f2c68ca859c3f92b224393ed3adbe1ca) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Icfee5086891b325bd87f4347bd93d82b197b28c6 Reviewed-on: https://chromium-review.googlesource.com/421978 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421978" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/78/421978/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I7c6b04b60c1d33d74c6932daff1f75e03e951f9b" commit="d811715538b679e23dd9e330d2e771dc67698314" commit_message="UPSTREAM: drm/dp/mst: Always clear proposed vcpi table for port. Not clearing mst manager's proposed vcpis table for destroyed connectors when the manager is stopped leaves it pointing to unrefernced memory, this causes pagefault when the manager is restarted when plugging back a branch. Fixes: 91a25e463130 ("drm/dp/mst: deallocate payload on port destruction") Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> Reviewed-by: Lyude <cpaul@redhat.com> Cc: stable@vger.kernel.org Cc: Mykola Lysenko <Mykola.Lysenko@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit fd2d2bac6e79b0be91ab86a6075a0c46ffda658a) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I7c6b04b60c1d33d74c6932daff1f75e03e951f9b Reviewed-on: https://chromium-review.googlesource.com/421979 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421979" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/79/421979/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ieee34183884a1be413d2984ae252bce089714ee0" commit="8e643b8a207a2ed50ca4a63c0ef03b441f380535" commit_message="BACKPORT: drm: Add a callback from connector registering If a driver wants to more precisely control its initialisation and in particular, defer registering its interfaces with userspace until after everything is setup, it also needs to defer registering the connectors. As some devices need more work during registration, add a callback so that drivers can do additional work if required for a connector. Correspondingly, we also require an unregister callback. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> [danvet: go ocd and remvoe unecessary empty kerneldoc line.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465993109-19523-3-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit aaf285e2e0ff490e924dbcdfd08e8274c3093354) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Minor conflict in comments include/drm/drm_crtc.h BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ieee34183884a1be413d2984ae252bce089714ee0 Reviewed-on: https://chromium-review.googlesource.com/421980 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421980" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/80/421980/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I5f541bb83c92336a035d29a329b06b153d708225" commit="5adbfa839f8fbf1e866202a103e672b84a8af401" commit_message="UPSTREAM: drm: Make drm_connector_register() safe against multiple calls Protect against drivers that may try to register the connector more than once, or who try to unregister it multiple times. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465993109-19523-4-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 40daac6136948dc83c1dec14fe4a2444915b22df) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I5f541bb83c92336a035d29a329b06b153d708225 Reviewed-on: https://chromium-review.googlesource.com/421981 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421981" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/81/421981/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ia685b81b25a47debb9ede6fa9a8cf0d0273ec368" commit="881361d4c9439a3bf653d14b7acb6ec6f8085bae" commit_message="UPSTREAM: drm: Automatically unregister the connector during cleanup As we now can call drm_connector_unregister() multiple times, provide a failsafe unregister for a connector when cleaning it up. v2: Add a WARN to catch any connectors that are still visible to userspace when we come to destoy them. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465993109-19523-5-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 80de34611af6f123937a40ea17c8db792d38baba) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: Ia685b81b25a47debb9ede6fa9a8cf0d0273ec368 Reviewed-on: https://chromium-review.googlesource.com/421982 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421982" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/82/421982/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I1f13bcfdf4e0654786ac91a9e826aec7c4db5309" commit="8440917ae2a4158a4a54bed2adc50baf2a9dc701" commit_message="BACKPORT: drm: Minimally initialise drm_dp_aux When trying to split up the initialisation phase and the registration phase, one immediate problem encountered is trying to use our own i2c devices before registration with userspace (to read EDID during device discovery). drm_dp_aux in particular only offers an interface for setting up the device *after* we have exposed the connector via sysfs. In order to break the chicken-and-egg problem, export drm_dp_aux_init() to minimally prepare the i2c device for internal use before drm_connector_register(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@redhat.com> Cc: Rafael Antognolli <rafael.antognolli@intel.com> Cc: Ville Syrjl <ville.syrjala@linux.intel.com> Cc: dri-devel@lists.freedesktop.org [danvet: Amend kerneldoc slightly.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466152398-20157-3-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit acd8f414c957406c8272cbc380dd50fea945dcf1) Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Conflicts: Conflict in drm_dp_aux_register due to the new locking mechanism introduced in i2c subsystem drivers/gpu/drm/drm_dp_helper.c BUG=chrome-os-partner:53839 TEST=External monitors connected via MST hub or daisy-chain over DP should come up. Change-Id: I1f13bcfdf4e0654786ac91a9e826aec7c4db5309 Reviewed-on: https://chromium-review.googlesource.com/421983 Commit-Ready: Brian J Lovin <brian.j.lovin@intel.com> Tested-by: Chenglei Ren <chenglei.ren@intel.com> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> " fail_count="1" gerrit_number="421983" owner_email="radhakrishna.sripada@intel.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/83/421983/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ife598ff7a4b741cc5078aa7fe5dc7a5cf4f638a1" commit="3c5364180cbd82a1f41fe0be1449cc4ef69df5d5" commit_message="UPSTREAM: Kbuild: provide a __UNIQUE_ID for clang The default __UNIQUE_ID macro in compiler.h fails to work for some drivers: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:615:1: error: redefinition of '__UNIQUE_ID_firmware615' BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt"); This adds a copy of the version we use for gcc-4.3 and higher, as the same one works with all versions of clang that I could find in svn (2.6 and higher). BUG=chromium:702741 TEST=build for kevin with clang Change-Id: Ife598ff7a4b741cc5078aa7fe5dc7a5cf4f638a1 Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Michal Marek <mmarek@suse.com> (cherry picked from commit b41c29b0527c7fd6a95d0f71274abb79933bf960) Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/531777 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="531777" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/531777/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I69a71ec08bdbab23e65b33d34175c3f01164dcfd" commit="e294549a6fabba7924cd91978661c1d020b8c1fe" commit_message="rockchip/rk3399: scarlet: enable mipi in depthcharge BUG=b:35647671, b:62534684 BRANCH=none TEST=Boot from scarlet, and mipi panel work Change-Id: I69a71ec08bdbab23e65b33d34175c3f01164dcfd Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com> Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/477790 Reviewed-by: Julius Werner <jwerner@chromium.org> " fail_count="0" gerrit_number="477790" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="5" project="chromiumos/platform/depthcharge" project_url="https://chromium-review.googlesource.com/chromiumos/platform/depthcharge" ref="refs/changes/90/477790/5" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I9d45ef667060ebb0fd39a6f218cd05966d2c1189" commit="50a3244d19c575774b351a9071053a0f1d33f313" commit_message="Move session_manager D-Bus tests to bvt-perbuild. They haven't failed in forever, probably not needed in the CQ. https://chromium-review.googlesource.com/c/519743/ will combine the two tests, but for now, let's move them to bvt-perbuild until the that CL is reviewed. BUG=chromium:709990 TEST=test_that suite:bvt-inline doesn't run the tests. TEST=test_that suite:bvt-perbuild runs the tests. Change-Id: I9d45ef667060ebb0fd39a6f218cd05966d2c1189 Reviewed-on: https://chromium-review.googlesource.com/524182 Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org> Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org> " fail_count="0" gerrit_number="524182" owner_email="jorgelo@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/82/524182/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I063b8384b8a2923cfb547cead9fe1716b6f98b2e" commit="a44302922a655772b016fed0b48f5b675d8fcf03" commit_message="cbuildbot: lakitu-st: add cbuildbot configuration for lakitu-st CQ-DEPEND=CL:526314 BUG=b:62272706 TEST=The following two commands succeeded. $ cbuildbot --local -p 'chromiumos/chromite' lakitu-st-release $ sudo apt-get install python-mox && cd chromite && ./cbuildbot/chromeos_config_unittest Change-Id: I063b8384b8a2923cfb547cead9fe1716b6f98b2e Reviewed-on: https://chromium-review.googlesource.com/526313 Commit-Ready: Edward Jee <edjee@google.com> Tested-by: Edward Jee <edjee@google.com> Reviewed-by: Don Garrett <dgarrett@chromium.org> " fail_count="0" gerrit_number="526313" owner_email="edjee@google.com" pass_count="0" patch_number="5" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/13/526313/5" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Idfc068781211f4535dec5f2debbee671dc13ccc0" commit="0ae923f61fed213e3559a26b136df96d42be3097" commit_message="[autotest] Handle config error in suite scheduler. This change adds more error handling in parsing a task. If a task has bad config values, log the error and ignore the task. BUG=chromium:729330 TEST=unittest Change-Id: Idfc068781211f4535dec5f2debbee671dc13ccc0 Reviewed-on: https://chromium-review.googlesource.com/531755 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Dan Shi <dshi@google.com> Reviewed-by: Xixuan Wu <xixuan@chromium.org> " fail_count="0" gerrit_number="531755" owner_email="dshi@google.com" 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/55/531755/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib2ff497d723af55d662793e0daa2bb00225ba51e" commit="f991f69885ca605ff44f65d70ac689a9753f090a" commit_message="Samba: Apply patch for CVE-2017-7494 See https://www.samba.org/samba/security/CVE-2017-7494.html for details. The issue probably does not cause any harm to Chrome OS yet since it is a Samba server bug and authpolicy, being the only Samba user so far, only acts as a client. BUG=chromium:732031 TEST=emerge-amd64-generic samba Change-Id: Ib2ff497d723af55d662793e0daa2bb00225ba51e Reviewed-on: https://chromium-review.googlesource.com/531385 Commit-Ready: Lutz Justen <ljusten@chromium.org> Tested-by: Lutz Justen <ljusten@chromium.org> Reviewed-by: Zentaro Kavanagh <zentaro@google.com> " fail_count="0" gerrit_number="531385" owner_email="ljusten@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/85/531385/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I66f6bdcea47dc561a6724de8c85bffdcc37f16a6" commit="845be3023ad23f94736627ba930e0782c0967bba" commit_message="metrics: Enable metrics by default for enterprise-enrolled devices Default to enabling metrics for enterprise-enrolled devices if the policy is missing. This matches Chromium behavior, see https://codereview.chromium.org/2256733002/. CQ-DEPEND=CL:518045 BUG=chromium:456186 TEST=Compiled, ran tests, metrics_client -c works as expected. Change-Id: I66f6bdcea47dc561a6724de8c85bffdcc37f16a6 Reviewed-on: https://chromium-review.googlesource.com/506728 Commit-Ready: Lutz Justen <ljusten@chromium.org> Tested-by: Lutz Justen <ljusten@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> Reviewed-by: Thiemo Nagel <tnagel@chromium.org> " fail_count="0" gerrit_number="506728" owner_email="ljusten@chromium.org" pass_count="0" patch_number="14" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/28/506728/14" remote="cros" total_fail_count="1"/><lkgm version="9644.0.0-rc2"/></manifest> |
