| <?xml version="1.0" encoding="utf-8"?><manifest revision="2ccc7ca3392295ad5b5e604ed03f51ff9f699e0d"> |
| <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/libchrome" path="src/aosp/external/libchrome" revision="c1e4543ae2b479a54fc4eff90fb388c70a428d52" 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/core/libsync" path="src/aosp/system/libsync" revision="f4f4387b6bf2387efbcfd1453af4892e8982faf6" upstream="refs/heads/master"/> |
| <project groups="devserver" name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="0ef9a2fc5b51ae22721dcd95b088d3274d2ec060" upstream="refs/heads/master"/> |
| <project name="apps/libapps" path="src/third_party/libapps" revision="d72d3463cff17b58df6b70cd8353181c593cd962" upstream="refs/heads/master"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project groups="minilayout,buildtools,labtools" name="chromium/buildtools" path="chromium/src/buildtools" remote="chromium" revision="d658e92a1fc22ead23dede3913117fdee514ab64" upstream="refs/heads/master"/> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="4f4fad584e9c2735af5131f15b697376a3327de5" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/llvm-project/cfe/tools/clang-format" path="chromium/src/buildtools/clang_format/script" remote="chromium" revision="079ee0ba10162a6f41644bb01d9b9487fb20fd18" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="e9462696241f3ca832890473173e03e7bcfe6adc" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="80a1cf66b83c394c911b14312274b26dba888ae0"/> |
| <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="ef0cd5b4e8a0025a835c3129a35704d508046f24" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/containers/cros-container-guest-tools" path="src/platform/container-guest-tools" revision="e6428424c3e580ea2f26cfd04bb2de3b0f49b336" upstream="refs/heads/master"/> |
| <project name="chromiumos/docs" path="docs" revision="e44fe37f441d1c2cc876bfe789323c48b729858d" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="7ea5c995be1ba3ff1a39e5e63fdee4b57c6434e5" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/bad_cl_detector" path="infra/bad_cl_detector" revision="08bb5589019bbaae1039240ce347cdc3ed05f43a" upstream="refs/heads/master"/> |
| <project groups="chromeos-admin" name="chromiumos/infra/ci_results_archiver" path="infra/ci_results_archiver" revision="4493ad78616152e22672ed245b72806c56cfef0d" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/cl_exonerator" path="infra/cl_exonerator" revision="439eba782bde9d318d74d5924a304b245842160b" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/cl_status_viewer" path="infra/cl_status_viewer" revision="6bda7c611af03cb53db2afa190e0a81ce6d37169" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/dummies/general-sandbox" path="infra/dummies/general-sandbox" revision="ab009ffebb68a58f37779bddfba5f1a08ef174ae" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/dummies/merge-sandbox" path="infra/dummies/merge-sandbox" revision="651c1f3b89c112222f5dae2f79091421543dd4ee" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/logstock" path="infra/logstock" revision="ef7fe408b9feee9a3664b36f0176fcacd27bf703" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/lucifer" path="infra/lucifer" revision="bd2e4c18fa7bf050ce9f888554ffa70ca3552e62" upstream="refs/heads/master"/> |
| <project groups="chromeos-admin,labtools" name="chromiumos/infra/skylab_inventory" path="infra/skylab_inventory" revision="e1f5a33620bb0c5eb375f1d28898ae2cc5b4bf0e" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="d21034770e63c2bf45bc6f36e79adcf075361220" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/test_analyzer" path="infra/test_analyzer" revision="7b0a71303075b11ce506fe6c34477a139c02236e" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="bd33427afb37ec05127792091ffc87bfefb48121" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="afb60766ee0a01cbc12fcbdc95703c23150a4d2d" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="7dcef9c1b16d2bb11c2f97350a19051b98289a29" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="d0512c212471c0cf5bd11c85e8a37dd1d64f1f52" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="2bb043da0cbda804c5d90a5d589e471995e36b46" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="14a0ad29e53c619fc1a6458d0c250b0771236698" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="75d7927161b6f3f54fbb2920ec8e1bb0bc131ccf" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="8cb6a1a2a04acf304721ddc098b814cb54792e3f" 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/bisect-kit" path="src/platform/bisect-kit" revision="af7b06bf6c1fc30810cbcc49c5e7ebe013d0e349" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="734a2f4573d273f137f592509d3f7505404e6182" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="300354e5d74418c8e03737ca9029c64d9297a28d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/cfm-device-monitor" path="src/platform/cfm-device-monitor" revision="5fb05b89df9447d0535f8c38e8c1a90499dfe659" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="0215a28bea38f2340a5bb997257b8adf98207b09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="fd4e8eef335ceaca7adf53a83f5e13e00e09101c" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/cobble" path="src/platform/cobble" revision="3d2b9922e81cce898d4f09306563d3ca9d32c67e" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="e7f8b15cde6b9a90e1c4c8baf0011668eb31c5d0" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="124b75f44b09cfc6dc3032c46da5d879c08227f9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="f257263bed62cc81dafb0dffdcdbba4336ce3543" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="3810138ca0f159120db77f1992578b7f2f3cac9e" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="2a792fa977adae082fb26bb66d9282fe7a0e8c50" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="240acaa806e64238b0fda54b478209b6aec430b3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="c27f522e3efde1754afb9d149d95a750fe34f465" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/platform/ec" path="src/platform/ec" revision="b2ec2a5eb56f9f6bb769ed0200fe11bcc075167d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="bcc00ca58726d9cf774c56005715a5ee330da045" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="2ce190e3d2162bfae0269567a7a631c28b6e8d11" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="597b30fed780a0148149fa4086f9ad4792a3d4ab" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/platform/firmware" path="src/platform/firmware" revision="b2c29757b90133e8e6315800a1afdeafe4a2bc5a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="a2c76efc8a0ca6988f4270a88543f75d05ccd5bb" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="275de72e6b14f5f2bd90376120e19af4e4fbdd9c" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="613458c0e3c589e52e7f093288ef1d2ba57a9ff7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="b988fa74ec18de6214b18f723e48331d9a7802ae" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="e043793ce4968d66e0abfc27e4be9c976ba2ccb6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="8826acba1c4e13b6318ae6d1d4b49633d1b55aba" 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="23f8ea74685ea0a03be8649ca33d5664bc789393" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/microbenchmarks" path="src/platform/microbenchmarks" revision="518003bc070970f25b9ab97c0560d762846c5e65" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="067594b15aa39835f49058853d3f1f586124c101" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="0d8f7a61e4c146cabceea5f81a5e26d6d0f5ac83" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="70199bda0fc5cd3f61e0923e5108895d7fabc0a0" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="146a68465feb9039602bcaa508ef3fea8e8f926a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="2c0d77a1dc11b966405522eefa94b6e3df6fe6c8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="16bc496a97c027147453e7d675ae2f9147352b31" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tast" path="src/platform/tast" revision="609c3d46815ac22ad722f98d855688b4e6bf732e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tast-tests" path="src/platform/tast-tests" revision="005e70f5d38de267cde04aaf16765eaec6cd51ca" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="bafba938ff65099158b04ca718b1e77a0e43c5c4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="89d6554935198320d8ac96cbbb62c9032ca12cc0" 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="f3e4d3bca41b674e89583d74dfb7e538fe58ff18" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="db50af69b91bc1cffde13740c23aed72883fbc45" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tremplin" path="src/platform/tremplin" revision="a0236ca2c160c3b562a22162fc46192984b206d9" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="ab10366ee27959666b94a638858032c91c3c5e10" upstream="refs/heads/master"/> |
| <project groups="firmware,buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="332b74e1818aa7811feb3534bdea2887c2f86aa4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="4649d42d10a7fa32f18da7e77e019891d1d7d940" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="c63a4457a7b3d28081dcb1de276928d49ded130a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="b0207e77fb41efae0cfd4e264dc46d6827860749" upstream="refs/heads/master"/> |
| <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="619c091964842556a04341787f0da6d510c71b96" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="52a4f1afc708415a51bfe3794b79342347250e56" 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="fe77b53e32692fc5d35df208e2b3d21a28f6228b" 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="567b8c6cc2d4c90a223c126ecbcb617d2b8a3a23" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="5cdb3d96df8295dc4ce94371f7091f7caa4a349c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/aver-updater" path="src/third_party/aver-updater" revision="cf3337b0918e15755782d8f3b11691e04f1ddc40" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="f915721896adf72a98299bfdf2775a26a7ffaa20" upstream="refs/heads/chromeos-5.44"/> |
| <project groups="firmware" name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="6697fe6404055443d7c754b365907a0604f14111" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="235f889c040221f8b956ca37fcd80da7b35e0b85" upstream="refs/heads/chromeos-2016.05"/> |
| <project groups="firmware" name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="678b4c4a81069bb6e10e2e59f5374b83d727cd2b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cros-adapta" path="src/third_party/cros-adapta" revision="eb6d8c1832b9181926df107faf41a80887fd982c" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cups" path="src/third_party/cups" revision="ca5fa6dadcc50a4c29302782d2b9387822365c0f" upstream="refs/heads/cups-2-2-8"/> |
| <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="5f4302621d8e011edbd83858b0c3183e29f842b5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="907f6244dc1c4c3f58a809147d348eccbb932631" 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="firmware" name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="ab586ccd21556108662fbd80ab5a429143eac264" upstream="refs/heads/chromeos-2017.08"/> |
| <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/cnl/edk2" revision="f71a70e7a4c93a6143d7bad8ab0220a947679697" upstream="refs/heads/chromeos-cnl"/> |
| <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/glk/edk2" revision="f71a70e7a4c93a6143d7bad8ab0220a947679697" upstream="refs/heads/chromeos-glk"/> |
| <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/icl/edk2" revision="8df83bf3e30ada89fc0799859e3de25017dc93ac" upstream="refs/heads/chromeos-icl"/> |
| <project groups="firmware" name="chromiumos/third_party/em100" path="src/third_party/em100" revision="8af5146f4c55a51b0debf81f1cee3c3333aa1505" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="870d8afa9ab839442f4766881748ad5bc4f6f7d5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/fwupd" path="src/third_party/fwupd" revision="8ece8874b5588f74805ba1ee283af295d2a276d6" upstream="refs/heads/fwupd-1.2.4"/> |
| <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="825fc302e0e0ffeb2aa925da70ebc32bc5377c2b" upstream="refs/heads/master"/> |
| <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="8097de652127dfee5c35864c5aac3c28dd5c7fef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="1f9bc912d4b52362284c08a013d31166474fd128" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant-2.6" revision="5f1be6ae1d9d95c778d3f8ebf02dca3b126fa618" upstream="refs/heads/wpa_supplicant-2.6"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="98010d4e0c0d1ed95b2b08d9e2b51dcde3d18fe3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="5bde690dce8ad254a6a1960bbfe91a6459e9125e" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="ca6ad94e109c66045d75d6a432fdfc64244102b0" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="c4898a5585ce2007942d3f7119c3c5f7849235be" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="013a4113540306654ca8c25f963993cd6067ca56" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="3113693aa546a35c22afc0ea69fbb5fa29153b55" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14" revision="5c1e9ceeb31a7942f6bd23853d7e126e0cd5ced2" upstream="refs/heads/chromeos-4.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14-mistral" revision="faf12b5d5097b45c93960ca679bea7b4551c371a" upstream="refs/heads/chromeos-4.14-mistral"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.19" revision="12519b7c127a90a1f82adff5a0bf6cac61f638f4" upstream="refs/heads/chromeos-4.19"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="d41e9e578eef76ebd804f3361eb67fce1009c2b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="1b159b990afd33c0c2e3b47ebda6dd5cc793dd92" 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="5a3bdc7add2f30f7673052376514c91dbcd1b64a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="0151170b4ef1f344630b139bb4b80b94585a22b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="f1286adeb71d12d687a3017b5d483b3d3cad8e75" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqrtr" path="src/third_party/libqrtr" revision="1604a9567beda30fb5d8fd532c0ec8366da8fbbb" 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="5e6034258146af6be973fb6a5bb6b9d6e7489437" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="000ca87656ff8ece0768a590ba627dbea7b42c42" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/logitech-updater" path="src/third_party/logitech-updater" revision="658d14909e3231dddedebbd769db36d7a9f6d784" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="08733aa7d62b171c667d3eb7e299aa7345053fa9" 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/mesa" path="src/third_party/arc-mesa" revision="e6b3d357f6b99e6b409fa6b2a69fb3f8851f5b2d" upstream="refs/heads/arc-18.2.0-pre1"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="a2ddb710fdef5f24bfe10d0ee09b1f32ea53aaa8" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-freedreno" revision="0b736f7fd4852bdea2ac6be9a018a41065252233" upstream="refs/heads/chromeos-freedreno"/> |
| <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="f173901a2ce769fe95b85123f7be445ac9a083a5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="1c55306a49b32bbb8c65e1e5e9d630f6720a6810" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="19219422df0a31c8990ba4462b4ab453b5fdfd5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="165395bf01548d8a0135357ca4c222b9c0c0acaa" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="a9fc54d636fc3e5b5f0918769a2e5343c5f0d823" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="efb1b3caf62843c7c325064b62d51b061920dd19" upstream="refs/heads/chromeos-2.3.49"/> |
| <project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="af64f6c7b19cdb84226161dd3742a13fd7974cc3" 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="8dc336a991e5494e6cc9a0094778fee67f22ed6c" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="4066f05ebae55958e3d193f9177c310b1d480886" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sound-open-firmware" path="src/third_party/sound-open-firmware" revision="2f3a03f1b0ef5b00e8de4fa5079fb2885fcf66c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sound-open-firmware-tools" path="src/third_party/sound-open-firmware-tools" revision="d8114acdbb7609ebf05825c231f47c5b60a4d0b0" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="6103fff146d9e434a643a031f7a557fd793c8d08" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="b1cba791a63a24cac5b4d7cd68f5e0941a9afe62" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project groups="firmware" name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="c9e573a4a1c5e98fb4bd7ad513f1f18a31de2af9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="6c2cac92b71c2c96e020a10c4f01afdf311bf8e4" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="8084afd71b2989bbb1988488fcb1764202f79b2b" upstream="refs/heads/chromeos-v2018.09"/> |
| <project name="chromiumos/third_party/virglrenderer" path="src/third_party/virglrenderer" revision="62d123dc34a85b87708193774f9eb126a2cd7d1a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/virtual-usb-printer" path="src/third_party/virtual-usb-printer" revision="fddddb1e1321990311bc5c9c693d8a1335b4b224" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/webrtc-apm" path="src/third_party/webrtc-apm" revision="b7da1a8bdb731999d5d7d59cf30fe3cd1b3c656c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="c325abd3eff318af433a1a5667f5d2745f893945" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="6d17c9076fe9d97d2411e5909e6b255e5e721fc3" upstream="refs/heads/master"/> |
| <project groups="buildtools,chromeos-admin,firmware,labtools,minilayout" name="infra/luci/client-py" path="chromite/third_party/swarming.client" remote="chromium" revision="281c390193ec8c02e60279f8dac1b86ac52fa4be"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="a89bf7903f3169e6bc7b8efc10a73a7571de21cf"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="e36af14afc8c11dc4891294d9c4d997df7f487bf" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="e4b6d367d490a1498a8d1cef84c1f52752a8a0f9" upstream="refs/heads/master"/> |
| <project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="1389a8dc482d10684a7b30d0aa4c9c58155113ed" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="920588a1acdc4721abb713d8162010e4b85ae53e" upstream="refs/heads/master"/> |
| <project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="99e952c01a773162b7c55a049be6f22bcd079a5a" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="2fa96d1b0e718c90d1bb1f71128351e8d330ad2c" upstream="refs/heads/master"/> |
| <project name="platform/external/puffin" path="src/aosp/external/puffin" remote="aosp" revision="e8232e11000b467eeb8428df734151361362a9a8" upstream="refs/heads/master"/> |
| <project name="platform/system/keymaster" path="src/aosp/system/keymaster" remote="aosp" revision="3b12e5e65bd82c39a600def425cd21783a361561" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="cce69c1b1bfc46de5e1cdd4923f87215c0edb884"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="ac6128e0a17a52f011797f33ac3e7d6273a9368d"/> |
| <project name="weave/libweave" path="src/weave/libweave" revision="a852917ec1d1ada705a0a71deaf419af190f268c" upstream="refs/heads/master"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-4.14" change_id="I9db4009a3e22cc839c8f0bb49e60cb9af5b043fe" commit="bab54315a6c3f90c6e934a26e4c177f0b7c5f63e" commit_message="FIXUP: ASoC: Intel: Boards: Machine driver for SKL+ w/ HDAudio codecs Add machine driver for Intel platforms (SKL/KBL/BXT/APL) with HDA and iDisp codecs. This patch adds support for only iDisp (HDMI/DP) codec. In the following patches support for HDA codecs will be added. This should work for other Intel platforms as well e.g. GLK,CNL however this series is not tested on all the platforms. Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 7c33b5f16915a7bc3d3b81a9a041bdc562f71dfb) Conflicts: sound/soc/intel/boards/Kconfig sound/soc/intel/boards/Makefile sound/soc/intel/boards/skl_hda_dsp_common.c sound/soc/intel/boards/skl_hda_dsp_common.h sound/soc/intel/boards/skl_hda_dsp_generic.c BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I9db4009a3e22cc839c8f0bb49e60cb9af5b043fe Signed-off-by: Naveen Manohar <naveen.m@intel.com> Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353699 Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="4" gerrit_number="1353699" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/99/1353699/19" remote="cros" total_fail_count="7"/><pending_commit branch="chromeos-4.14" change_id="I4ee5fe1dff382d21eb08ea8ac3d12f529a92c450" commit="274badfd48761216c35bc53d4a062a644ee98523" commit_message="UPSTREAM: ASoC: rt5670: Add quirk for Thinkpad 8 tablet The Thinkpad 8 needs a quirk for jack-detect and the internal mic to work correctly. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 818838e6bfa4ddc6c76703237028dcffb80d6496) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4ee5fe1dff382d21eb08ea8ac3d12f529a92c450 Reviewed-on: https://chromium-review.googlesource.com/1353703 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="5" gerrit_number="1353703" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/03/1353703/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="I2dde896895c9f6597b79ab65b2a4ab7dd74753be" commit="c05b9e8d1815f0e33963f3cb62688f67a79292b7" commit_message="UPSTREAM: ASoC: Intel: common: Add quirk for Thinkpad 8 tablet The Thinkpad 8 tablet uses 10EC5640 as ACPI HID, but it has a rt5670 codec add a quirk for this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 2ca426a24dd75e775ece1466ae45e019f0035b8d) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I2dde896895c9f6597b79ab65b2a4ab7dd74753be Reviewed-on: https://chromium-review.googlesource.com/1353704 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="5" gerrit_number="1353704" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/04/1353704/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="I40382f107fca612ef60750a1c8f39610e8ccbbb8" commit="e0bd9f537ba48577c42bfa3508e10468188762ab" commit_message="UPSTREAM: ASoC: Intel: cht-bsw-rt5672: Add key-mappings for the headset buttons Having the headset buttons send BTN_0, BTN_1 and BTN_2 events is not really useful. Add mappings to PLAYPAUSE VOLUME_UP and VOLUME_DOWN like we do in other Intel machine drivers. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit f8fc397e13107f925186ee742e9e8dfbfe9a3d03) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I40382f107fca612ef60750a1c8f39610e8ccbbb8 Reviewed-on: https://chromium-review.googlesource.com/1353705 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="5" gerrit_number="1353705" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/05/1353705/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="Icc066d9a19b5be7788dc1032ac99683cd0424ff4" commit="cbbf878eb99b1af80700c1306946b1d35be0103e" commit_message="UPSTREAM: ASoC: dmic: add DT module alias Before this patch the only alias provided by the dmic module is: alias: platform:dmic-codec Device instantiated from DT will not probe automatically with this After this patch, here is the new alias list: alias: platform:dmic-codec alias: of:N*T*Cdmic-codecC* alias: of:N*T*Cdmic-codec Now the dmic codec probes automatically when instantiated from DT. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit cb06a037f8362e250a6e61872ffa01ab086ec9e2) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Icc066d9a19b5be7788dc1032ac99683cd0424ff4 Reviewed-on: https://chromium-review.googlesource.com/1353706 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="5" gerrit_number="1353706" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/06/1353706/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="Id876f0f2708665481b6c66a2d3548d7d745be200" commit="8bfcbd8c18f7f74d6a000f3db6328fa1ac407247" commit_message="UPSTREAM: ASoC: fix soc-core.c kernel-doc warning Fix kernel-doc warning: ../sound/soc/soc-core.c:2918: warning: Excess function parameter 'legacy_dai_naming' description in 'snd_soc_register_dais' Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 63a886f38dd96868e33488eccee8ed427144d397) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Id876f0f2708665481b6c66a2d3548d7d745be200 Reviewed-on: https://chromium-review.googlesource.com/1353708 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="5" gerrit_number="1353708" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/08/1353708/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="I4974ed38737656a584b6bdc41ed80cfa63890042" commit="61ae5e0cbde13a4499e90d77c6b27197c68dec97" commit_message="UPSTREAM: ALSA: rawmidi: Initialize allocated buffers syzbot reported the uninitialized value exposure in certain situations using virmidi loop. It's likely a very small race at writing and reading, and the influence is almost negligible. But it's safer to paper over this just by replacing the existing kvmalloc() with kvzalloc(). Reported-by: syzbot+194dffdb8b22fc5d207a@syzkaller.appspotmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> (cherry picked from commit 5a7b44a8df822e0667fc76ed7130252523993bda) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4974ed38737656a584b6bdc41ed80cfa63890042 Reviewed-on: https://chromium-review.googlesource.com/1353709 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="5" gerrit_number="1353709" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/09/1353709/19" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.14" change_id="I23b47b82300e0772fcc1be0ebf9ce8a3b857fa49" commit="4638ccfb3a7ebf6f36d2b4d99038c840d8d005dd" commit_message="UPSTREAM: ASoC: core: Don't schedule DAPM work if already in target state When dapm_power_widgets() is called, the dapm_pre_sequence_async() and dapm_post_sequence_async() functions are scheduled for all DAPM contexts (apart from the card DAPM context) regardless of whether the DAPM context is already in the desired state. The overhead of this is not insignificant and the more DAPM contexts there are the more overhead there is. For example, on the Tegra124 Jetson TK1, when profiling the time taken to execute the dapm_power_widgets() the following times were observed. Times for function dapm_power_widgets() are (us): Min 23, Ave 190, Max 434, Count 39 Here 'Count' is the number of times that dapm_power_widgets() has been called. Please note that the above time were measured using ktime_get() to log the time on entry and exit from dapm_power_widgets(). So it should be noted that these times may not be purely the time take to execute this function if it is preempted. However, after applying this patch and measuring the time taken to execute dapm_power_widgets() again a significant improvement is seen as shown below. Times for function dapm_power_widgets() are (us): Min 4, Ave 16, Max 82, Count 39 Therefore, optimise the dapm_power_widgets() function by only scheduling the dapm_pre/post_sequence_async() work if the DAPM context is not in the desired state. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit e03546ddd3db5352a74dec247dbdaa29889e93f7) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I23b47b82300e0772fcc1be0ebf9ce8a3b857fa49 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353710 " fail_count="4" gerrit_number="1353710" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/10/1353710/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I2f5ebff0ef0996e07b39786bfd3ab2cd05f4c6e1" commit="a6586138196dd88f6104ce2c75bb22e5b16bcfd1" commit_message="BACKPORT: ASoC: add for_each_link_codecs() macro ALSA SoC snd_soc_dai_link has snd_soc_dai_link_component array for codecs. To be more readable code, this patch adds new for_each_link_codecs() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 3db769f17714ae65f2faf44ff2bae9d52f4bd46b) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> Conflicts: sound/soc/meson/axg-card.c BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I2f5ebff0ef0996e07b39786bfd3ab2cd05f4c6e1 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353712 Reviewed-by: Prashant Malani <pmalani@google.com> " fail_count="4" gerrit_number="1353712" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="19" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/12/1353712/19" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.14" change_id="I0726973933baa869fb82f1230ffd34efe17b8d0a" commit="c3aa6bb33cc1a6c7088dbc8dccf02502b28eecf0" commit_message="BACKPORT: ASoC: add for_each_rtd_codec_dai() macro ALSA SoC snd_soc_pcm_runtime has snd_soc_dai array for codec_dai. To be more readable code, this patch adds new for_each_rtd_codec_dai() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 0b7990e38971da403ce223d8bdc758a817eb72f8) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> Conflicts: sound/soc/meson/axg-card.c File only exists upstream, not resolving due to dependencies in upstream changes in drivers/clk/clk.c BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I0726973933baa869fb82f1230ffd34efe17b8d0a Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353713 Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="4" gerrit_number="1353713" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/13/1353713/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ifbcdf8abbc86c03db630ba4c66b35968eed1748c" commit="dd558eeee23929f4ec22cfd532b3117971f4cc11" commit_message="UPSTREAM: ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked Currently DAPM has a lot of similar code to handle errors from snd_soc_dapm_new_control_unlocked, and much of this code does not really accurately reflect what the function returns. Firstly, most places will check for a return value of -EPROBE_DEFER and silence any error messages in that case. The one notable exception here being dapm_kcontrol_data_alloc which does currently print any error messages in the case of snd_soc_dapm_new_control_unlocked returning NULL or an error. Additionally the error prints being silenced in these case are redundant as snd_soc_dapm_new_control_unlocked can only return -EPROBE_DEFER or NULL when failing. Secondly, most places will treat a return value of NULL as an -ENOMEM. This is not correct either since any error except EPROBE_DEFER will cause a return value of NULL from snd_soc_dapm_new_control_unlocked. Centralise this handling and the error messages within snd_soc_dapm_new_control_unlocked and update the callers to simply check IS_ERR and return. Note that this update is slightly simpler in the case of dapm_kcontrol_data_alloc where that is fairly close to the handling that was already in place. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 3bbf5d34fd4a0c41246290b70338095ae291851b) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ifbcdf8abbc86c03db630ba4c66b35968eed1748c Reviewed-on: https://chromium-review.googlesource.com/1353714 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353714" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/14/1353714/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I2a160c553b6acb19c3d26dbc42308466eec3ff83" commit="cfddc6aca992a557ad5502df3c808a164c15ffd3" commit_message="UPSTREAM: ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control Move the function snd_soc_dapm_new_control to be next to snd_soc_dapm_new_controls and add some kernel doc for it. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 94e630a35d3383b42f12a873a5404bdf61e38e42) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I2a160c553b6acb19c3d26dbc42308466eec3ff83 Reviewed-on: https://chromium-review.googlesource.com/1353715 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353715" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/15/1353715/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I4e632affd4c84da70327648bcc8538f719dac846" commit="eca35a1b65aad403020fab389d492f839ab50104" commit_message="UPSTREAM: ASoC: dapm: Move connection of CODEC to CODEC DAIs Currently, snd_soc_dapm_connect_dai_link_widgets connects up the routes representing normal DAIs, however CODEC to CODEC links are hooked up through separate infrastructure in soc_link_dai_widgets. Improve the consistency of the code by using snd_soc_dapm_connect_dai_link for both types of DAIs. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 778ff5bb8689eb4fd05a72a409e32a3a34e23faf) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4e632affd4c84da70327648bcc8538f719dac846 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353716 Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353716" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/16/1353716/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I4ca99dfc91b99a1355bef225a3e9a4043d09001c" commit="d3be826f648361dc1b2d0d2b4a45ca433fea21d8" commit_message="UPSTREAM: ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links Currently multi-CODEC is not supported on CODEC to CODEC links. There are common applications where this would be useful, such as connecting two mono amplifiers to an audio CODEC. Adding support simply requires an update of snd_soc_dai_link_event to loop over the attached CODEC DAIs. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 4a75aae17b2a802a7267206414050408392c374c) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4ca99dfc91b99a1355bef225a3e9a4043d09001c Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353717 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353717" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/17/1353717/4" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I3e6c02a2060bfd8afcca46635a67b41950af22e0" commit="369979663761d6c88e3af07318679c2d9cafb196" commit_message="UPSTREAM: ASoC: dapm: Move CODEC to CODEC params from the widget to the runtime Larger CODECs may contain many several hundred widgets and which set of parameters is selected only needs to be recorded on a per DAI basis. As such move the selected CODEC to CODEC link params to be stored in the runtime rather than the DAPM widget, to save some memory. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 243bcfafcd9a23a20867fd488dc3a35264918d87) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I3e6c02a2060bfd8afcca46635a67b41950af22e0 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353718 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353718" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/18/1353718/4" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Idf79755b310a78121eb33d3078d6ac6561537e52" commit="af8466a7add2683ddc039e18d0fd4c8d806581eb" commit_message="UPSTREAM: ASoC: hdac_hdmi: remove redundant check for !port condition The !port check is redundant as it being performed in the following check. Remove it. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit c24fb71fa4f764f02c17cbf88a969f109794e602) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Idf79755b310a78121eb33d3078d6ac6561537e52 Reviewed-on: https://chromium-review.googlesource.com/1353719 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353719" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/19/1353719/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I23adf3e41e53808bbf933128591687b9dc966c76" commit="5de4ca2c7b40992edee3bbdadfcd937391427368" commit_message="UPSTREAM: ASoC: dapm: Avoid uninitialised variable warning Commit 4a75aae17b2a ("ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links") adds loops that iterate over multiple CODECs in snd_soc_dai_link_event. This also introduced a compiler warning for a potentially uninitialised variable in the case no CODECs are present. This should never be the case as the DAI link must by definition contain at least 1 CODEC however probably best to avoid the compiler warning by initialising ret to zero. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit fc269c0396448cabe1afd648c0b335669aa347b7) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I23adf3e41e53808bbf933128591687b9dc966c76 Reviewed-on: https://chromium-review.googlesource.com/1353720 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353720" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/20/1353720/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ifa650a02519980753fd1cb4a6d22dd98b5130792" commit="604a43f9e619192c3a249b8782e38a107c1f5f71" commit_message="UPSTREAM: ASoC: dapm: Fix a couple uninitialized ret variables Smatch complains that these variables could be uninitialized. The first one in snd_soc_dai_link_event() is probably a false positive, because probably we know the lists are not empty. I would normally ignore the warning, but GCC complains here as well so I just silenced the warning. The "ret" in snd_soc_dapm_new_dai() does need to be initialized or it leads to a bogus dereference in the caller. Fixes: 3bbf5d34fd4a ("ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 2e558a8127de7b2ed3302f9adcf332ba3feeadb2) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ifa650a02519980753fd1cb4a6d22dd98b5130792 Reviewed-on: https://chromium-review.googlesource.com/1353721 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353721" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/1353721/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I0dd54e73f94d29afb82e41fb2375845fc665f7a2" commit="d3e889da0c21d76872e753559675eab18be32066" commit_message="UPSTREAM: ASoC: hdac_hda: use devm_snd_soc_register_component() Now we have devm_snd_soc_register_component(). Let's use it instead of snd_soc_register_component(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 10ccaa39d7628470a3de4aae9d2346a55cbee46e) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I0dd54e73f94d29afb82e41fb2375845fc665f7a2 Reviewed-on: https://chromium-review.googlesource.com/1353722 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353722" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/22/1353722/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ibcaf4cbdc91b31008180a2ebab537e3d589ff555" commit="b2e18cc9c57952048e70c31e046b9c1c725a760e" commit_message="UPSTREAM: ASoC: skl-topology: Use kmemdup to replace kzalloc + memcpy kmemdup has implemented the function that kzalloc() + memcpy() will do. and we prefer to kmemdup rather than the open coded implementation. Signed-off-by: zhong jiang <zhongjiang@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit ca92cc4636fdedf0d7ee88a5e50cd2b85c246a3b) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ibcaf4cbdc91b31008180a2ebab537e3d589ff555 Reviewed-on: https://chromium-review.googlesource.com/1353723 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353723" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/23/1353723/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I5cae1f3ddfb82b12733fd89d10102305ec180323" commit="ab5ce6b088a14347d8aa02f0099563e552bab5a5" commit_message="USPTREAM: ASoC: dapm: Add missing return value check for snd_soc_dapm_new_dai snd_soc_dapm_new_dai may return an error pointer and currently this isn't checked for in dapm_connect_dai_link_widgets. Add code to check the return value and not add routes in that case. Fixes: 778ff5bb8689 ("ASoC: dapm: Move connection of CODEC to CODEC DAIs") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit e36a1d0d249aa09f94d551cadf043a7f9f7fae00) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I5cae1f3ddfb82b12733fd89d10102305ec180323 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353724 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353724" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/24/1353724/4" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I7ce8499eabf6fedc958d40efb515ac1c17514987" commit="4c6a593867c79f2dd5ba1a30ac1d7e396912292b" commit_message="UPSTREAM: ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx() In functions snd_soc_get_volsw_sx() or snd_soc_put_volsw_sx(), if the result of (min + max) is negative, then fls() returns signed integer with value as 32. This leads to signed integer overflow as complete operation is considered as signed integer. UBSAN: Undefined behaviour in sound/soc/soc-ops.c:382:50 signed integer overflow: -2147483648 - 1 cannot be represented in type 'int' Call trace: [<ffffff852f746fe4>] __dump_stack lib/dump_stack.c:15 [inline] [<ffffff852f746fe4>] dump_stack+0xec/0x158 lib/dump_stack.c:51 [<ffffff852f7b5f3c>] ubsan_epilogue+0x18/0x50 lib/ubsan.c:164 [<ffffff852f7b6840>] handle_overflow+0xf8/0x130 lib/ubsan.c:195 [<ffffff852f7b68f0>] __ubsan_handle_sub_overflow+0x34/0x44 lib/ubsan.c:211 [<ffffff85307971a0>] snd_soc_get_volsw_sx+0x1a8/0x1f8 sound/soc/soc-ops.c:382 Typecast the operation to unsigned int to fix the issue. Signed-off-by: Rohit kumar <rohitkr@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit ae7d1247d8673ebfd686b17e759d4be391165368) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I7ce8499eabf6fedc958d40efb515ac1c17514987 Reviewed-on: https://chromium-review.googlesource.com/1353725 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353725" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/25/1353725/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Icb48e20c37cc88df3e17f82ce4ef43561c05b99a" commit="dd0caf9dcf1294625a4553d92105eab18e836ec4" commit_message="UPSTREAM: ASoC: soc-core: avoid nested code on soc_remove_dai() Nested code is not readable. This patch avoid it on soc_remove_dai(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 2eda3cb108b699a6ff78a87e25143c153bc88e41) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Icb48e20c37cc88df3e17f82ce4ef43561c05b99a Reviewed-on: https://chromium-review.googlesource.com/1353726 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353726" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/26/1353726/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ic02ff66a5ef62ec7a47121e2e487a475b75c3e70" commit="4f093e3a657d74a5e6a4ab776de02c4144617b9d" commit_message="UPSTREAM: ASoC: soc-core: remove unused num_dai_links ALSA SoC is counting card->dai_link_list user, but no-one is using it. Let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 4f1b327e65a9516a46ea491ce72a5161be176af8) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ic02ff66a5ef62ec7a47121e2e487a475b75c3e70 Reviewed-on: https://chromium-review.googlesource.com/1353727 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353727" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/27/1353727/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I3c9d28d31b4cc449a18b5f8c163f8d7b8f6d4811" commit="1f0d7236e00384511d2a1f1eb79a43ae39f24763" commit_message="UPSTREAM: ASoC: core: add support to card rebind Current behaviour of ASoC core w.r.t to component removal is that it unregisters dependent sound card totally. There is no support to rebind the card if the component comes back. Typical use case is DSP restart or kernel modules itself. With this patch, core now maintains list of cards that are unbind due to any of its depended components are removed and card not unregistered yet. This list is cleared when the card is rebind successfully or when the card is unregistered from machine driver. This list of unbind cards are tried to bind once again after every new component is successfully added, giving a fair chance for card bind to be successful. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit e894efef9ac7c10b7727798dcc711cccf07569f9) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I3c9d28d31b4cc449a18b5f8c163f8d7b8f6d4811 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353728 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353728" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/28/1353728/4" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I55454bde6479438d168e7a55e66dfbc3d1de5e85" commit="7934ff58789c9e107b43bbee558d66a63fb03b5b" commit_message="UPSTREAM: ASoC: soc-core: remove dai->driver NULL check It is strange if it has "dai" but doesn't have "dai->driver". And more over "dai->driver->xxx" is used everywhere without "dai->driver" pointer NULL checking. It got Oops already if "dai->driver" was NULL. Let's remove un-needed "dai->driver" NULL check. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit a7c439d6128de2cbc087ae7524b47f613ff8bc6c) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I55454bde6479438d168e7a55e66dfbc3d1de5e85 Reviewed-on: https://chromium-review.googlesource.com/1353729 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353729" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/1353729/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="If6b95e361c7ae1091a8cde037a4786e1ec9ed3bb" commit="65a70fb8b216b9e86b62e076a16034f9c486c7b7" commit_message="UPSTREAM: Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation" This reverts commit 12eeeb4f4733bbc4481d01df35933fc15beb8b19. The patch doesn't fix accessing memory with null pointer in skl_interrupt(). There are two problems: 1) skl_init_chip() is called twice, before and after dma buffer is allocate. The first call sets bus->chip_init which prevents the second from initializing bus->corb.buf and rirb.buf from bus->rb.area. 2) snd_hdac_bus_init_chip() enables interrupt before snd_hdac_bus_init_cmd_io() initializing dma buffers. There is a small window which skl_interrupt() can be called if irq has been acquired. If so, it crashes when using null dma buffer pointers. Will fix the problems in the following patches. Also attaching the crash for future reference. [ 16.949148] general protection fault: 0000 [#1] PREEMPT SMP KASAN PTI <snipped> [ 16.950903] Call Trace: [ 16.950906] <IRQ> [ 16.950918] skl_interrupt+0x19e/0x2d6 [snd_soc_skl] [ 16.950926] ? dma_supported+0xb5/0xb5 [snd_soc_skl] [ 16.950933] __handle_irq_event_percpu+0x27a/0x6c8 [ 16.950937] ? __irq_wake_thread+0x1d1/0x1d1 [ 16.950942] ? __do_softirq+0x57a/0x69e [ 16.950944] handle_irq_event_percpu+0x95/0x1ba [ 16.950948] ? _raw_spin_unlock+0x65/0xdc [ 16.950951] ? __handle_irq_event_percpu+0x6c8/0x6c8 [ 16.950953] ? _raw_spin_unlock+0x65/0xdc [ 16.950957] ? time_cpufreq_notifier+0x483/0x483 [ 16.950959] handle_irq_event+0x89/0x123 [ 16.950962] handle_fasteoi_irq+0x16f/0x425 [ 16.950965] handle_irq+0x1fe/0x28e [ 16.950969] do_IRQ+0x6e/0x12e [ 16.950972] common_interrupt+0x7a/0x7a [ 16.950974] </IRQ> <snipped> [ 16.951031] RIP: snd_hdac_bus_update_rirb+0x19b/0x4cf [snd_hda_core] RSP: ffff88015c807c08 [ 16.951036] ---[ end trace 58bf9ece1775bc92 ]--- Fixes: 2eeeb4f4733b ("ASoC: Intel: Skylake: Acquire irq after RIRB allocation") Signed-off-by: Yu Zhao <yuzhao@google.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 542cedec53c9e8b73f3f05bf8468823598c50489) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: If6b95e361c7ae1091a8cde037a4786e1ec9ed3bb Reviewed-on: https://chromium-review.googlesource.com/1353730 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353730" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="21" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/30/1353730/21" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ie3aee930dc5f3caec1d827ab91e33162c5da8111" commit="941a047d4171d60150fed91225742b6eaf1d791c" commit_message="Revert "FROMLIST: ASoC: soc-core: fix init platform memory handling" This reverts commit 325887c9b89d9f78d24143ac666e873c2c83d1f7. Reason for revert: Reverting to undo expected conflicts (as listed in previous commit message) Original change's description: > FROMLIST: ASoC: soc-core: fix init platform memory handling > > snd_soc_init_platform initializes pointers to snd_soc_dai_link which is > statically allocated and it does this by devm_kzalloc. In the event of > an EPROBE_DEFER the memory will be freed and the pointers are left > dangling. snd_soc_init_platform sees the dangling pointers and assumes > they are pointing to initialized memory and does not reallocate them on > the second probe attempt which results in a use after free bug since > devm has freed the memory from the first probe attempt. > > Since the intention for snd_soc_dai_link->platform is that it can be set > statically by the machine driver we need to respect the pointer in the > event we did not set it but still catch dangling pointers. The solution > is to add a flag to track whether the pointer was dynamically allocated > or not. > > Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> > (am from http://mailman.alsa-project.org/pipermail/alsa-devel/2019-January/144148.html) > > BUG=b:110025789 > TEST=test basic audio functionality on samus, octopus and grunt > > Conflicts: > sound/soc/soc-core.c > Depends on UPSTREAM: ASoC: soc-core: manage platform name under snd_soc_init_platform() > Which depends on UPSTREAM: ASoC: Remove platform code now everything is componentised > Which is what this patchset is preparing to land. Will revert > and reland this cleanly once the platform code is removed > > Change-Id: I2ce2291566aac77804efaedcdb21beacb58147ad > Reviewed-on: https://chromium-review.googlesource.com/1405813 > Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> > Tested-by: Curtis Malainey <cujomalainey@chromium.org> > Reviewed-by: Dylan Reid <dgreid@chromium.org> Bug: b:110025789 Change-Id: Ie3aee930dc5f3caec1d827ab91e33162c5da8111 CQ-DEPEND=CL:1418999 Reviewed-on: https://chromium-review.googlesource.com/1418080 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="4" gerrit_number="1418080" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/80/1418080/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I46419da10147f96e5c9bddc924ba5db3af6050a6" commit="d5c461401cb0ecc09f7a60c1a9306adbc2893a61" commit_message="UPSTREAM: ASoC: soc-core: manage platform name under snd_soc_init_platform() Now "platform" is controlled by snd_soc_dai_link_component, thus its "name" can be initialized in snd_soc_init_platform(), instead of soc_bind_dai_link() local. This patch do it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 4a9ed39477bd1635cf23b49e10f9e364329bbe46) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I46419da10147f96e5c9bddc924ba5db3af6050a6 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353731 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353731" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="25" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/31/1353731/25" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Id1b66ffc7c64f4f235bc0b88a0b0919e27673502" commit="c39a1522d9eddfdaf20d0733eccd4148bc4fdf93" commit_message="FROMGIT: ASoC: soc-core: fix init platform memory handling snd_soc_init_platform initializes pointers to snd_soc_dai_link which is statically allocated and it does this by devm_kzalloc. In the event of an EPROBE_DEFER the memory will be freed and the pointers are left dangling. snd_soc_init_platform sees the dangling pointers and assumes they are pointing to initialized memory and does not reallocate them on the second probe attempt which results in a use after free bug since devm has freed the memory from the first probe attempt. Since the intention for snd_soc_dai_link->platform is that it can be set statically by the machine driver we need to respect the pointer in the event we did not set it but still catch dangling pointers. The solution is to add a flag to track whether the pointer was dynamically allocated or not. Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 09ac6a817bd687e7f5dac00470262efdd72f9319) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Id1b66ffc7c64f4f235bc0b88a0b0919e27673502 Reviewed-on: https://chromium-review.googlesource.com/1418999 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> " fail_count="4" gerrit_number="1418999" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/99/1418999/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="If466c5acbba94446ae3183ebead01cf04bfcf133" commit="a4bec228a0450a21453ba6276e9f2812543c04ba" commit_message="UPSTREAM: ASoC: soc-core: add snd_soc_is_matching_component() To find (CPU/)Codec/Platform, we need to find component first (= on CPU/Codec/Platform), and find DAI from it (= CPU/Codec). These are similar operation but difficult to be simple, and has many duplicate code to finding component. This patch adds new snd_soc_is_matching_component(), and reduce duplicate codes. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit be6ac0a9ced99403c435b2b2fe9ac4bd55749823) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: If466c5acbba94446ae3183ebead01cf04bfcf133 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353732 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353732" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/32/1353732/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I600838f0b294d6411b84b630bb61c7965960e634" commit="87d81e5e9e9e1831b5b6695eca850b459616df82" commit_message="UPSTREAM: ASoC: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly The value of period_bytes will get the zero before the hw_params() is not run completely. Move the function snd_pcm_lib_period_bytes() to copy work, and make sure that is not zero. Signed-off-by: Oder Chiou <oder_chiou@realtek.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit fbb673f7c6555d5434ad005f86b0d4368b1203d9) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I600838f0b294d6411b84b630bb61c7965960e634 Reviewed-on: https://chromium-review.googlesource.com/1353733 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353733" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/33/1353733/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Icabad9a2d5cdae367b21f26b27412bd10a889681" commit="2bc84be7525892749c828c61103aab832f15ba32" commit_message="UPSTREAM: ASoC: remove redundant include module.h already contained moduleparam.h, so it is safe to remove the redundant include. The issue is detected with the help of Coccinelle. Signed-off-by: zhong jiang <zhongjiang@huawei.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 29ca7d32d7f10737e8d165fcf40fe31d44b06bee) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Icabad9a2d5cdae367b21f26b27412bd10a889681 Reviewed-on: https://chromium-review.googlesource.com/1353734 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="4" gerrit_number="1353734" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/34/1353734/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I7e369b8c921ed6a925ef243a4d40ccffbea3a2b9" commit="7305267c0f2614425953fbc1762d42a8263d4ee0" commit_message="UPSTREAM: ASoC: rt5677-spi: Drop unused GPIO include This SPI driver does not use the legacy GPIO header so just delete it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 65ba4dd5200a537eae0f6b29e120f3971eac5a4d) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I7e369b8c921ed6a925ef243a4d40ccffbea3a2b9 Reviewed-on: https://chromium-review.googlesource.com/1353740 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353740" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/1353740/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ieea6b606c5013186236652a39f288288dce19756" commit="e7bae9958873ec3e246d68ab32e37002a0ffe054" commit_message="UPSTREAM: ALSA: hda: Fix the audio-component completion timeout The timeout of audio component binding was incorrectly specified in msec, not in jiffies, which results in way too shorter timeout than expected. Along with fixing it, add the information print about the binding failure to show the unexpected situation more clearly. Fixes: a57942bfdd61 ("ALSA: hda: Make audio component support more generic") Signed-off-by: Takashi Iwai <tiwai@suse.de> (cherry picked from commit b3a5402cbcebaf5a9db4d6a3268070e4a099355d) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ieea6b606c5013186236652a39f288288dce19756 Reviewed-on: https://chromium-review.googlesource.com/1353741 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353741" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/1353741/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I4b65f4542598a5abfaf8a9f4b7dbd8c554919cb0" commit="b72b901a124a523b8ef52109af00ef4105759170" commit_message="UPSTREAM: ASoC: convert for_each_rtd_codec_dai() for missing part commit 0b7990e38971 ("ASoC: add for_each_rtd_codec_dai() macro") added for_each_rtd_codec_dai(), but it didn't convert few loop which is not using "rtd". This patch fixup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 7afecb3073e357ebfe4087e4ab8bb493c32bb652) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4b65f4542598a5abfaf8a9f4b7dbd8c554919cb0 Reviewed-on: https://chromium-review.googlesource.com/1353742 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sudarshan S <sudarshan.s@intel.com> " fail_count="4" gerrit_number="1353742" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/1353742/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Iafcbafebdb1f4331a082fc396f2a3e7f8a106cc2" commit="f497c8ad176e7cbaa68e2b6e79bdd1b22533c29a" commit_message="UPSTREAM: ASoC: rename for_each_rtd_codec_dai_reverse to rollback commit 0b7990e38971 ("ASoC: add for_each_rtd_codec_dai() macro") added for_each_rtd_codec_dai_reverse(). but _rollback() is better naming than _reverse(). This patch rename it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 6d11b12879144da5f5aa08071a8a7f95f3b5a4e8) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Iafcbafebdb1f4331a082fc396f2a3e7f8a106cc2 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353743 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353743" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/1353743/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ib7fb4d31d8a0d15411ffd4075142b372e59c0605" commit="a5ee71cfd3f306a3b7bd9cd5d855f8cde28098c3" commit_message="UPSTREAM: ASoC: samsung: i2s: Use specific name for i2s dais Add specific dais name when components are registered. Component and dai name will follow their parent dev name, if the name isn't described. In case of this driver, each dais will have same name like '11440000.i2s0' by fmt_single_name function. The problem having same name is that TM2 machine driver can't detect capture devices correctly. Machine driver doesn't know which one is proper to use for cpu dai. The driver just selects to use 'samsung-i2c-sec' that doesn't have capture functionality because the component of samsung-i2s-sec is located in the first of the component_list. I add dai name like 'samsung-i2s', 'samsung-i2s-sec' for each dais. The reason why adding dai id to 1 is that it doesn't allow to use particular dai name in case of when I use 0 for dai id. Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 22289ddcd87285b3d61cd8b129438ca6abb1aa37) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ib7fb4d31d8a0d15411ffd4075142b372e59c0605 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1419000 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1419000" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/00/1419000/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="Ic11d1faf22719f531641c19499278d45bbf39a4f" commit="b94d9e3f2d7009403b53f3037df2bf98975341b8" commit_message="UPSTREAM: ASoC: samsung: i2s: Define the parameters list for SAMSUNG_I2S_OPCLK The SAMSUNG_I2S_OPCLK is not currently used by any card driver thus we can safely change semantics of 'dir' argument of the I2S set_sysclk() callback. Now an enumeration is exported instead of directly using register bit field values. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 45ae70e8b60e1d1bbc71eeccaef4026c5e6638a3) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: Ic11d1faf22719f531641c19499278d45bbf39a4f Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1419001 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1419001" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/01/1419001/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I901a63b176fc06bc2ffda3ea38f9b7eadcef6ddb" commit="623b4475221861d1126dc7dcb2e5ed0cebd65bea" commit_message="UPSTREAM: ASoC: samsung: Use 'samsung-i2s' cpu_dai for dai_links Add specific cpu_dai_name to dai_link because samsung i2s driver registers two dais and components. Selecting one of them clearly is needed more information like cpu_dai_name, of_node. The reason why the dai_links have to use 'samsung-i2s' for cpu_dai is that 'samsung-i2s-sec' doesn't have a capture functionality. Without this code, cpu_dai will be selected the first one of the component_list. For example, if I describe nothing to cpu_dai_name, 'samsung-i2s-sec' might be selected to HiFi Primay. Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit e8d93208905a9987c211f97a14a93f2776ab52e7) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I901a63b176fc06bc2ffda3ea38f9b7eadcef6ddb Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1419002 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1419002" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/02/1419002/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I56ab0dcc9e8bdd02f5801f204b937c226fb3514d" commit="7cf269b63caaa86d6241585120998ce79530a3fc" commit_message="UPSTREAM: ASoC: samsung: Add support for HDMI audio on TM2 board This patch defines I2S1 - HDMI DAI link and implements related hw_params callback. The AUD PLL frequency is configured through the CLK_SCLK_I2S1 leaf clock, the exynos5433 clock tree definitions are updated in a separate patch. The device tree parsing part is changed is a way it supports older DTBs with just a single CPU DAI specified, without the HDMI link. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 8d1513cef51a11dcf8ccb89d089515483a5ad397) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I56ab0dcc9e8bdd02f5801f204b937c226fb3514d Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1419003 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1419003" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/03/1419003/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I1cdf91abb3c5c15ff37bb2ae04e00dcf6755eaae" commit="b7af3c099b4c7afa8a821241b2190c65a439e633" commit_message="UPSTREAM: ASoC: add mt6797-mt6351 driver and config option Signed-off-by: KaiChieh Chuang <kaichieh.chuang@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit f0ab0bf250da5a115d5675a686117f21984f0760) BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I1cdf91abb3c5c15ff37bb2ae04e00dcf6755eaae Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1419004 Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Ben Zhang <benzh@chromium.org> " fail_count="4" gerrit_number="1419004" owner_email="cujomalainey@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/04/1419004/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I4631a9379cc749c75b801ccc7bf47f74669ab1b1" commit="388895cce420be1ac4b96159f229c9e515858af2" commit_message="BACKPORT: ASoC: add for_each_card_prelinks() macro To be more readable code, this patch adds new for_each_card_prelinks() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 7fe072b4df5d0cc832eb758c1eed243c145a2dfc) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> Conflicts: sound/soc/meson/axg-card.c File only exists upstream, not resolving due to dependencies in upstream changes in drivers/clk/clk.c BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I4631a9379cc749c75b801ccc7bf47f74669ab1b1 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353744 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353744" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/1353744/6" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I6910ea09f60d099e26ee122c88e57c2779ccfeaf" commit="16d2fa09245a58c8228368cb28a92d294a8f4303" commit_message="UPSTREAM: ASoC: add for_each_card_links() macro To be more readable code, this patch adds new for_each_card_links() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 98061fdbfccc02aa0fd6637c67a0524aab385b8d) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I6910ea09f60d099e26ee122c88e57c2779ccfeaf Reviewed-on: https://chromium-review.googlesource.com/1353745 Commit-Ready: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-by: Kamal Ap <kamal.ap@intel.com> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> " fail_count="4" gerrit_number="1353745" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="23" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/1353745/23" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.14" change_id="I0d0c83540481cb47defaaf9fb01a1396cd5dd9f9" commit="17f9b08f4333b01376fb7a6bfedb057e9af21946" commit_message="UPSTREAM: ASoC: add for_each_card_rtds() macro To be more readable code, this patch adds new for_each_card_rtds() macro, and replace existing code to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit bcb1fd1fcd6507ba5a1f8610550135dc367aedb7) Signed-off-by: Samaga Prasanna Krishna <samaga.krishna@intel.corp-partner.google.com> BUG=b:110025789 TEST=Test Audio use cases with full SOF 0.6 rebase release series applied. Change-Id: I0d0c83540481cb47defaaf9fb01a1396cd5dd9f9 Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1353746 Reviewed-by: Kamal Ap <kamal.ap@intel.com> " fail_count="4" gerrit_number="1353746" owner_email="samaga.krishna@intel.corp-partner.google.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/1353746/6" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="Idb80a124462b30adca6af86621aed136be8caa99" commit="03465ce025c41ed73a244d6ecf9360a93713aa4d" commit_message="RT946x: Make mt6370_led_set_color accept composite colors Currently, mt6370_led_set_color can handle only simple colors. That is, if a green LED is turned on, other LEDs are forced to be off. To allow composite colors (e.g. red+green), this change makes mt6370_led_set_color control LEDs independently. For example, to mix green and red, it can be called as mt6370_led_set_color(LED_MASK_GREEN | LED_MASK_RED); This is consistent with other RT946x LED APIs in the sense that they also control each LED independently. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=b/123613083 BRANCH=none TEST=Verify LED behavior doesn't change on Kukui by console command Change-Id: Idb80a124462b30adca6af86621aed136be8caa99 Reviewed-on: https://chromium-review.googlesource.com/1452617 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> " fail_count="0" gerrit_number="1452617" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="5" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/17/1452617/5" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ie70fc827156081c7e55875bf28acbb0f42442162" commit="5ff1a98d88113d1edf6893cab04a2bfd8a6afa27" commit_message="Flapjack: Remove console commands to create flash space This patch removes the following commands: CONFIG_CMD_ADC CONFIG_CMD_ACCELSPOOF CONFIG_CMD_FASTCHARGE CONFIG_CMD_GETTIME CONFIG_CMD_MEM Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=none BRANCH=none TEST=Verify flapjack boots Change-Id: Ie70fc827156081c7e55875bf28acbb0f42442162 Reviewed-on: https://chromium-review.googlesource.com/1459558 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: YH Lin <yueherngl@chromium.org> " fail_count="0" gerrit_number="1459558" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/58/1459558/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ia2d9867e9d4836545723cb61973483e25f38b305" commit="fa28401810220ee785a870a106e5df8f48563440" commit_message="Flapjack: Enable CBI This patch enables cros board info. EC console looks as follows: [0.000747 CBI Reading board info] [0.001232 CBI Bad magic] [0.001313 CBI Reading board info] [0.001797 CBI Bad magic] [0.001879 Board Version: 0x0000] [0.001984 OEM: 0] [0.002062 SKU: 0x00000000] Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=b/123676982 BRANCH=none TEST=See the description above. Change-Id: Ia2d9867e9d4836545723cb61973483e25f38b305 Reviewed-on: https://chromium-review.googlesource.com/1459559 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: YH Lin <yueherngl@chromium.org> " fail_count="0" gerrit_number="1459559" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/59/1459559/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.19" change_id="I7ebd1d564dc398d424d28349c021106e215acd5f" commit="fc46a5c2e028601df5b78b4b67d9079cf6d41ac4" commit_message="FROMGIT: cpufreq: Auto-register the driver as a thermal cooling device if asked All cpufreq drivers do similar things to register as a cooling device. Provide a cpufreq driver flag so drivers can just ask the cpufreq core to register the cooling device on their behalf. This allows us to get rid of duplicated code in the drivers. In order to allow this, we add a struct thermal_cooling_device pointer to struct cpufreq_policy so that drivers don't need to store it in a private data structure. Suggested-by: Stephen Boyd <swboyd@chromium.org> Suggested-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 5c238a8b599f1ae25eaeb08ad0e9e13e2b9eb023 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next) BUG=b:116109744, b:116109717 TEST=build for cheza Change-Id: I7ebd1d564dc398d424d28349c021106e215acd5f Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1455526 Commit-Ready: Evan Green <evgreen@chromium.org> Reviewed-by: Evan Green <evgreen@chromium.org> " fail_count="0" gerrit_number="1455526" 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/26/1455526/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.19" change_id="Ib371bcee630998a520ddf1d1302f82e3ae4139e2" commit="2a561b6774fccc886bbc6686f7534e43d2feec4a" commit_message="FROMGIT: cpufreq: qcom-hw: Register as a cpufreq cooling device Add the CPUFREQ_IS_COOLING_DEV flag to allow the cpufreq core to auto-register the driver as a cooling device. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 4c5ff1c8320d209c038f3698d8fa91fe946a3818 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next) BUG=b:116109744, b:116109717 TEST=on cheza w/ full thermal config: /sys/class/thermal/cooling_device[01] exist Change-Id: Ib371bcee630998a520ddf1d1302f82e3ae4139e2 Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1455527 Commit-Ready: Evan Green <evgreen@chromium.org> Reviewed-by: Evan Green <evgreen@chromium.org> " fail_count="0" gerrit_number="1455527" 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/27/1455527/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Id6276b3e3f8869fdc702e3086bb22802a6b71af3" commit="61333e601694fa175aa9b1cd994c2fa7b57b486e" commit_message="Revert "vm_tools: arc_networkd: Refactor MacAddressGenerator, Subnet and SubnetPool." This reverts commit 51b81cd673569c5ce1e4e35af3881d7d3f03c722. Reason for revert: chromium:929735 Original change's description: > vm_tools: arc_networkd: Refactor MacAddressGenerator, Subnet and SubnetPool. > > This patch moves these address management classes from Concierge into a > shared utility library within arc_networkd. It is the first step in the > process of migrating all address management responsibilites for CrOS > guests into arc_networkd as part of the multi-networking effort. > There is no functional change to Concierge. > > BUG=b:77293260 > TEST=arc-networkd and vm_host_tools unit tests > TEST=tast test vm.* on nocturne > > CQ-DEPEND=CL:1436434 > > Change-Id: I96ef5635804704683574ddd546da57b1051b3686 > Reviewed-on: https://chromium-review.googlesource.com/1433314 > Commit-Ready: Garrick Evans <garrick@chromium.org> > Tested-by: Garrick Evans <garrick@chromium.org> > Reviewed-by: Hugo Benichi <hugobenichi@google.com> > Reviewed-by: Stephen Barber <smbarber@chromium.org> > Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> CQ-DEPEND=CL:1458717 BUG=b:77293260, chromium:929735 TEST=trybot Change-Id: Id6276b3e3f8869fdc702e3086bb22802a6b71af3 Reviewed-on: https://chromium-review.googlesource.com/1458719 Commit-Ready: Douglas Anderson <dianders@chromium.org> Tested-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="1458719" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/19/1458719/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I6048d20bdb0076eae337d9475fba045667062ac0" commit="b6f28ad9cd9877319cf99f6e389f4666924f281a" commit_message="Revert "vm_tools: arc_networkd: Install and use shared network utils." This reverts commit 96cdb57418bf8026a21761e90f2e5e5f084fe688. Reason for revert: chromium:929735 Original change's description: > vm_tools: arc_networkd: Install and use shared network utils. > > This patch installs the arc_network utility library and adds it as a > vm_tools dependency. > > BUG=b:77293260 > TEST=arc_networkd and vm_host_tools unit tests > TEST=tast test vm.* on nocturne > > CQ-DEPEND=CL:1433314 > > Change-Id: I7f09723cf9d2a85e9472caa6a0d10f0752b73b41 > Reviewed-on: https://chromium-review.googlesource.com/1436434 > Commit-Ready: Garrick Evans <garrick@chromium.org> > Tested-by: Garrick Evans <garrick@chromium.org> > Reviewed-by: Stephen Barber <smbarber@chromium.org> CQ-DEPEND=CL:1458719 BUG=b:77293260, chromium:929735 TEST=trybot Change-Id: I6048d20bdb0076eae337d9475fba045667062ac0 Reviewed-on: https://chromium-review.googlesource.com/1458717 Commit-Ready: Douglas Anderson <dianders@chromium.org> Tested-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="1458717" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/17/1458717/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I3e6896f3a7af3c0c8593e1785759796c8420217d" commit="782cd4ec98b5254492d3170c3e7a88e7d37e904c" commit_message="libbrillo: SecureAllocator for erase-on-deallocation SecureAllocator is a generic allocator that overloads the std::allocator to memset the contents to 0 before clearing the memory. This is a useful building block for constructing SecureBlob-like data types. Further iterations improve this allocator. BUG=chromium:728047 TEST=unittests Change-Id: I3e6896f3a7af3c0c8593e1785759796c8420217d Reviewed-on: https://chromium-review.googlesource.com/1242273 Commit-Ready: Sarthak Kukreti <sarthakkukreti@chromium.org> Tested-by: Sarthak Kukreti <sarthakkukreti@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org> " fail_count="0" gerrit_number="1242273" owner_email="sarthakkukreti@chromium.org" pass_count="0" patch_number="17" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/73/1242273/17" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib4ff1e41272ebf199c6361da4b572a43d403a003" commit="5658630c100b80c6e436905781ba0b7d1e8979ef" commit_message="For boards configured with an RW B side, produce a hex file for the B side. If a board configuration produces an RW image for its B side, it makes sense that requesting the "hex" target would produce a hex file for the B side image as well as the A side image. BUG=none BRANCH=none TEST=make -j buildall Signed-off-by: Carl Hamilton <carlh@chromium.org> Change-Id: Ib4ff1e41272ebf199c6361da4b572a43d403a003 Reviewed-on: https://chromium-review.googlesource.com/1369686 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> " fail_count="0" gerrit_number="1369686" owner_email="carlh@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/86/1369686/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib2c0b168fd23780786d320be93d9c87acd10279d" commit="b747a68b4fad94db037aafec19956f331d1750e8" commit_message="iwlwifi: add Core40 FWs for integrated 9000 series Build number: Core_build_core40-120 Revision numbers: 95eb4e97 (9000) BUG=TBD TEST=TBD Change-Id: Ib2c0b168fd23780786d320be93d9c87acd10279d Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Reviewed-on: https://chromium-review.googlesource.com/1392905 Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org> Tested-by: Kirtika Ruchandani <kirtika@chromium.org> Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org> " fail_count="1" gerrit_number="1392905" owner_email="emmanuel.grumbach@intel.com" pass_count="0" patch_number="1" project="chromiumos/third_party/linux-firmware" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/linux-firmware" ref="refs/changes/05/1392905/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="Iaed0655f475a6e242a612c771bb104c20e38cd4c" commit="61e27860e7b9880dc88ed1de44e1b6f9df0a84d7" commit_message="project-mobbase: disable dlc USE flag Remove dlc USE flag. BUG=chromium:920855 TEST=None Change-Id: Iaed0655f475a6e242a612c771bb104c20e38cd4c Reviewed-on: https://chromium-review.googlesource.com/1422555 Commit-Ready: Xiaochu Liu <xiaochu@chromium.org> Tested-by: Xiaochu Liu <xiaochu@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Nicolas Norvez <norvez@chromium.org> " fail_count="0" gerrit_number="1422555" owner_email="xiaochu@chromium.org" pass_count="0" patch_number="4" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/55/1422555/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I7d1ecafe9720f296bc8c36eed501f099bc0dc11e" commit="6e2bd49a778e73e268a3704bfc723b6b99a72f1c" commit_message="tast-tests: Fix race issue on SignalWatcher.Close(). BUG=chromium:929573 TEST=Ran on DUT. Ran test. Change-Id: I7d1ecafe9720f296bc8c36eed501f099bc0dc11e Reviewed-on: https://chromium-review.googlesource.com/1457976 Commit-Ready: Hidehiko Abe <hidehiko@chromium.org> Tested-by: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> " fail_count="0" gerrit_number="1457976" owner_email="hidehiko@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/tast-tests" project_url="https://chromium-review.googlesource.com/chromiumos/platform/tast-tests" ref="refs/changes/76/1457976/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I940d407ce7c553e8a04934c2739bca9b338b378b" commit="03b9cd35bf496f3efbac346dfde115218057c9ab" commit_message="video: Make time limit longer for camera tests on VM When a camera test runs on VM builder like amd64-generic, it use vivid, which is slower than real cameras. So, in order to make these tests less flaky, this CL makes time limit longer when DUT is VM. BUG=chromium:929537 TEST=tast run <amd64-generic VM> video.WebRTC* Change-Id: I940d407ce7c553e8a04934c2739bca9b338b378b Signed-off-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1457978 Commit-Ready: Dan Erat <derat@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="0" gerrit_number="1457978" owner_email="keiichiw@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/tast-tests" project_url="https://chromium-review.googlesource.com/chromiumos/platform/tast-tests" ref="refs/changes/78/1457978/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.19" change_id="I76deab43ee258175ef3c9022d4f5330e70722220" commit="589926d7ba553901d729669ceb8284557fd3fd76" commit_message="UPSTREAM: vhost: fix OOB in get_rx_bufs() [ Upstream commit b46a0bf78ad7b150ef5910da83859f7f5a514ffd ] After batched used ring updating was introduced in commit e2b3b35eb989 ("vhost_net: batch used ring update in rx"). We tend to batch heads in vq->heads for more than one packet. But the quota passed to get_rx_bufs() was not correctly limited, which can result a OOB write in vq->heads. headcount = get_rx_bufs(vq, vq->heads + nvq->done_idx, vhost_len, &in, vq_log, &log, likely(mergeable) ? UIO_MAXIOV : 1); UIO_MAXIOV was still used which is wrong since we could have batched used in vq->heads, this will cause OOB if the next buffer needs more than 960 (1024 (UIO_MAXIOV) - 64 (VHOST_NET_BATCH)) heads after we've batched 64 (VHOST_NET_BATCH) heads: Acked-by: Stefan Hajnoczi <stefanha@redhat.com> ============================================================================= BUG kmalloc-8k (Tainted: G B ): Redzone overwritten ----------------------------------------------------------------------------- INFO: 0x00000000fd93b7a2-0x00000000f0713384. First byte 0xa9 instead of 0xcc INFO: Allocated in alloc_pd+0x22/0x60 age=3933677 cpu=2 pid=2674 kmem_cache_alloc_trace+0xbb/0x140 alloc_pd+0x22/0x60 gen8_ppgtt_create+0x11d/0x5f0 i915_ppgtt_create+0x16/0x80 i915_gem_create_context+0x248/0x390 i915_gem_context_create_ioctl+0x4b/0xe0 drm_ioctl_kernel+0xa5/0xf0 drm_ioctl+0x2ed/0x3a0 do_vfs_ioctl+0x9f/0x620 ksys_ioctl+0x6b/0x80 __x64_sys_ioctl+0x11/0x20 do_syscall_64+0x43/0xf0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 INFO: Slab 0x00000000d13e87af objects=3 used=3 fp=0x (null) flags=0x200000000010201 INFO: Object 0x0000000003278802 @offset=17064 fp=0x00000000e2e6652b Fixing this by allocating UIO_MAXIOV + VHOST_NET_BATCH iovs for vhost-net. This is done through set the limitation through vhost_dev_init(), then set_owner can allocate the number of iov in a per device manner. This fixes CVE-2018-16880. BUG=crbug:929624 TEST=None Change-Id: I76deab43ee258175ef3c9022d4f5330e70722220 Fixes: e2b3b35eb989 ("vhost_net: batch used ring update in rx") Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit aafe74b726891386cd139d3432ec619ed5189b29 from linux-4.19.y) Signed-off-by: Zubin Mithra <zsm@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1458877 " fail_count="0" gerrit_number="1458877" owner_email="zsm@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/1458877/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I894a40a4409b0c422b82158f452f81943277285d" commit="226c1f25442dfc5be665870a27323b72e31e034e" commit_message="console.py: Handle non-TTY input (e.g. piped input), and other improvements. Changes: - Do not assume stdin input is a TTY. Only attempt to manipulate terminal settings when connected to an actual terminal. - Exit upon EOF. This is mostly relevant for non-TTY input, e.g. piped input, though this is not conditioned on TTY-ness. - For non-TTY inputs, sleep before exiting after EOF, in order to allow for for reading a response from the USB console device (e.g. from the Servo). The sleep time is configurable by -S / --notty-exit-sleep command line option, default 0.2 seconds. - Replace os.sleep(0.1) busy loop with waiting on a threading.Event. - Print a newline character upon exit so that a user's shell prompt will not be printed mid-line. BRANCH=none BUG=b:123727520 TEST=I tested handling of non-TTY input by piping Servo v4 console commands such as: $ echo version | ./console.py -d 18d1:501b $ echo reboot | ./console.py -d 18d1:501b With this change, console.py now exits on its own after sending the piped command. Previously when given piped input it would lose the first character of the input due to the attempt to change TTY settings, then it would wait indefinitely for ctrl+c or other signal, and finally it would traceback upon ctrl+c. I tested handling of TTY input in the usual manner, without redirecting stdin. That still works smootly, exits without error upon ctrl+c, and no longer causes the next shell prompt to start mid-line. Change-Id: I894a40a4409b0c422b82158f452f81943277285d Signed-off-by: Matthew Blecker <matthewb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1459139 Reviewed-by: Nick Sanders <nsanders@chromium.org> " fail_count="0" gerrit_number="1459139" owner_email="matthewb@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/39/1459139/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Idab0877f77d69d8e0b099891834cb775535dd058" commit="3fa828adea4f6b28c5b4d5f1f2e326d8c822688d" commit_message="ec_commands: Fix more warnings from check_patch.pl Rename lid_ang lid_angle, split long lines. BRANCH=none BUG=none TEST=Compile. Change-Id: Idab0877f77d69d8e0b099891834cb775535dd058 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1428759 Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="0" gerrit_number="1428759" owner_email="gwendal@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/59/1428759/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I5e6f0d8c912fbc1b60f6a04c92198e6bca3e0337" commit="da2db9e4c26858beb83acf58b0d7f6ab6f8d9f97" commit_message="sys-kernel: fix relative path handling in chromeos-version.sh If you run chromeos-version.sh with a relative path, the realpath call fails because the cwd was changed to $1 *before* we resolved $0. Swap the order to avoid that -- resolve $0 first then chdir to $1. BUG=chromium:731285 TEST=`./chromeos-version.sh ../../../../kernel/v4.19/` no longer errors out Change-Id: I5e6f0d8c912fbc1b60f6a04c92198e6bca3e0337 Reviewed-on: https://chromium-review.googlesource.com/1459500 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: LaMont Jones <lamontjones@chromium.org> " fail_count="0" gerrit_number="1459500" owner_email="vapier@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/00/1459500/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I9e2fd6fe2d2d7549a53db12b74cf8f4086e39d04" commit="396e363aa44a395691ca10dcb438fcc96267391d" commit_message="mosys: add support for flapjack BUG=b:120510740 TEST=build and run "mosys platform id" Change-Id: I9e2fd6fe2d2d7549a53db12b74cf8f4086e39d04 Reviewed-on: https://chromium-review.googlesource.com/1440083 Commit-Ready: YH Lin <yueherngl@chromium.org> Tested-by: YH Lin <yueherngl@chromium.org> Reviewed-by: Nick Sanders <nsanders@chromium.org> " fail_count="0" gerrit_number="1440083" owner_email="yueherngl@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/mosys" project_url="https://chromium-review.googlesource.com/chromiumos/platform/mosys" ref="refs/changes/83/1440083/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I24d7de2c07028f2e0dd264f4d75bae943d7fc64d" commit="32dc7bf17c3f4f3840989b0ed79319866098e373" commit_message="net-misc/modemmanager-next: import MM_LOGLEVEL environment variable In order to capture debug logs early in the ModemManager startup process, we used to restart the ModemManager upstart job with MM_LOGLEVEL=DEBUG. That no longer works after CL:1013931, which changed upstart to only import externally supplied variables into the job environment if the job explicitly declares them using the import statement. This CL updates the ModemManager upstart job to explicitly import the MM_LOGLEVEL environment variable and also adds a check to validate the value of MM_LOGLEVEL. BUG=None TEST=Verify that `restart ModemManager` starts ModemManager with INFO log level. TEST=Verify that `restart ModemManager MM_LOGLEVEL=DEBUG` starts ModemManager with DEBUG log level. TEST=Verify that `restart ModemManager MM_LOGLEVEL=FOO` fails. Change-Id: I24d7de2c07028f2e0dd264f4d75bae943d7fc64d Reviewed-on: https://chromium-review.googlesource.com/1459016 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="1459016" owner_email="benchan@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/16/1459016/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ifd22fa4d9ee36bd41af6b8170eb5338f975b3f32" commit="5cb9df7578608c98891e3aba8bff2e0fbf7eaa62" commit_message="shill: initialize member variables via constructor initializer list This CL updates the IPConfig constructor to initialize |IPConfig::current_lease_expiration_time_| and |IPConfig::time_| via constructor initializer list. BUG=None TEST=Run unit tests. Change-Id: Ifd22fa4d9ee36bd41af6b8170eb5338f975b3f32 Reviewed-on: https://chromium-review.googlesource.com/1458996 Commit-Ready: Alli Woodcox <Allison_lloyd@yahoo.com> Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Alli Woodcox <Allison_lloyd@yahoo.com> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Alex Khouderchah <akhouderchah@chromium.org> " fail_count="0" gerrit_number="1458996" owner_email="benchan@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/96/1458996/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I1c9d995633032c89ca9868ffb37596b8f7916517" commit="9f8e65a1c3482d64c46db9a3caafa930edb91a6f" commit_message="media_perception: SerializedProto template class... ... to replace old serialization methods. BUG=chromium:929712 TEST=Unittests pass. Change-Id: I1c9d995633032c89ca9868ffb37596b8f7916517 Reviewed-on: https://chromium-review.googlesource.com/1393224 Commit-Ready: Luke Sorenson <lasoren@chromium.org> Tested-by: Luke Sorenson <lasoren@chromium.org> Reviewed-by: Jacob Dufault <jdufault@chromium.org> " fail_count="7" gerrit_number="1393224" owner_email="lasoren@chromium.org" pass_count="0" patch_number="17" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/24/1393224/17" remote="cros" total_fail_count="7"/><pending_commit branch="master" change_id="I461d4196a112efccc29a15903bc48ff8ab88bf82" commit="c475e9d8011eee5e8cd0f1968a58cffc579789f3" commit_message="init: clobber: implement device wipe in C++ Translates device wiping logic into C++, including displaying a progress bar to the user. BUG=chromium:884520 TEST=run on-device, unit tests CQ-DEPEND=CL:1401184 Change-Id: I461d4196a112efccc29a15903bc48ff8ab88bf82 Reviewed-on: https://chromium-review.googlesource.com/1416417 Commit-Ready: Fletcher Woodruff <fletcherw@chromium.org> Tested-by: Fletcher Woodruff <fletcherw@chromium.org> Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org> " fail_count="0" gerrit_number="1416417" owner_email="fletcherw@chromium.org" pass_count="0" patch_number="9" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/17/1416417/9" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I5408820c74e5cde055cfe6fb4336e980813f382d" commit="425f7117726a288a711d831e6f0b00fb626bc5ce" commit_message="Install bootlockboxd upstart job This CL installs bootlockboxd.conf and enable nvram based bootlockbox service BUG=b:67912719 TEST=emerge CQ-DEPEND=CL:1407301 CQ-DEPEND=CL:1407827 Change-Id: I5408820c74e5cde055cfe6fb4336e980813f382d Reviewed-on: https://chromium-review.googlesource.com/1296799 Commit-Ready: Xiaoyong Zhou <xzhou@chromium.org> Tested-by: Xiaoyong Zhou <xzhou@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="0" gerrit_number="1296799" owner_email="xzhou@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/99/1296799/3" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I2df562a5b4513ada528e887e057e78a8f1f3054c" commit="1da086e3634a2bf3a976d3c0ef78e42e8adaf3d1" commit_message="uut: drain EC console before programming Cr50 doesn't handle the uart break conditions properly, so it will fill up the EC uart with zeros when ECTX_CR50RX stays asserted. We assert that signal to start uut programming, so the buffer is almost guaranteed to be filled with garbage when uut programming starts. We were seeing synchronization fail because the baudrate check would read a zero from the buffer instead of the expected output. This change completely drains the EC console before starting uut to get rid of the garbage that interferes with programming. stm32mon does the exact same thing. We should create common code for initializing serial devices. BUG=b:123775217 BRANCH=none TEST=program cheza using ccd uut Change-Id: I2df562a5b4513ada528e887e057e78a8f1f3054c Signed-off-by: Mary Ruthven <mruthven@google.com> Reviewed-on: https://chromium-review.googlesource.com/1457579 Commit-Ready: Mary Ruthven <mruthven@chromium.org> Tested-by: Mary Ruthven <mruthven@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> " fail_count="0" gerrit_number="1457579" owner_email="mruthven@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/79/1457579/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I124deb203c64c597beaac59ca698a90177a3b35c" commit="98e7b81ad283f4b781fd8309070d15660f8da910" commit_message="g2touch: add ebuild for g2touch touchscreen update tool BUG=b:112702160 TEST=Auto Firmware update tested with SeaStar(Syndra) chromebook equipped g2touch touchscreen device. Change-Id: I124deb203c64c597beaac59ca698a90177a3b35c Reviewed-on: https://chromium-review.googlesource.com/1402954 Commit-Ready: Jerry - <jerry@g2touch.corp-partner.google.com> Commit-Ready: Harry Cutts <hcutts@chromium.org> Tested-by: Jerry - <jerry@g2touch.corp-partner.google.com> Tested-by: Harry Cutts <hcutts@chromium.org> Reviewed-by: Jerry - <jerry@g2touch.corp-partner.google.com> Reviewed-by: Harry Cutts <hcutts@chromium.org> Reviewed-by: Andrew de los Reyes <adlr@chromium.org> " fail_count="0" gerrit_number="1402954" owner_email="jerry@g2touch.corp-partner.google.com" pass_count="0" patch_number="20" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/54/1402954/20" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I56566f0b8f876f39fd8f8afdb1b15dd4dbc66969" commit="326dcbe4e5e6b2102081e92d442ffa2b3bbb45bc" commit_message="chromeos-touch-update: follow syslog specification for sending PID Send the PID seperately using the --id logger option. This allows the tag to be the same among all instances, while still being able to determine the PID. Change PPID to PID. I'm not sure why the PPID was being sent instead of the PID. BUG=chromium:929816 TEST=Ensure log messages are properly formatted. Change-Id: I56566f0b8f876f39fd8f8afdb1b15dd4dbc66969 Reviewed-on: https://chromium-review.googlesource.com/1459171 Commit-Ready: Christopher Morin <cmtm@google.com> Tested-by: Christopher Morin <cmtm@google.com> Reviewed-by: Benson Leung <bleung@chromium.org> " fail_count="0" gerrit_number="1459171" owner_email="cmtm@google.com" pass_count="0" patch_number="1" project="chromiumos/platform/touch_updater" project_url="https://chromium-review.googlesource.com/chromiumos/platform/touch_updater" ref="refs/changes/71/1459171/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I0c020b19db40702f04e258187cacd9b69c96e536" commit="5ef0f8fd179dd58eabbd7a1268c37c859d5020d4" commit_message="PCHPowergatingStats: Ignore CNV rail Octopus has new CNV rail can be on in S0ix. Ignore that in PCHPowergatingStats check if found CNV PCI device. BUG=chromium:929433 TEST=power_SuspendToIdle passed on Octopus Change-Id: I0c020b19db40702f04e258187cacd9b69c96e536 Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1457208 Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org> Reviewed-by: Todd Broch <tbroch@chromium.org> " fail_count="0" gerrit_number="1457208" owner_email="puthik@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/08/1457208/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.14" change_id="Ibfef63f40af181a75e8fa051e8e758ee90bd7f58" commit="cb21414cd5cbd6457738b5eadd7f767fb55503f7" commit_message="CHROMIUM: Merge DRM and amdgpu changes from kernel 4.18 This is a forklift of drm layer and amdgpu driver changes from kernel 4.18. Each change has been compiled and tested separately and rebased so it should be bisectable. Changelog: ---------------------------------------------------------------- Akshu Agrawal (1): UPSTREAM: drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD Al Viro (1): UPSTREAM: drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open() Alex Deucher (50): UPSTREAM: drm/amdgpu/sdma4: use a helper for SDMA_OP_POLL_REGMEM UPSTREAM: drm/amdgpu: add documentation on hwmon interfaces exposed (v3) UPSTREAM: drm/amdgpu: add asic need_full_reset callback UPSTREAM: drm/amdgpu/si: implement asic need_full_reset callback UPSTREAM: drm/amdgpu/cik: implement asic need_full_reset callback UPSTREAM: drm/amdgpu/vi: implement asic need_full_reset callback UPSTREAM: drm/amdgpu/soc15: implement asic need_full_reset callback UPSTREAM: drm/amdgpu: use new asic need_full_reset callback UPSTREAM: drm/amdgpu/gfx9: cache DB_DEBUG2 and make it available to userspace UPSTREAM: drm/amdgpu/powerplay: fix smu7_get_memory_type for fiji UPSTREAM: drm/amdgpu/powerplay: rename smu7_upload_mc_firmware BACKPORT: drm/amdgpu: add emit_reg_write_reg_wait ring callback UPSTREAM: drm/amdgpu/gfx9: add emit_reg_write_reg_wait ring callback (v2) UPSTREAM: drm/amdgpu/sdma4: add emit_reg_write_reg_wait ring callback (v2) UPSTREAM: drm/amdgpu/uvd7: add emit_reg_write_reg_wait ring callback UPSTREAM: drm/amdgpu/vce4: add emit_reg_write_reg_wait ring callback UPSTREAM: drm/amdgpu/vcn1: add emit_reg_write_reg_wait ring callback UPSTREAM: drm/amdgpu/gmc9: use amdgpu_ring_emit_reg_write_reg_wait in gpu tlb flush UPSTREAM: drm/amdgpu: print the vbios version in the debugfs firmware info UPSTREAM: drm/amdgpu/pm: document power_dpm_force_performance_level UPSTREAM: drm/amdgpu/pm: document power_dpm_state UPSTREAM: drm/amdgpu/pm: document pp_table UPSTREAM: drm/amdgpu/pm: document pp_dpm_sclk pp_dpm_mclk pp_dpm_pcie (v2) UPSTREAM: drm/amdgpu/pm: document pp_power_profile_mode UPSTREAM: drm/amdgpu/pm: document pp_od_clk_voltage UPSTREAM: drm/amdgpu/powerplay: actually return the power with the new query UPSTREAM: drm/amdgpu: Add VEGAM support to the legacy DCE 11 module UPSTREAM: drm/amdgpu/gmc9: remove unused register defs UPSTREAM: drm/amdgpu/atomfirmware: add new gfx_info data table v2.4 (v2) UPSTREAM: drm/amdgpu/atomfirmware: add parser for gfx_info table UPSTREAM: drm/amdgpu: Use vbios table for gpu info on vega20 UPSTREAM: drm/amdgpu: add df 3.6 headers UPSTREAM: drm/amdgpu: flag Vega20 as experimental UPSTREAM: drm/amdgpu/display: remove VEGAM config option UPSTREAM: drm/amdgpu/display: remove VEGA20 config option UPSTREAM: drm/amdgpu/display: fix vega12/20 handling in dal_asic_id.h BACKPORT: drm/amdgpu: count fences from all uvd instances in idle handler BACKPORT: drm/amdgpu: Take uvd encode rings into account in idle work (v2) UPSTREAM: drm/amdgpu: Take vcn encode rings into account in idle work UPSTREAM: drm/amdgpu: add new DF 1.7 register defs UPSTREAM: drm/amdgpu: add new DF callback for ECC setup UPSTREAM: drm/amdgpu: add a df 1.7 implementation of enable_ecc_force_par_wr_rmw UPSTREAM: drm/amdgpu/gmc9: disable partial wr rmw if ECC is not enabled UPSTREAM: drm/amdgpu/pp: remove duplicate assignment UPSTREAM: drm/amdgpu/display: check if ppfuncs exists before using it BACKPORT: Revert "drm/amdgpu: Add an ATPX quirk for hybrid laptop" UPSTREAM: drm/amdgpu/pm: fix display count in non-DC path UPSTREAM: Revert "drm/amd/display: Don't return ddc result and read_bytes in same return value" UPSTREAM: drm/amdgpu/pp/smu7: use a local variable for toc indexing UPSTREAM: drm/amdgpu: update uvd_v6_0_ring_vm_funcs to use new nop packet Andrey Grodzovsky (5): UPSTREAM: drm/amdgpu: Skip drm_sched_entity related ops for KIQ ring. UPSTREAM: drm/scheduler: Remove obsolete spinlock. UPSTREAM: Remove calls to suspend/resume atomic helpers from amdgpu_device_gpu_recover. (v2) UPSTREAM: drm/amdgpu: Verify root PD is mapped into kernel address space (v4) UPSTREAM: drm/amdgpu: Fix SDMA TO after GPU reset v3 Andy Shevchenko (1): UPSTREAM: drm: panel-orientation-quirks: Convert to use match_string() helper Ankit Nautiyal (3): UPSTREAM: drm: Add DRM client cap for aspect-ratio UPSTREAM: drm: Handle aspect ratio info in legacy modeset path UPSTREAM: drm: Expose modes with aspect ratio, only if requested Anthony Koo (27): UPSTREAM: drm/amd/display: Couple bug fixes in stats module UPSTREAM: drm/amd/display: Rename encoder_info_packet to dc_info_packet UPSTREAM: drm/amd/display: Fix structure initialization of hdmi_info_packet UPSTREAM: drm/amd/display: Only program MSA_TIMING_PARAM if it changed UPSTREAM: drm/amd/display: Program v_total_min/max after v_total_cntl UPSTREAM: drm/amd/display: Add vmax/min_sel prints to dcn10_log_hw_state UPSTREAM: drm/amd/display: csc updates require FULL update UPSTREAM: drm/amd/display: Updated HDR Static Metadata to directly take info packet raw UPSTREAM: drm/amd/display: Get rid of unused input_tf UPSTREAM: drm/amd/display: Remove unused fields UPSTREAM: drm/amd/display: Do not use os types UPSTREAM: drm/amd/display: csc_transform to dc_csc_transform UPSTREAM: drm/amd/display: Refactor color module UPSTREAM: drm/amd/display: move color_transfer_func to color mod UPSTREAM: drm/amd/display: Have DC manage its own allocation of gamma UPSTREAM: drm/amd/display: Do not create memory allocation if stats not enabled UPSTREAM: drm/amd/display: fix issue related to infopacket was not transmitted UPSTREAM: drm/amd/display: add some DTN logs for input and output tf UPSTREAM: drm/amd/display: update dtn logging and goldens UPSTREAM: drm/amd/display: Cleanup unused SetPlaneConfig UPSTREAM: drm/amd/display: Make DisplayStats work with just DC DisplayStats minor UPSTREAM: drm/amd/display: Fix up dm logging functionality UPSTREAM: drm/amd/display: use macro for logs UPSTREAM: drm/amd/display: Add fullscreen transitions to log UPSTREAM: drm/amd/display: fix bug with index check UPSTREAM: drm/amd/display: fix memory leaks UPSTREAM: drm/amd/display: Prevent PSR from being enabled if initialization fails Anuj Phogat (1): UPSTREAM: drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5 Arnd Bergmann (1): UPSTREAM: drm/amdgpu: fix 32-bit build warning Arushi Singhal (1): UPSTREAM: gpu: drm/lease:: Use list_{next/prev}_entry instead of list_entry Ben Goz (1): UPSTREAM: drm/amdkfd: Locking PM mutex while allocating IB buffer Bhawanpreet Lakha (3): UPSTREAM: drm/amd/display: Add debug prints for bandwidth calculations UPSTREAM: drm/amd/display: Correct print types in DC_LOGS BACKPORT: drm/amd/display: Add Dynamic debug prints Boris Brezillon (3): UPSTREAM: drm/atomic: Add sanity checks to drm_atomic_helper_async_commit() UPSTREAM: drm/atomic: Check old_plane_state->crtc in drm_atomic_helper_async_check() UPSTREAM: drm/atomic: Initialize variables in drm_atomic_helper_async_check() to make gcc happy Charlene Liu (4): UPSTREAM: drm/amd/display: add delay between panel pwr off to on. UPSTREAM: drm/amd/display: add cursor TTU CRQ related UPSTREAM: drm/amd/display: underflow/blankscreen recovery UPSTREAM: drm/amd/display: add register offset != 0 check. Chris Wilson (1): UPSTREAM: drm: Use idr_init_base(1) when using id==0 for invalid Christian Knig (22): UPSTREAM: drm/amdgpu: use ctx bytes_moved UPSTREAM: drm/amdgpu: fix and cleanup cpu visible VRAM handling UPSTREAM: drm/ttm: keep a reference to transfer pipelined BOs UPSTREAM: drm/amdgpu: revert "add new bo flag that indicates BOs don't need fallback (v2)" UPSTREAM: drm/amdgpu: revert "Don't change preferred domian when fallback GTT v6" UPSTREAM: drm/amdgpu: re-validate per VM BOs if required v2 UPSTREAM: drm/amdgpu: limit reg_write_reg_wait workaround to SRIOV v2 UPSTREAM: drm/amdgpu: print DMA-buf status in debugfs BACKPORT: drm/amdgpu: add HDP flush dummy for UVD 6/7 BACKPORT: drm/amdgpu: drop printing the BO offset in the gem debugfs (v2) UPSTREAM: drm/amdgpu: print the BO flags in the gem debugfs entry UPSTREAM: drm/amdgpu: remove unused member UPSTREAM: drm/amdgpu: rework VM state machine lock handling v2 UPSTREAM: drm/amdgpu: cleanup amdgpu_vm_validate_pt_bos v2 UPSTREAM: drm/amdgpu: further optimize amdgpu_vm_handle_moved UPSTREAM: drm/amdgpu: kmap PDs/PTs in amdgpu_vm_update_directories UPSTREAM: drm/amdgpu: consistenly use VM moved flag UPSTREAM: drm/amdgpu: move VM BOs on LRU again UPSTREAM: drm/amd/display: fix invalid function table override UPSTREAM: drm/amdgpu: fix incorrect use of fcheck UPSTREAM: drm/amdgpu: fix incorrect use of drm_file->pid UPSTREAM: drm/amdgpu: fix preamble handling Chunming Zhou (10): UPSTREAM: drm/amdgpu: Don't change preferred domian when fallback GTT v6 UPSTREAM: drm/amdgpu: add new bo flag that indicates BOs don't need fallback (v2) UPSTREAM: drm/amdgpu: add amdgpu_bo_param UPSTREAM: drm/amdgpu: use amdgpu_bo_param for amdgpu_bo_create v2 UPSTREAM: drm/amdgpu: set preferred_domain independent of fallback handling UPSTREAM: drm/amdgpu: handle domain mask checking v2 UPSTREAM: drm/amdgpu: fix list not initialized UPSTREAM: drm/amdgpu: abstract bo_base init function UPSTREAM: drm/amdgpu: invalidate parent bo when shadow bo was invalidated UPSTREAM: drm/amdgpu: gds bo must not be per-vm-bo Cihangir Akturk (1): UPSTREAM: drm/imx: switch to drm_*_get(), drm_*_put() helpers Colin Ian King (6): UPSTREAM: drm/amd/pp: Fix spelling mistake: "suppported" -> "supported" UPSTREAM: drm/amd/display: fix spelling mistake: "Usupported" -> "Unsupported" UPSTREAM: drm/amd/powerplay: fix spelling mistake: "contruct" -> "construct" UPSTREAM: drm/amd/display: clean up assignment of amdgpu_crtc UPSTREAM: drm/amdgpu/df: fix potential array out-of-bounds read UPSTREAM: drm/amdgpu/powerplay: fix missing break in switch statements Dan Carpenter (2): UPSTREAM: drm/amdkfd: Integer overflows in ioctl UPSTREAM: drm/amd/pp: missing curly braces in smu7_enable_sclk_mclk_dpm() Daniel Stone (2): UPSTREAM: drm: Reshuffle getfb error returns BACKPORT: drm/amdgpu: Move GEM BO to drm_framebuffer Daniel Vetter (10): UPSTREAM: drm/gem: Document that handle_create must be the last step UPSTREAM: drm/tinydrm: Use gem_free_object_unlocked BACKPORT: drm: Move simple_display_pipe prepare_fb helper into gem fb helpers UPSTREAM: drm/atomic: better doc for implicit vs explicit fencing UPSTREAM: drm: Don't EXPORT drm_add/reset_display_info BACKPORT: drm: Drop DRM_CONTROL_ALLOW from ioctls UPSTREAM: drm/vmwgfx: Drop DRM_CONTROL_ALLOW BACKPORT: drm/i915: Drop DRM_CONTROL_ALLOW UPSTREAM: drm/msm: Don't setup control node debugfs files UPSTREAM: drm: remove all control node code David Francis (3): UPSTREAM: drm/amd/display: Remove use of division operator for long longs UPSTREAM: amd/dc/dce100: On dce100, set clocks to 0 on suspend UPSTREAM: drm/amd/display: Read back max backlight value at boot Dirk Hohndel (1): UPSTREAM: Add SPDX idenitifier and clarify license Dmytro Laktyushkin (18): UPSTREAM: drm/amd/display: fix Polaris 12 bw bounding box UPSTREAM: drm/amd/display: add mpc to dtn log UPSTREAM: drm/amd/display: align dtn logs and add mpc idle bit print UPSTREAM: drm/amd/display: hide inconsistent mpcc programming from dtn log UPSTREAM: drm/amd/display: Update scaler v_active data if interlaced UPSTREAM: drm/amd/display: fix segfault on insufficient TG during validation UPSTREAM: drm/amd/display: change dml init to use default structs UPSTREAM: drm/amd/display: add rq/dlg/ttu to dtn log UPSTREAM: drm/amd/display: add calculated clock logging to DTN UPSTREAM: drm/amd/display: compact the rq/dlg/ttu log UPSTREAM: drm/amd/display: get rid of 32.32 unsigned fixed point UPSTREAM: drm/amd/display: inline more of fixed point code UPSTREAM: drm/amd/display: add fixed point fractional bit truncation function UPSTREAM: drm/amd/display: truncate scaling ratios and inits to 19 bit precision UPSTREAM: drm/amd/display: fix 31_32_fixpt shift functions UPSTREAM: drm/amd/display: fix a 32 bit shift meant to be 64 warning UPSTREAM: drm/amd/display: update dml to allow sync with DV UPSTREAM: drm/amd/display: fix dscl_manual_ratio_init Dominik Behr (1): Merge remote-tracking branch 'cros/linux/v4.14.97-11252-g32c1b0eaaaac6' into merge/chromeos-4.14-v4.14.97-11252-g32c1b0eaaaac6 Emily Deng (6): UPSTREAM: drm/gpu-sched: fix force APP kill hang(v4) UPSTREAM: drm/amdgpu: For sriov reset, move IB test into exclusive mode UPSTREAM: drm/amdgpu/sriov: Need to set in_gpu_reset flag to back after gpu reset UPSTREAM: drm/amdgpu: To get gds, gws and oa from adev->gds (v2) UPSTREAM: amdgpu: fix multi-process hang issue UPSTREAM: drm/amdgpu: Need to set moved to true when evict bo Eric Anholt (3): UPSTREAM: drm: Make the prime vmap/vunmap hooks optional. UPSTREAM: drm: Fix render node numbering regression from control node removal. UPSTREAM: drm/sched: Extend the documentation. Eric Bernstein (12): UPSTREAM: drm/amd/display: Change wb_h/vratio to double UPSTREAM: drm/amd/display: Add num_active_wb to DML UPSTREAM: drm/amd/display: Refactor stream encoder for HW review UPSTREAM: drm/amd/display: Make DCN stream encoder shareable UPSTREAM: drm/amd/display: Move dp_pixel_encoding_type to stream_encoder include UPSTREAM: drm/amd/display: Move DCC support functions into dchubbub UPSTREAM: drm/amd/display: Make program_output_csc HWSS interface function UPSTREAM: drm/amd/display: Refactor otg_blank sequence UPSTREAM: drm/amd/display: Update HW sequencer initialization UPSTREAM: drm/amd/display: DCN1 link encoder UPSTREAM: drm/amd/display: DP component depth 16 bpc UPSTREAM: drm/amd/display: Set TMZ and DCC for secondary surface Eric Huang (7): UPSTREAM: drm/amd/powerplay: add smu75 header files UPSTREAM: drm/amd: add a new struct in atombios.h BACKPORT: drm/amd/powerplay: update ppatomctrl.c (v2) UPSTREAM: drm/amd/powerplay: update process pptables BACKPORT: drm/amd/powerplay: add smumgr support for VEGAM (v2) UPSTREAM: drm/amd/powerplay: add specific changes for VEGAM in smu7_hwmgr.c UPSTREAM: drm/powerplay: Add powertune table for VEGAM Eric Yang (5): UPSTREAM: drm/amd/display: Only update mpc blend config if not full update UPSTREAM: drm/amd/display: Set all update flags when we have full update UPSTREAM: drm/amd/display: fix link bw calculation for 422 and 420 encoding UPSTREAM: drm/amd/display: dal 3.1.42 UPSTREAM: drm/amd/display: support access ddc for mst branch Evan Quan (15): BACKPORT: drm/amd/pp: use soc15 common macros instead of vega10 specific UPSTREAM: drm/amd/pp: fix the wrong readout engine clock in deep sleep UPSTREAM: drm/amd/powerplay: new framework to honour DAL clock limits UPSTREAM: drm/amd/powerplay: add a framework for perfroming pre display configuration change settings UPSTREAM: drm/amd/powerplay: update vega20 cg flags (v2) UPSTREAM: drm/amdgpu: correct SMU11 SYSPLL0 clock id values UPSTREAM: drm/amd/powerplay: bug fixs for getsmuclockinfo UPSTREAM: drm/amdgpu: typo fix for vega20 cg flags UPSTREAM: drm/amd/powerplay: fix wrong clock adjust sequence UPSTREAM: drm/amdgpu: fix parsing indirect register list v2 UPSTREAM: drm/amd/powerplay: remove uncessary extra gfxoff control call UPSTREAM: drm/amd/powerplay: correct vega12 thermal support as true BACKPORT: drm/amd/powerplay: correct vega12 bootup values settings UPSTREAM: drm/amd/powerplay: smc_dpm_info structure change UPSTREAM: drm/amd/powerplay: fixed uninitialized value Feifei Xu (38): UPSTREAM: drm/amdgpu/gfx9: Update golden setting for gfx9_0. UPSTREAM: drm/amdgpu: Drop the unused header files in soc15.c. UPSTREAM: drm/amdgpu: Fix hardcoded base offset of vram pages UPSTREAM: drm/amd: Add vega20_ip_offset.h headerfile for vega20. (v2) UPSTREAM: drm/amdgpu: Add vega20 to asic_type enum. UPSTREAM: drm/amdgpu: Add gpu_info firmware for vega20. (v2) UPSTREAM: drm/amdgpu: set asic family for vega20. UPSTREAM: drm/amdgpu: Add smu firmware support for vega20 UPSTREAM: drm/amdgpu/powerplay: Add initial vega20 support v2 UPSTREAM: drm/amdgpu/psp: Add initial psp support for vega20 UPSTREAM: drm/amdgpu: Add vega20 ucode loading method UPSTREAM: drm/amdgpu: Specify vega20 uvd firmware UPSTREAM: drm/amdgpu: Specify vega20 vce firmware UPSTREAM: drm/amdgpu/virtual_dce: Add vega20 support UPSTREAM: drm/amdgpu/gmc9: Add vega20 support UPSTREAM: drm/amdgpu/mmhub: Add clockgating support for vega20 UPSTREAM: drm/amdgpu/sdma4: Specify vega20 firmware UPSTREAM: drm/amdgpu/sdma4: Add vega20 golden settings (v3) UPSTREAM: drm/amdgpu/sdma4: Add clockgating support for vega20 UPSTREAM: drm/amdgpu/gfx9: Add support for vega20 firmware UPSTREAM: drm/amdgpu/gfx9: Add vega20 golden settings (v3) UPSTREAM: drm/amdgpu/gfx9: Add gfx config for vega20. (v4) UPSTREAM: drm/amdgpu/gfx9: Add support for vega20 UPSTREAM: drm/amdgpu/gfx9: Add clockgatting support for vega20 UPSTREAM: drm/amdgpu/soc15:Add vega20 soc15_common_early_init support UPSTREAM: drm/amdgpu/soc15: Set common clockgating for vega20. UPSTREAM: drm/amdgpu/soc15: dynamic initialize ip offset for vega20 UPSTREAM: drm/amdgpu/soc15: Add ip blocks for vega20 (v2) UPSTREAM: drm/amdgpu: Add nbio support for vega20 (v2) UPSTREAM: drm/amd/display/dm: Add vega20 support UPSTREAM: drm/amdgpu: Add vega20 to dc support check (v2) UPSTREAM: drm/amd/display: Remove COMBO_DISPLAY_PLL0 from Vega20 UPSTREAM: drm/amdgpu: Set vega20 load_type to AMDGPU_FW_LOAD_DIRECT. UPSTREAM: drm/amdgpu: Disable ip modules that are not ready yet UPSTREAM: drm/amdgpu/df: implement df v3_6 callback functions (v2) UPSTREAM: drm/amdgpu: Switch to use df_v3_6_funcs for vega20 (v2) UPSTREAM: drm/amdgpu: Add vega20 pci ids UPSTREAM: drm/gfx9: Update gc goldensetting for vega20. Felix Kuehling (29): UPSTREAM: drm/amdgpu: Add MMU notifier type for KFD userptr BACKPORT: drm/amdgpu: Enable amdgpu_ttm_tt_get_user_pages in worker threads UPSTREAM: drm/amdgpu: Avoid reclaim while holding locks taken in MMU notifier UPSTREAM: drm/amdkfd: GFP_NOIO while holding locks taken in MMU notifier UPSTREAM: drm/amdkfd: Add quiesce_mm and resume_mm to kgd2kfd_calls UPSTREAM: drm/amdgpu: Add userptr support for KFD UPSTREAM: drm/amdgpu: Remove unused interface from kfd2kgd interface UPSTREAM: drm/amd: Update GFXv9 SDMA MQD structure UPSTREAM: drm/amdgpu: Add GFXv9 TLB invalidation packet definition UPSTREAM: drm/amdgpu: Add GFXv9 kfd2kgd interface functions UPSTREAM: drm/amdgpu: Add doorbell routing info to kgd2kfd_shared_resources UPSTREAM: drm/amdkfd: Make doorbell size ASIC-dependent UPSTREAM: drm/amdkfd: Implement doorbell allocation for SOC15 UPSTREAM: drm/amdkfd: Move packet writer functions into ASIC-specific file UPSTREAM: drm/amdkfd: Add GFXv9 PM4 packet writer functions UPSTREAM: drm/amdkfd: Add GFXv9 MQD manager UPSTREAM: drm/amdkfd: Add GFXv9 device queue manager UPSTREAM: drm/amdkfd: Add SOC15 interrupt processing support UPSTREAM: drm/amdkfd: Fix goto usage UPSTREAM: drm/amdkfd: Fix kernel queue rollback_packet UPSTREAM: drm/amdkfd: Add 64-bit doorbell and wptr support to kernel queue UPSTREAM: drm/amdkfd: Remove limit on number of GPUs (follow-up) UPSTREAM: drm/amdkfd: Support flat memory apertures for GFXv9 UPSTREAM: drm/amdkfd: Add GFXv9 CWSR trap handler UPSTREAM: drm/amdkfd: Add Vega10 topology and device info UPSTREAM: drm/amdkfd: Remove redundant include of amd-iommu.h UPSTREAM: drm/amdkfd: Fix signal handling performance again UPSTREAM: drm/amdkfd: Remove initialization of cp_hqd_ib_control on CIK UPSTREAM: drm/amdkfd: Add sanity checks in IRQ handlers Flora Cui (1): UPSTREAM: drm/amdgpu: init gfx9 aperture settings Greg Kroah-Hartman (1): UPSTREAM: Revert "drm/amd/pp: Send khz clock values to DC for smu7/8" Gustavo A. R. Silva (2): BACKPORT: drm/amdgpu/pm: Fix potential Spectre v1 UPSTREAM: drm/amd/display/dc/dce: Fix multiple potential integer overflows Haneen Mohammed (1): UPSTREAM: drm: Remove drm_property_{un/reference}_blob aliases Harish Kasiviswanathan (1): UPSTREAM: drm/amdkfd: Clean up KFD_MMAP_ offset handling Harry Wentland (18): UPSTREAM: drm/amdgpu: Add CM_TEST_DEBUG regs for DCN UPSTREAM: drm/amd/display: Move commit_planes_to_stream to amdgpu_dm UPSTREAM: drm/amd/display: Don't access legacy properties UPSTREAM: drm/amd/display: Don't register backlight on connector_destroy UPSTREAM: drm/amd/display: Set ignore_msa_timing_param UPSTREAM: drm/amd/display: Fix potential access beyond end of array in CM UPSTREAM: drm/amd/display: Implement dm_get_timestamp UPSTREAM: drm/amd/display: Fix 64-bit division in hwss_edp_power_control UPSTREAM: drm/amd/display: Don't spam debug messages UPSTREAM: drm/amd/display: Use HBR2 if eDP monitor it doesn't advertise link rate UPSTREAM: drm/amd/display: Use int for calculating vline start BACKPORT: drm/amd/display: Couple formatting fixes UPSTREAM: drm/amd/display: Implement dm_pp_get_clock_levels_by_type_with_latency UPSTREAM: drm/amd/display: Fix wrong latency assignment for VEGA clock levels UPSTREAM: drm/amdgpu: Don't default to DC support for Kaveri and older UPSTREAM: drm/amd/display: Convert 10kHz clks from PPLib into kHz for Vega UPSTREAM: drm/amd/display: Report non-DP display as disconnected without EDID UPSTREAM: drm/amd/pp: Send khz clock values to DC for smu7/8 Hawking Zhang (4): UPSTREAM: drm/amdgpu: add df v1_7 header files UPSTREAM: drm/amdgpu: add df callback functions structure UPSTREAM: drm/amdgpu/df: implement df v1_7 callback functions UPSTREAM: drm/amdgpu: switch to use df callback functions Hersen Wu (2): UPSTREAM: drm/amd/display: Non-HDMI DP active dongle should not support YUV pixel format UPSTREAM: drm/amd/display: DP link validation bug for YUV422 Huang Rui (21): UPSTREAM: drm/amdgpu: update psp gfx if header UPSTREAM: drm/amdgpu: add new rlc firmware header format v2.1 UPSTREAM: drm/amdgpu: add save restore list cntl gpm and srm firmware support UPSTREAM: drm/amdgpu: enter rlc safe mode before set cgpg UPSTREAM: drm/amdgpu: cleanup init power gating function UPSTREAM: drm/amdgpu: revise init_rlc_save_restore_list behavior to support latest register_list_format/register_restore table UPSTREAM: drm/amdgpu: add setting powergating method for gfx9 UPSTREAM: drm/amd/powerplay: send CGPG smc message if PG is enabled for raven UPSTREAM: drm/amdgpu: move PP_FEATURE_MASK to amd_shared header UPSTREAM: drm/amdgpu: add gfxoff feature mask UPSTREAM: drm/amdgpu: set gfxoff disabled by default BACKPORT: drm/amd/powerplay: add gfx off control function UPSTREAM: drm/amd/powerplay: enable/disable gfxoff through smu UPSTREAM: drm/amdgpu: use pp_feature member to store the mask UPSTREAM: drm/amdgpu: clear gfxoff feature mask if the asic is not raven UPSTREAM: drm/amd/powerplay: add control gfxoff enabling in late init UPSTREAM: drm/amdgpu: fix to disable powergating in hw_fini UPSTREAM: drm/amdgpu: set CGPG if gfxoff is enabled for raven UPSTREAM: drm/amd/powerplay: use the flag to decide whether send gfxoff smc message UPSTREAM: drm/amdgpu: add checking for sos version UPSTREAM: drm/amd/powerplay: fix missed hwmgr check warning before call gfx_off_control handler James Zhu (12): UPSTREAM: drm/amdgpu: Added support for MV packet UPSTREAM: drm/amd/include/vg20: adjust VCE_BASE to reuse vce 4.0 header files BACKPORT: drm/amdgpu/vg20:Restruct uvd to support multiple uvds BACKPORT: drm/amdgpu:All UVD instances share one idle_work handle UPSTREAM: drm/amdgpu/vg20:increase 3 rings for AMDGPU_MAX_RINGS UPSTREAM: drm/amdgpu/vg20:Enable the 2nd instance for uvd UPSTREAM: drm/amdgpu/vg20:Add IH client ID for the 2nd UVD BACKPORT: drm/amdgpu/vg20:Restruct uvd.inst to support multiple instances UPSTREAM: drm/amdgpu/vg20:Enable the 2nd instance IRQ for uvd 7.2 UPSTREAM: drm/amdgpu/vg20:Enable 2nd instance queue maping for uvd 7.2 UPSTREAM: drm/amdgpu/vg20:Enable UVD/VCE for Vega20 UPSTREAM: drm/amdgpu:Support new VCN FW version naming convention Jani Nikula (3): UPSTREAM: drm: prefer inline over __inline__ UPSTREAM: drm: remove old documentation comment cruft from drmP.h UPSTREAM: drm: make drm_core_check_feature() bool that it is Jann Horn (1): UPSTREAM: drm: fix use-after-free read in drm_mode_create_lease_ioctl() Jay Cornwall (2): UPSTREAM: drm/amdkfd: Reduce priority of context-saving waves before spin-wait UPSTREAM: drm/amdkfd: Use volatile MTYPE in default/alternate apertures Jerry (Fangzhi) Zuo (5): UPSTREAM: drm/amd/display: Implement VEGAM device IDs in DC UPSTREAM: drm/amd/display: Implement VEGAM device IDs in DM UPSTREAM: drm/amd/display: Add Vega20 config. support UPSTREAM: drm/amd/display: Add BIOS smu_info v3_3 support for Vega20 UPSTREAM: drm/amd/display: Add harvest IP support for Vega20 Joe Perches (1): UPSTREAM: treewide: Align function definition open/close braces Jos Roberto de Souza (1): UPSTREAM: drm: Add DP last received PSR SDP VSC register and bits Julian Parkin (3): UPSTREAM: drm/amd/display: drop dc_validate_guaranteed UPSTREAM: drm/amd/display: Add assert that chroma pitch is non zero UPSTREAM: drm/amd/display: reprogram infoframe during apply_ctx_to_hw Jun Lei (3): UPSTREAM: drm/amd/display: remove unused enum UPSTREAM: drm/amd/display: Fill calcs date from stream src/dst if available UPSTREAM: drm/amd/display: constify a few dc_surface_update fields Junwei Zhang (7): UPSTREAM: drm/amdgpu: simplify bo_va list when vm bo update (v2) UPSTREAM: drm/amdgpu: bo could be null when access in vm bo update UPSTREAM: drm/amd/powerplay: add PME smu message for raven UPSTREAM: drm/ttm: remove priority hard code when initializing ttm bo UPSTREAM: drm/amdgpu: set ttm bo priority before initialization UPSTREAM: drm/amdgpu: fix null pointer for bo unmap trace function UPSTREAM: drm/amdgpu: fix clear_all and replace handling in the VM (v2) Kees Cook (1): UPSTREAM: kernel.h: Retain constant expression output for max()/min() Kenneth Feng (5): UPSTREAM: amd/powerplay: implement the vega12_force_clock_level interface UPSTREAM: drm/amd/powerplay: Get more than 8 level gfxclk states UPSTREAM: drm/amd/powerplay: initialzie the dpm intial enabled state UPSTREAM: drm/amd/powerplay: add registry key to disable ACG UPSTREAM: drm/amd/powerplay: Set higher SCLK&MCLK frequency than dpm7 in OD (v2) Krunoslav Kovac (1): UPSTREAM: drm/amd/display: Add user_regamma to color module Laura Abbott (1): UPSTREAM: drm/amdkfd: Remove vla Leo (Sunpeng) Li (4): UPSTREAM: drm/amd/display: Fix dim display on DCE11 UPSTREAM: drm/amd/display: Fix memleak on input transfer function UPSTREAM: drm/amd/display: Destroy connector state on reset UPSTREAM: drm/amd/display: Use requested HDMI aspect ratio Leo Liu (28): UPSTREAM: drm/amdgpu: add VEGAM ASIC type UPSTREAM: drm/amdgpu: bypass GPU info firmware load for VEGAM UPSTREAM: drm/amdgpu: set VEGAM to ASIC family and ip blocks UPSTREAM: drm/amdgpu: specify VEGAM ucode SMU load method UPSTREAM: drm/amdgpu: add VEGAM SMU firmware support UPSTREAM: drm/amdgpu/virtual_dce: add VEGAM support UPSTREAM: drm/amdgpu: add VEGAM dc support check UPSTREAM: drm/amdgpu: skip VEGAM MC firmware load UPSTREAM: drm/amdgpu: add VEGAM GMC golden settings UPSTREAM: drm/amdgpu: initialize VEGAM GMC (v2) UPSTREAM: drm/amdgpu: add VEGAM SDMA firmware support UPSTREAM: drm/amdgpu: add VEGAM SDMA golden settings UPSTREAM: drm/amdgpu: add VEGAM GFX firmware support UPSTREAM: drm/amdgpu: add VEGAM GFX golden settings BACKPORT: drm/amdgpu: initialize VEGAM GFX UPSTREAM: drm/amdgpu: add VEGAM UVD firmware support UPSTREAM: drm/amdgpu: add VEGAM UVD encode support UPSTREAM: drm/amdgpu: add VEGAM VCE firmware support UPSTREAM: drm/amdgpu: add VEGAM to VCE harvest config UPSTREAM: drm/amdgpu: add VEGAM support to vi UPSTREAM: drm/amdgpu: add VEGAM pci ids UPSTREAM: drm/amdgpu: fix insert nop for VCN decode ring UPSTREAM: drm/amdgpu: fix insert nop for UVD7 ring UPSTREAM: drm/amdgpu: fix insert nop for UVD6 ring UPSTREAM: drm/amdgpu: fix insert nop for UVD5 ring UPSTREAM: drm/amdgpu: fix insert nop for UVD4.2 ring UPSTREAM: drm/amdgpu: remove unnecessary scheduler entity for VCN UPSTREAM: drm/amdgpu: fix UBSAN: Undefined behaviour for amdgpu_fence.c Linus Torvalds (1): UPSTREAM: treewide: fix up files incorrectly marked executable Lubosz Sarnecki (1): UPSTREAM: drm/edid: Quirk Vive Pro VR headset non-desktop. Luc Van Oostenryck (2): UPSTREAM: drm/amdgpu: fix amdgpu_atpx_get_client_id()'s return type UPSTREAM: drm/admgpu: fix mode_valid's return type Lyude Paul (6): UPSTREAM: drm/atomic: Print debug message on atomic check failure UPSTREAM: drm/amdgpu: Grab/put runtime PM references in atomic_commit_tail() UPSTREAM: drm/amdgpu: Count disabled CRTCs in commit tail earlier UPSTREAM: drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c UPSTREAM: drm/amdgpu: Add amdgpu_atpx_get_dhandle() UPSTREAM: drm/amdgpu: Dynamically probe for ATIF handle (v2) Maarten Lankhorst (1): UPSTREAM: drm/atomic: Remove deprecated accessor macros Manasi Navare (1): UPSTREAM: drm/dp: Rename the edp_sdp_header as dp_sdp_header Marek Olk (1): UPSTREAM: drm/amdgpu: optionally do a writeback but don't invalidate TC for IB fences Martin Tsai (2): UPSTREAM: drm/amd/display: correct the condition in setting cursor not visible beyond left edge UPSTREAM: drm/amd/display: to synchronize the hubp and dpp programming in cursor control Masanari Iida (1): UPSTREAM: treewide: Fix typos in printk Matt Atwood (1): UPSTREAM: drm/i915/kbl: Add KBL GT2 sku Matthew Wilcox (11): BACKPORT: idr: Delete idr_remove_ext function BACKPORT: idr: Delete idr_replace_ext function BACKPORT: idr: Delete idr_find_ext function UPSTREAM: idr: Add idr_alloc_u32 helper UPSTREAM: net sched actions: Convert to use idr_alloc_u32 UPSTREAM: cls_flower: Convert to idr_alloc_u32 UPSTREAM: idr: Remove idr_alloc_ext UPSTREAM: idr: Rename idr_for_each_entry_ext UPSTREAM: idr: Warn if old iterators see large IDs UPSTREAM: idr: Make 1-based IDRs more efficient BACKPORT: idr: Add documentation Maxime Ripard (1): UPSTREAM: drm/blend: Add a generic alpha property Meghana Madhyastha (3): UPSTREAM: video: backlight: Add helpers to enable and disable backlight UPSTREAM: video: backlight: Add of_find_backlight helper in backlight.c UPSTREAM: video: backlight: Add devres versions of of_find_backlight Michel Dnzer (8): UPSTREAM: drm/amdgpu: Update pin_size values before unpinning BO UPSTREAM: drm/amdgpu: Make amdgpu_vram_mgr_bo_invisible_size always accurate UPSTREAM: drm/amdgpu: GPU vs CPU page size fixes in amdgpu_vm_bo_split_mapping UPSTREAM: drm/amdgpu: Reserve VM root shared fence slot for command submission (v3) UPSTREAM: drm/amdgpu: Keep track of amount of pinned CPU visible VRAM UPSTREAM: drm/amdgpu: Make pin_size values atomic UPSTREAM: drm/amdgpu: Warn and update pin_size values when destroying a pinned BO UPSTREAM: drm/amdgpu: Don't warn on destroying a pinned BO Mikita Lipski (19): UPSTREAM: drm/amd/display: Don't call amdgpu_dm_display_resume as it doesn't exist UPSTREAM: drm/amd/display: Adding stutter entry wm to dce bw struct UPSTREAM: drm/amd/display: Implementing new bandwidth registers for DCE120 UPSTREAM: drm/amd/display: Separate mem input constuctors for dce 112 and 120 BACKPORT: drm/amd/pp: Adding set_watermarks_for_clocks_ranges for SMU10 UPSTREAM: drm/amd/pp: Adding a function to store cc6 data in SMU10 UPSTREAM: drm/amd/display: Unify dm resume sequence into a single call BACKPORT: drm/amd/powerplay: Add notify PWE function to SMU10 UPSTREAM: drm/amd/display: Clear connector's edid pointer UPSTREAM: drm/amd/pp: Add cases for getting phys and disp clks for SMU10 UPSTREAM: drm/amd/display: Release fake sink UPSTREAM: drm/amd/display: Do not program interrupt status on disabled crtc UPSTREAM: drm/amd/pp: Connect display_clock_voltage_request to a function pointer UPSTREAM: drm/amd/display: adding ycbcr420 pixel encoding for hdmi UPSTREAM: drm/amd/display: add a check for display depth validity UPSTREAM: drm/amd/display: Don't share clk source between DP and HDMI UPSTREAM: drm/amd/display: update clk for various HDMI color depths UPSTREAM: drm/amd/display: Pass connector id when executing VBIOS CT UPSTREAM: drm/amd/display: Check if clock source in use before disabling Nayan Deshmukh (2): UPSTREAM: drm/scheduler: move the tracepoints file from the include directory BACKPORT: drm/scheduler: remove unused parameter Nicholas Mc Guire (1): UPSTREAM: drm: re-enable error handling Nicolai Hhnle (1): UPSTREAM: drm/amdgpu: fix user fence write race condition Nikola Cornij (6): UPSTREAM: drm/amd/display: Update ASIC header files UPSTREAM: drm/amd/display: Rename feature-specific register address init macro UPSTREAM: drm/amd/display: Log DTN only after the atomic commit in Diag UPSTREAM: drm/amd/display: Clear underflow status for debug purposes UPSTREAM: drm/amd/display: Read DPCD link caps up to and including DP_ADAPTER_CAP UPSTREAM: drm/amd/display: Read DP_SINK_COUNT_ESI range on HPD for DP 1.4 Noralf Trnnes (1): UPSTREAM: drm: Use srcu to protect drm_device.unplugged Oak Zeng (1): UPSTREAM: drm/amdkfd: Dump HQD of HIQ Oded Gabbay (1): UPSTREAM: drm/amdgpu: conditionally compile amdgpu's amdkfd files Oleksandr Andrushchenko (1): UPSTREAM: drm: Fix possible race conditions while unplugging DRM device Philip Yang (1): UPSTREAM: drm/amdkfd: use %px to print user space address instead of %p Pixel Ding (3): UPSTREAM: drm/scheduler: always put last_sched fence in entity_fini UPSTREAM: drm/scheduler: move last_sched fence updating prior to job popping (v2) UPSTREAM: drm/scheduler: don't update last scheduled fence in TDR Rajan Vaja (1): UPSTREAM: drm/amd/pp: Fix uninitialized variable Rex Zhu (55): UPSTREAM: drm/amd/pp: Remove useless fw load error handler on Polaris BACKPORT: drm/amd/pp: Add hwmgr_sw_init/fini functioins UPSTREAM: drm/amd/pp: Lock pm_funcs when set pp table UPSTREAM: drm/amd/pp: Save vf state in pp context UPSTREAM: drm/amd/pp: Use release_firmware directly in powerplay UPSTREAM: drm/amdgpu: Use dpm_enabled as dpm state flag UPSTREAM: drm/amd/pp: Use gfx rlc funcs directly in powerplay BACKPORT: drm/amdgpu: Get pci resource directly through adev UPSTREAM: drm/amd/dc: Use atombios api directly in DC UPSTREAM: drm/amd/pp: Use atombios api directly in powerplay (v2) UPSTREAM: drm/amdgpu: Set pm_display_cfg in non-dc mode UPSTREAM: drm/amd/pp: Not call cgs interface to get display info UPSTREAM: drm/amdgpu: Delete some cgs functions UPSTREAM: drm/amdgpu: remove duplicate cg/pg wrapper functions UPSTREAM: drm/amd/display: Disentangle dc.h include from amdgpu.h UPSTREAM: drm/amd/pp: Refine pp_atomfwctrl_get_vbios_bootup_values UPSTREAM: drm/amd/pp: Move same macro definitions to hwmgr.h UPSTREAM: drm/amd/pp: Remove unnecessary forward declaration UPSTREAM: drm/amd/pp: Remove dead function in smu7_smumgr.c UPSTREAM: drm/amd/pp: Remove useless smu7 running state check UPSTREAM: Revert "drm/amd/powerply: fix power reading on Fiji" UPSTREAM: drm/amd/pp: Refine get_gpu_power for VI UPSTREAM: drm/amd/pp: Remove struct pp_gpu_power UPSTREAM: drm/amd/pp: Clear smu response register before send smu message UPSTREAM: drm/amd/pp: Move common code to smu_helper.c UPSTREAM: drm/amdgpu: Reserved vram for smu to save debug info. UPSTREAM: drm/amd/pp: Remove dead interface UPSTREAM: drm/amd/pp: Fix NULL point check error in smu_set_watermarks_for_clocks_ranges UPSTREAM: drm/amd/pp: Change pstate_clk frequency unit to 10KHz on Rv UPSTREAM: drm/amd/pp: Use dynamic gfx_clk rather than hardcoded values UPSTREAM: drm/amd/pp: Refine the OD state checking code in smu7 UPSTREAM: drm/amd/pp: Change voltage/clk range for OD feature on VI UPSTREAM: drm/amd/pp: Print out voltage/clock range in sysfs UPSTREAM: drm/amd/pp: Add OVERDRIVE support on Vega10 (v2) UPSTREAM: drm/amd/pp: Skip fan attributes if fan not present UPSTREAM: drm/amdgpu: Fix display corruption on CI with dpm enabled UPSTREAM: drm/amd/pp: Implement force_clock_level for RV UPSTREAM: drm/amd/pp: Workaround flickering issue on RV UPSTREAM: drm/amd/pp: Fix static checker warning UPSTREAM: drm/amd/pp: fix a couple locking issues UPSTREAM: drm/amd/pp: Add smu support for VCN powergating on RV UPSTREAM: drm/amdgpu: Add CG/PG flags for VCN UPSTREAM: drm/amdgpu: Add SOC15_WAIT_ON_RREG macro define UPSTREAM: drm/amdgpu: Add static CG control for VCN on RV UPSTREAM: drm/amdgpu: Enable VCN CG by default on RV UPSTREAM: drm/amdgpu: Add VCN static PG support on RV UPSTREAM: drm/amdgpu: Enable VCN static PG by default on RV UPSTREAM: drm/amdgpu: Add runtime VCN PG support UPSTREAM: drm/amd/pp: Allow underclocking when od table is empty in vbios UPSTREAM: drm/amd/pp: Fix OD feature enable failed on Vega10 workstation cards UPSTREAM: drm/amdgpu: fix a reversed condition UPSTREAM: drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST UPSTREAM: drm/amd/pp: Set Max clock level to display by default UPSTREAM: drm/amdgpu: Fix typo in amdgpu_vmid_mgr_init BACKPORT: drm/amdgpu: skip CG for VCN when late_init/fini Roman Li (3): UPSTREAM: drm/amd/display: add assert in enable FBC UPSTREAM: drm/amd: Add dce-12.1 gpio aux registers (v2) UPSTREAM: drm/amd/display: check if audio clk enable is applicable Samson Tam (1): UPSTREAM: drm/amd/display: don't create new dc_sink if nothing changed at detection Samuel Li (1): UPSTREAM: drm: add parameter explanation for some gem dmabuf_ops Shaoyun Liu (5): UPSTREAM: drm/amdkfd: Remove queue node when destroy queue failed UPSTREAM: drm/amdgpu: Update GFX info structure to match what vega20 used UPSTREAM: drm/amdgpu: Fix NULL pointer when load kfd driver with PP block is disabled UPSTREAM: drm/amd/include: Update df 3.6 mask and shift definition UPSTREAM: drm/amdkfd: Fix kernel queue 64 bit doorbell offset calculation Shashank Sharma (2): UPSTREAM: drm: Add aspect ratio parsing in DRM layer UPSTREAM: drm: Add and handle new aspect ratios in DRM layer Shirish S (2): UPSTREAM: drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2) BACKPORT: drm/amd/display: Correct the plane enumeration order (v2) SivapiriyanKumarasamy (2): UPSTREAM: drm/amd/display: Add vline IRQ programming for DCN UPSTREAM: drm/amd/display: fix gamma not being applied Stephen Rothwell (1): UPSTREAM: drm/amdgpu: include pagemap.h for release_pages() Su Sung Chung (1): UPSTREAM: drm/amd/display: fix bug of accessing invalid memory Tao Zhou (1): UPSTREAM: drm/amdgpu: Fix SDMA hang in prt mode v2 Thierry Reding (2): UPSTREAM: drm/fourcc: Fix fourcc_mod_code() definition UPSTREAM: drm/tegra: Sanitize format modifiers Tom St Denis (3): UPSTREAM: drm/amd/amdgpu: vcn10 Add callback for emit_reg_write_reg_wait UPSTREAM: drm/amd/amdgpu: Add some documentation to the debugfs entries UPSTREAM: drm/amd/amdgpu: Code comments for the amdgpu_ttm.c driver. (v2) Tom Stellard (1): UPSTREAM: drm/amdgpu: Use dev_info() to report amdkfd is not supported for this ASIC Tomi Valkeinen (1): UPSTREAM: drm: fix use of freed memory in drm_mode_setcrtc Tony Cheng (4): UPSTREAM: drm/amd/display: dal 3.1.39 UPSTREAM: drm/amd/display: dal 3.1.40 UPSTREAM: drm/amd/display: dal 3.1.43 UPSTREAM: drm/amd/display: dal 3.1.44 Ville Syrjl (16): UPSTREAM: drm/uapi: The ctm matrix uses sign-magnitude representation UPSTREAM: drm/uapi: Deprecate DRM_MODE_PROP_PENDING UPSTREAM: drm/scdc-helper: Convert errors into debug messages BACKPORT: drm/simple-kms-helper: Plumb plane state to the enable hook UPSTREAM: drm: Clear crtc->primary->crtc when disabling the crtc via setcrtc() UPSTREAM: drm/atomic-helper: WARN if legacy plane fb pointers are bogus when committing duplicated state UPSTREAM: drm: Add local 'plane' variable for primary/cursor planes UPSTREAM: drm: Adjust whitespace for legibility UPSTREAM: drm: Make the fb refcount handover less magic UPSTREAM: drm: Use plane->state->fb over plane->fb UPSTREAM: drm: Don't pass the index to drm_property_add_enum() UPSTREAM: drm/rect: Fix drm_rect_rotation_inv() docs UPSTREAM: drm/modes: Introduce drm_mode_match() UPSTREAM: drm/edid: Use drm_mode_match_no_clocks_no_stereo() for consistentcy UPSTREAM: drm/edid: Fix cea mode aspect ratio handling UPSTREAM: drm/edid: Don't send bogus aspect ratios in AVI infoframes Vitaly Prosyak (1): UPSTREAM: drm/amd/display: Add dc_lut_mode enum Wei Wang (1): UPSTREAM: include/linux/idr.h: add #include <linux/bug.h> Wesley Chalmers (1): UPSTREAM: drm/amd/display: fix use of uninitialized memory Xiaojie Yuan (1): UPSTREAM: drm/amdgpu/uvd7: add emit_reg_write_reg_wait ring callback Xingyue Tao (4): UPSTREAM: drm/amd/display: Add double buffer machanism to ICSC UPSTREAM: drm/amd/display: Add double buffer machanism to OCSC UPSTREAM: drm/amd/display: Add dc cap to restrict VSR downscaling src size UPSTREAM: drm/amd/display: Only limit VSR downscaling when actually downscaling Yong Zhao (5): UPSTREAM: drm/amdkfd: Separate trap handler assembly code and its hex values UPSTREAM: drm/amdkfd: Fix CP soft hang on APUs UPSTREAM: drm/amdgpu: Add support to change mtype for 2nd part of gart BOs on GFX9 UPSTREAM: drm/amdkfd: Change the control stack MTYPE from UC to NC on GFX9 UPSTREAM: drm/amdkfd: Fix ATS capablity was not reported correctly on some APUs Yongqiang Sun (6): UPSTREAM: drm/amd/display: Retry when read dpcd caps failed. UPSTREAM: drm/amd/display: Change disable backlight ramp change threshold from 0 to maximum value. UPSTREAM: drm/amd/display: dal 3.1.41 UPSTREAM: drm/amd/display: Check lid state to determine fast boot optimization. UPSTREAM: drm/amd/display: Check SCRATCH reg to determine S3 resume. UPSTREAM: drm/amd/display: Use dig enable to determine fast boot optimization. Yue Hin Lau (1): UPSTREAM: drm/amd/display: add missing colorspace for set black color kbuild test robot (1): UPSTREAM: drm/amdgpu: vcn_v1_0_is_idle() can be static welu (2): UPSTREAM: drm/amdkfd: Try to enable atomics for all GPUs UPSTREAM: drm/amdgpu: change pp_dpm clk/mclk/pcie input format. Documentation/core-api/idr.rst | 79 + Documentation/core-api/index.rst | 1 + Documentation/core-api/kernel-api.rst | 12 - MAINTAINERS | 2 + arch/x86/include/asm/atomic64_32.h | 2 +- drivers/acpi/custom_method.c | 2 +- drivers/acpi/fan.c | 2 +- drivers/char/tpm/tpm_tis_core.h | 8 +- drivers/fmc/fmc-core.c | 2 +- drivers/gpu/drm/amd/amdgpu/Makefile | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 96 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 131 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 111 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 27 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 10 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 10 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1043 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 585 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 44 + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 247 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 78 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 81 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 195 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 98 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 20 + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 57 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 90 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 111 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 142 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 369 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 21 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 476 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 56 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 22 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 280 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 105 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 293 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 22 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/cik.c | 7 + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 30 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 17 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +- drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 120 + .../{powerplay/inc/pp_soc15.h => amdgpu/df_v1_7.h} | 38 +- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 116 + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 40 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 99 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 352 ++- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 69 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 67 +- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 9 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 30 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 103 +- drivers/gpu/drm/amd/amdgpu/si.c | 7 + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 126 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 15 + drivers/gpu/drm/amd/amdgpu/soc15d.h | 6 + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 46 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 40 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 112 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1073 +++++---- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 188 +- drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 53 + drivers/gpu/drm/amd/amdgpu/vi.c | 53 +- drivers/gpu/drm/amd/amdkfd/Makefile | 10 +- drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 20 +- drivers/gpu/drm/amd/amdkfd/cik_regs.h | 3 +- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 560 +++++ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 274 +-- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 1214 ++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 52 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 11 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 134 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 114 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 84 + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 74 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 119 +- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 92 + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 13 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 39 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 9 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 340 +++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 319 +++ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 7 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 443 ++++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 392 +--- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 583 +++++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 113 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 50 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 22 +- drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 27 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + drivers/gpu/drm/amd/amdkfd/soc15_int.h | 47 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 354 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 29 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 15 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 3 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 59 +- drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/basics/conversion.c | 28 +- drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 381 ++-- drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c | 161 -- .../gpu/drm/amd/display/dc/basics/log_helpers.c | 1 - drivers/gpu/drm/amd/display/dc/basics/logger.c | 3 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 3 + .../gpu/drm/amd/display/dc/bios/command_table.c | 40 +- .../gpu/drm/amd/display/dc/bios/command_table2.c | 26 +- .../drm/amd/display/dc/bios/command_table_helper.c | 1 + .../amd/display/dc/bios/command_table_helper2.c | 1 + .../gpu/drm/amd/display/dc/calcs/calcs_logger.h | 579 +++++ .../gpu/drm/amd/display/dc/calcs/custom_float.c | 46 +- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 256 ++- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 82 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 131 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 38 +- .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 21 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 185 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 67 +- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 - drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 413 ++-- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 8 +- drivers/gpu/drm/amd/display/dc/dc.h | 46 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 + drivers/gpu/drm/amd/display/dc/dc_helper.c | 59 + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 5 + drivers/gpu/drm/amd/display/dc/dc_link.h | 9 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 28 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 17 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 9 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 83 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 33 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 40 +- drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 6 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 10 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 128 +- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 17 + .../gpu/drm/amd/display/dc/dce/dce_scl_filters.c | 48 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 82 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 26 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 54 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 199 +- .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 1 + .../drm/amd/display/dc/dce110/dce110_resource.c | 33 - .../display/dc/dce110/dce110_timing_generator.c | 16 +- .../drm/amd/display/dc/dce110/dce110_transform_v.c | 8 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 35 +- .../drm/amd/display/dc/dce112/dce112_resource.h | 5 - .../drm/amd/display/dc/dce120/dce120_resource.c | 50 +- .../display/dc/dce120/dce120_timing_generator.c | 12 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 52 +- drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 98 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 46 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 82 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 96 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 38 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 229 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 14 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 229 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 90 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 435 +++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1362 +++++++++++ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 330 +++ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 24 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 5 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 104 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 26 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 348 +-- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1494 ++++++++++++ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 524 +++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 8 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 13 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 138 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 969 ++++---- .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 2 + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 10 + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 2 +- drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 5 +- drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 64 + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 18 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 17 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 36 +- .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 22 +- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 56 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 +- drivers/gpu/drm/amd/display/dc/irq_types.h | 9 + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 11 +- drivers/gpu/drm/amd/display/include/dal_types.h | 1 + drivers/gpu/drm/amd/display/include/fixed31_32.h | 274 ++- drivers/gpu/drm/amd/display/include/fixed32_32.h | 129 -- .../gpu/drm/amd/display/include/logger_interface.h | 9 + drivers/gpu/drm/amd/display/include/logger_types.h | 66 +- .../drm/amd/display/modules/color/color_gamma.c | 700 ++++-- .../drm/amd/display/modules/color/color_gamma.h | 48 +- .../gpu/drm/amd/display/modules/inc/mod_stats.h | 4 + drivers/gpu/drm/amd/display/modules/stats/stats.c | 254 ++- drivers/gpu/drm/amd/include/amd_shared.h | 23 +- .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 12 + .../amd/include/asic_reg/dce/dce_12_0_sh_mask.h | 152 ++ .../drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h | 19 +- .../drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h | 8 + .../drm/amd/include/asic_reg/df/df_1_7_default.h | 26 + .../drm/amd/include/asic_reg/df/df_1_7_offset.h | 37 + .../drm/amd/include/asic_reg/df/df_1_7_sh_mask.h | 52 + .../drm/amd/include/asic_reg/df/df_3_6_default.h | 26 + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 33 + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 48 + drivers/gpu/drm/amd/include/atombios.h | 7 + drivers/gpu/drm/amd/include/atomfirmware.h | 52 +- drivers/gpu/drm/amd/include/cgs_common.h | 170 -- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 28 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 13 +- drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + drivers/gpu/drm/amd/include/v9_structs.h | 48 +- drivers/gpu/drm/amd/include/vega20_ip_offset.h | 1051 +++++++++ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 497 ++-- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 41 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 91 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 10 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 222 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 15 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 197 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 7 + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 45 +- .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 10 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 278 ++- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.h | 3 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 16 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 342 +-- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 2 + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 229 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 47 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 98 + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 27 + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 962 ++++---- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 26 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 119 +- .../amd/powerplay/hwmgr/vega10_processpptables.c | 8 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 107 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 101 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 5 +- .../amd/powerplay/hwmgr/vega12_processpptables.c | 9 +- .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 37 +- .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 9 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 35 +- drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 4 +- drivers/gpu/drm/amd/powerplay/inc/smu75.h | 760 +++++++ drivers/gpu/drm/amd/powerplay/inc/smu75_discrete.h | 886 ++++++++ drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 1 + .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 14 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 26 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 11 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 25 +- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 69 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 1 - drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 2 + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 21 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 52 +- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 56 +- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2385 ++++++++++++++++++++ .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.h | 75 + drivers/gpu/drm/drm_atomic.c | 22 +- drivers/gpu/drm/drm_atomic_helper.c | 32 +- drivers/gpu/drm/drm_blend.c | 39 + drivers/gpu/drm/drm_color_mgmt.c | 4 +- drivers/gpu/drm/drm_connector.c | 50 +- drivers/gpu/drm/drm_context.c | 2 +- drivers/gpu/drm/drm_crtc.c | 64 +- drivers/gpu/drm/drm_crtc_internal.h | 2 + drivers/gpu/drm/drm_drv.c | 64 +- drivers/gpu/drm/drm_edid.c | 46 +- drivers/gpu/drm/drm_fb_helper.c | 12 +- drivers/gpu/drm/drm_framebuffer.c | 33 +- drivers/gpu/drm/drm_gem.c | 13 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 19 + drivers/gpu/drm/drm_ioc32.c | 4 +- drivers/gpu/drm/drm_ioctl.c | 86 +- drivers/gpu/drm/drm_lease.c | 24 +- drivers/gpu/drm/drm_modes.c | 179 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 7 +- drivers/gpu/drm/drm_plane.c | 54 +- drivers/gpu/drm/drm_prime.c | 21 +- drivers/gpu/drm/drm_property.c | 27 +- drivers/gpu/drm/drm_rect.c | 4 +- drivers/gpu/drm/drm_scdc_helper.c | 10 +- drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- drivers/gpu/drm/drm_syncobj.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 4 +- drivers/gpu/drm/gma500/cdv_device.c | 4 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/intel_cdclk.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 5 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 1 - drivers/gpu/drm/msm/msm_debugfs.c | 3 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +- drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- drivers/gpu/drm/pl111/pl111_display.c | 3 +- drivers/gpu/drm/scheduler/gpu_scheduler.c | 91 +- .../gpu/drm/scheduler}/gpu_scheduler_trace.h | 2 +- drivers/gpu/drm/tegra/fb.c | 35 +- drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 17 - drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +- drivers/gpu/drm/tinydrm/repaper.c | 5 +- drivers/gpu/drm/tinydrm/st7586.c | 5 +- drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + drivers/gpu/drm/ttm/ttm_bo_util.c | 51 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + drivers/gpu/drm/ttm/ttm_lock.c | 1 + drivers/gpu/drm/ttm/ttm_memory.c | 1 + drivers/gpu/drm/ttm/ttm_module.c | 1 + drivers/gpu/drm/ttm/ttm_object.c | 1 + drivers/gpu/drm/ttm/ttm_tt.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- drivers/media/i2c/msp3400-kthreads.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/net/ethernet/cadence/macb_ptp.c | 0 .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 2 +- drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- drivers/scsi/aacraid/src.c | 4 +- drivers/scsi/dpt_i2o.c | 2 +- drivers/scsi/qedi/qedi_fw.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/video/backlight/backlight.c | 73 + fs/internal.h | 1 - fs/locks.c | 2 +- fs/ocfs2/stack_user.c | 2 +- fs/orangefs/orangefs-utils.c | 2 +- fs/xfs/xfs_export.c | 2 +- include/drm/amd_asic_type.h | 2 + include/drm/drmP.h | 28 +- include/drm/drm_atomic.h | 75 - include/drm/drm_blend.h | 3 + include/drm/drm_connector.h | 3 +- include/drm/drm_crtc.h | 8 +- include/drm/drm_device.h | 10 +- include/drm/drm_dp_helper.h | 17 +- include/drm/drm_drv.h | 15 +- include/drm/drm_edid.h | 2 - include/drm/drm_file.h | 23 +- include/drm/drm_gem_framebuffer_helper.h | 3 + include/drm/drm_ioctl.h | 7 - include/drm/drm_legacy.h | 4 +- include/drm/drm_modes.h | 22 + include/drm/drm_modeset_helper_vtables.h | 5 +- include/drm/drm_plane.h | 25 +- include/drm/drm_property.h | 28 +- include/drm/drm_simple_kms_helper.h | 6 +- include/drm/gpu_scheduler.h | 56 +- include/drm/i915_pciids.h | 3 +- include/drm/tinydrm/tinydrm.h | 4 +- include/linux/backlight.h | 58 + include/linux/fs.h | 1 + include/linux/idr.h | 173 +- include/linux/kernel.h | 71 +- include/linux/radix-tree.h | 17 +- include/uapi/drm/amdgpu_drm.h | 20 + include/uapi/drm/drm.h | 7 + include/uapi/drm/drm_fourcc.h | 38 +- include/uapi/drm/drm_mode.h | 15 +- kernel/audit.c | 6 +- kernel/trace/trace_printk.c | 4 +- lib/idr.c | 255 ++- lib/radix-tree.c | 3 +- lib/raid6/sse2.c | 14 +- net/sched/act_api.c | 72 +- net/sched/cls_flower.c | 34 +- scripts/coccinelle/api/drm-get-put.cocci | 10 - sound/soc/fsl/fsl_dma.c | 2 +- tools/testing/radix-tree/idr-test.c | 24 +- 452 files changed, 29205 insertions(+), 9079 deletions(-) create mode 100644 Documentation/core-api/idr.rst create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v1_7.c rename drivers/gpu/drm/amd/{powerplay/inc/pp_soc15.h => amdgpu/df_v1_7.h} (57%) create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v3_6.c create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v3_6.h mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h create mode 100644 drivers/gpu/drm/amd/amdkfd/soc15_int.h delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/calcs_logger.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h delete mode 100644 drivers/gpu/drm/amd/display/include/fixed32_32.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_default.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_default.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/vega20_ip_offset.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu75.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu75_discrete.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.h rename {include/drm => drivers/gpu/drm/scheduler}/gpu_scheduler_trace.h (97%) mode change 100755 => 100644 drivers/net/ethernet/cadence/macb_ptp.c BUG=b:112542653 TEST=Build and run on Grunt, run graphics_SanAngeles and login_LoginSuccess Change-Id: Ibfef63f40af181a75e8fa051e8e758ee90bd7f58 Signed-off-by: Dominik Behr <dbehr@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1455373 Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="0" gerrit_number="1455373" owner_email="dbehr@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/1455373/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I3fa80d51759daf1cda51b3a4adec46f9bd26272f" commit="d7a51832c9c45d428f490e25a3ae0485365042dc" commit_message="frecon: fix logging to /dev/kmsg frecon is setup to log to /dev/kmsg. Each call to LOG consisted of several calls to write(): one for the prefix, another for the message, and a final one to add a trailing newline. The kernel interprets each of these write() calls as a separate log entry, causing the message to be broken into contextless fragments. Instead, make a single call to write(). Include the severity of the log message using the prefix notation understood by the kernel. The LOG function previously ignored the severity argument. The log_tsm function converted them to a string and included them in the message prefix. Use "frecon" as the syslog tag for the log_tsm function to make it easier to group messages from frecon. Add pid to messages from log_tsm. Surround the pid in square brackets instead of round brackets. This is the standard way syslog expresses it, and consumers of kernel messages such as journald expect them. BUG=chromium:929010 TEST=frecon messages in dmsg are correctly formatted TEST=frecon messages in journalctl have correct _PID and SYSLOG_IDENTIFIER values Change-Id: I3fa80d51759daf1cda51b3a4adec46f9bd26272f Reviewed-on: https://chromium-review.googlesource.com/1456564 Commit-Ready: Christopher Morin <cmtm@google.com> Tested-by: Christopher Morin <cmtm@google.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="1456564" owner_email="cmtm@google.com" pass_count="0" patch_number="1" project="chromiumos/platform/frecon" project_url="https://chromium-review.googlesource.com/chromiumos/platform/frecon" ref="refs/changes/64/1456564/1" remote="cros" total_fail_count="0"/><lkgm version="11721.0.0-rc7"/></manifest> |
