Age | Commit message (Collapse) | Author |
|
am: a41a90c001
Change-Id: I9e3da9a443e95cc2ecea4867818ebbc56c6a967d
|
|
am: b966f758e8
Change-Id: I0a471e6aecf3f3c8e6942b78ce08b0fac35a5c1d
|
|
am: c2f57fb004
Change-Id: I35c29bd54323f3c9732abf53333b316f82ccedd6
|
|
Change-Id: I91d1349a394c491f5fcb6f9ebdd80f0308418ae6
BUG: 129345239
|
|
Change-Id: I62829f3a8753d958c0d19ca0feabd121dd65ac0a
BUG: 129345239
|
|
am: 7716a0b71c
Change-Id: Ifc9e6230dbfd3c61cbceeb9f8a8279f564b46772
|
|
am: dd220acefd
Change-Id: I6480f5905e54e4df3f5b0bb2809b00052eaeb3dd
|
|
am: 76605857ef
Change-Id: If59d70aed001ca4f7a939084dfc6c5a23c5d8820
|
|
Should resolve some problems on 4.14 & 4.19 with drm_hwcomposer.
4.4.174 / 64914ac:
Includes kernel/common merges, and the following changes:
b680ca6880b1 ion_dummy_driver: Remove SYSTEM_CONTIG heap
49742f376878 ion_dummy_driver: Rework ion_dummy_driver to avoid direct indexing into the heaps
46491de78ed3 ion_dummy_driver: Use IS_ERR_OR_NULL() before destroying heaps
28a52e1dbaf9 hikey{,960}: Move from clang r346389b to r349610.
3bfe405f0c3e ANDROID: Move from clang 4679922 to r346389b (#2).
4.9.158 / e4b92c9:
Includes kernel/common merges, and the following changes:
e2d68c2052cf ion_dummy_driver: Remove SYSTEM_CONTIG heap
addd664220e5 ion_dummy_driver: Rework ion_dummy_driver to avoid direct indexing into the heaps
fce649b7041e ion_dummy_driver: Use IS_ERR_OR_NULL() before destroying heaps
7a6d7812945b hikey{,960}: Move from clang r346389b to r349610.
4.14.101 / 56136f5:
Includes kernel/common merges, and the following changes:
56136f5a7cad hikey960_defconfig: Merge in android-base/reccomended/reccomended-arm64 config framgents
c4a39dfe5e89 hikey960_defconfig: Update hikey960_defconfig via savedefconfig
4ca9f0524f26 hikey{,960}: Move from clang r346389b to r349610.
758837f46cb4 Revert adv7511 mode whitelisting hack
fe31bb685e81 HACK: drm: kirin960: Add DSI mode_valid hooks
653d50306015 drm: kirin960: Revert change that broke a number of modes
4.19.23 / da6963b:
Includes kernel/common merges, and the following changes:
aadd84d4f66e hikey{,960}: Move from clang r346389b to r349610.
34d2e7a0f456 Revert "HACK: adv7511: Re-add mode limiting (this needs to go into drm driver)"
07e98028632c HACK: drm: kirin960: Add DSI mode_valid hooks
a7127323d0d5 drm: kirin960: Revert change that broke a number of modes
Change-Id: I2f313811bb4ff31c14d02f888fc434b51b8311d3
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
stage-aosp-master am: 8f104a09fe -s ours
am: ccbbf41e9b -s ours
am skip reason: subject contains skip directive
Change-Id: I774ca8da400c1a5c2820549fbbd6a12094ade0b6
|
|
am: 8f104a09fe -s ours
am skip reason: subject contains skip directive
Change-Id: I2ab60aba52d989ac9f9be0343ee8f08e863700af
|
|
Bug: 120848293
Change-Id: Ie032cdb7e7e1bcb8ad3d9c6e0893c7f626796606
|
|
am: 05b6ab4966
Change-Id: I71bea61e90dd024a17d361a83e3926e1857f1ded
|
|
am: d46335e460
Change-Id: I27f6a6517139e7208628a0d5c1bcb91880dea0cc
|
|
am: 9e16acf684
Change-Id: I8038b7cbaea02ecfaa13de4915621773580057ba
|
|
am: 29d25f29c1
Change-Id: Id8cc3a7f29e0429901d34c4aa5949b07fe94779e
|
|
am: fad02f8f23
Change-Id: I0667f459c1ab25aa1a08e0760031aa1ac1b25584
|
|
am: 3ea25152c2
Change-Id: I029cde0646d424d87dd458284a64c496cf1afb24
|
|
Add kernel and dtb prebuilts for hikey and hikey960 for Linux 4.19.
These have been tested on both devices and boot to desktop.
Change-Id: Id5205b5048bf41444d85010c4b42f92fafa2c98a
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
NOTE: The hikey update here pulls in some LTS changes, but has no
hikey-specific changes of note. This update is done just to keep the
hikey and hikey960 shas in sync.
Addresses some performance inconsistencies in hikey960 due to changes
made between 4.9 and 4.14 to ion and eas. This change should improve
graphics performance in important use cases.
4.14.94 / 7edc44e:
Includes kernel/common merges, and the following changes:
a8e67f273b57 HACK: staging: ion: Try to cache mappings to avoid cache invalidations
f173eed87928 HACK: Revert "FROMLIST: arm64: hikey960: update idle-states"
Change-Id: I9950e7b580b7cc105a8fcfad6231d3cc0135475e
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
am: 6fb9a204ef
Change-Id: I6ea6be7b1fa01be5a2344bf5b5e27fd10af78cba
|
|
am: f4a9eed291
Change-Id: I5bece2f047a59f0808c769a638aaab9186020730
|
|
am: 65cfc6e7c7
Change-Id: I8d34bc883e8ed8dc1131428983cd6bd19a3f776b
|
|
am: 3961c11abc
Change-Id: I42cf6133cbdf20b44b5a1f69791b4e0516b0d1a2
|
|
am: 7f6583d915
Change-Id: I7d640c9aa54a1a3579be0dae96b35ca8c912d08b
|
|
am: b937f822fe
Change-Id: Id6a890e073d0891875422981c63d4fc2a4795bdc
|
|
NOTE: The kernel changes on 4.9, 4.14 that were reverted in 1ce81383 for
clang have been restored in these kernels. All of these kernels were
built with clang-r346389b from AOSP.
4.4.165 / 3f030f9:
Includes kernel/common merges, and the following changes:
3f030f9c1e27 hikey and hikey960: disable CONFIG_DEVPORT
02ba6fc5ea78 ANDROID: Move from clang 4679922 to r346389b.
61ff8ad42406 hikey960: Remove FIQ_DEBUGGER enablement
25665bee3929 hikey: Remove FIQ_DEBUGGER enablement
6b6dffe8abee hikey960: Enable CONFIG_DRM_LOAD_EDID_FIRMWARE
4.9.146 / 9772bd8:
Includes kernel/common merges, and the following changes:
9772bd84a225 hikey and hikey960: disable CONFIG_DEVPORT
ca7f01809aa0 hikey960_defconfig: Enable k3dma and dmatest in defconfig
d591b5cdb93a arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-avail-chan
9d7d773d2917 arm64: dts: hi3660: Add hisi asp dma device
96695ecbab22 arm64: dts: hi3660: Add dma to uart nodes
7938e303c1a8 arm64: dts: hi3660: Add dma0 node
42787e32f640 dma: k3dma: Add support to dma_avail_chan
7a536f659f28 dma: k3dma: Delete axi_config
957634db10e4 dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware
74bc24755d24 Documentation: bindings: k3dma: Add binding for dma-avail-chan
6c56b87f76a2 Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp
2531c8d5dc4d ANDROID: Move from clang 4679922 to r346389b (#2).
ddcd5735c289 Revert "Revert "arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID""
05e354d0fd21 Revert "Revert "arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests""
81000109b7e9 Revert "Revert "arm64: KVM: Add ARCH_WORKAROUND_2 support for guests""
e3987d10901b Revert "Revert "arm64: KVM: Add HYP per-cpu accessors""
8b52c3456981 Revert "Revert "KVM: arm64: Avoid storing the vcpu pointer on the stack""
87ad72e732f6 Revert "Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state""
4ed4fc5c9692 ANDROID: Move from clang 4679922 to r346389b.
c18f4ade0789 hikey960: Remove FIQ_DEBUGGER enablement
41a1a5c92dff hikey: Remove FIQ_DEBUGGER enablement
eef2b4001a19 arm64: dts: hikey: Add DMA entries for Bluetooth UART
649c5d17ca3e hikey960: Enable CONFIG_DRM_LOAD_EDID_FIRMWARE
4.14.88 / 9be4570:
Includes kernel/common merges, and the following changes:
9be4570683b8 hikey and hikey960: disable CONFIG_DEVPORT
a0d94c00c0db hikey960_defconfig: Enable k3dma and dmatest in defconfig
627456334815 arm64: dts: hi3660: Fixup unofficial dma-min-chan to dma-avail-chan
b0eab371b008 arm64: dts: hi3660: Add hisi asp dma device
f5270af562ca arm64: dts: hi3660: Add dma to uart nodes
bbc55dbac3df dma: k3dma: Add support to dma_avail_chan
652a573e8dab dma: k3dma: Delete axi_config
78c1e61a3b47 dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware
a71e29fbd604 Documentation: bindings: k3dma: Add binding for dma-avail-chan
1cf042650d44 Documentation: bindings: k3dma: Extend the k3dma driver binding to support hisi-asp
636d2eaef5af ANDROID: Move from clang 4679922 to r346389b (#2).
ed62bc3194ee Revert "Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state""
3ed68e37e8df Revert "Revert "Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state"""
c875791976e2 Revert "Revert "arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID""
2d8f34f19161 Revert "Revert "arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests""
f730df7eb483 Revert "Revert "arm64: KVM: Add ARCH_WORKAROUND_2 support for guests""
9761c365282c Revert "Revert "arm64: KVM: Add HYP per-cpu accessors""
225b8a89f026 Revert "Revert "KVM: arm64: Avoid storing the vcpu pointer on the stack""
e54427c5cac1 Revert "Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state""
eafe5bafb867 ANDROID: Move from clang 4679922 to r346389b.
441cb6f8306f thermal/drivers/hisi_thermal: Fix merge issue coming from linux-4.14
ac0a501db377 Revert "ANDROID: revert all remaining hisi_thermal.c changes"
3e5bad86f2ee hikey960: Remove FIQ_DEBUGGER enablement
70ff09e6ad98 hikey: Remove FIQ_DEBUGGER enablement
59255be115cf arm64: dts: hikey: Add DMA entries for Bluetooth UART
b405b8a5c791 misc: hisi_trim: Support voltage trim for Hikey960
257ff024dddc dts: hikey960: Fix PCIe reset-gpio tag name to reset-gpios
b404acb7ceaf UPSTREAM: arm64: dts: hisilicon: Add hi3660 cpu capacity-dmips-mhz information
116f873fc8d2 hikey960: Enable CONFIG_DRM_LOAD_EDID_FIRMWARE
ab9a9d347ec1 dts: HiKey960: Find a proper address for CMA (one more time)
89e636f2a609 dts: hikey960: Fix overlapping cma areas
f023ef2efd54 dts: hikey960: Fixup graphics errors on 4gb boards
45941b5227bd scsi: ufs: fix hynix ufs bug with quirk on hi36xx SoC
Change-Id: Ib256b5d5a86960f92cd4a6a5697de3efdf40642f
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
Support for 3.18 has been dropped.
Change-Id: I13849fb95994eb0132738adbf968189bc277b983
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
MERGE am: 4a1cb4e1e7 -s ours am: 325e1b95f6 -s ours
am: 853a7f45c0 -s ours
Change-Id: Ia31f476ff17b79ffe1082c44e0d897009f02f570
|
|
MERGE am: 4a1cb4e1e7 -s ours
am: 325e1b95f6 -s ours
Change-Id: I5b0ce567956c4157bfaca33ca85761ef1de9a67c
|
|
am: 4a1cb4e1e7 -s ours
Change-Id: I13c98fceda9a05d68f4d25604e76700bf1c3232e
|
|
Change-Id: I87ef3031f9f31626c57a53dfcd7461b01eea91cb
|
|
MERGE am: d2e1eef913 -s ours
am: c49451a5f1 -s ours
Change-Id: I0e1109f3c7964faed25b0be347470bd3298a28d7
|
|
MERGE
am: d2e1eef913 -s ours
Change-Id: I326b4e17f4336092a2a99a536a24fa73d16f4a50
|
|
Change-Id: Ifdb9c356d1be07ad20813ef305d4bc8d9cee222a
|
|
am: dd75536d86
Change-Id: Ia72e56b5d771ff2376e2690ef9f2275c571bcf3d
|
|
am: 1f5ea30ddf
Change-Id: Ie07f324268d102c9fbaf5459f3d7d4cf729e9af8
|
|
am: f94bebb2a1
Change-Id: I05e1fab0fb9fec758c0aadbcee084875310bea5a
|
|
Update the 4.9 kernel to enable use of the drm_hwcomposer on the hikey
platform. This is a breaking change and requires an updated userspace.
Includes the following changes:
bbab5cb8a5bd hikey_defconfig: Remove FBDEV_EMULATION support for drm_hwcomposer
487d03e59c3c drm: kirin/kirin960: Remove useless "Scale not support" error message
Bug: 62066689
Change-Id: I6297b6392f43dcef119402d4d995d670c3c83f81
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
am: 76925d3366
am: c477221e12
Change-Id: I17a22461c6bd64f4d77af4aebe5a887ba81ff5d8
|
|
am: 76925d3366
Change-Id: I4eb7c7800eef39f274765976889263de4caff460
|
|
am: a3fff63b84
Change-Id: I6bbe6b9a8d8fa387a28f1d1ba284a37ed04b028e
|
|
Update the 4.14 kernels only (for now) to enable use of the
drm_hwcomposer on the hikey and hikey960 platforms. This is a breaking
change and requires an updated userspace.
Includes the following changes:
20ebc74d51a1 hikey960_defconfig: Drop FBIOGET_DMABUF
d0455063e17c hikey/hikey960_defconfig: Remove FBDEV_EMULATION support for drm_hwcomposer
9815470ed175 drm/kirin960: don't turn on LDI at modeset
Bug: 62066689
Change-Id: I0294294b88e65d0140c0e389664b75a64916850a
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
am: e5c77defcb
Change-Id: I254c9c40c0f1919c510eb5dd856271339e89e392
|
|
am: 1ca5bb6eee
Change-Id: Ib0577d4766a87106c61879c656cf3593ffc8970a
|
|
am: 1ce8138373
Change-Id: I0c14de5025b41548a8226c9f0d349e807d1e1c5d
|
|
NOTE: The kernel images have been switched over to those built by
the clang compiler (from GCC, which was used for all previous
kernel images.)
NOTE: Some LTS backports were reverted on 4.9/4.14 because the clang
compiler used in AOSP cannot build them. This has been fixed in clang,
but the clang toolchain binaries are still awaiting a refresh.
3.18.120 / bc11327:
Includes kernel/common merges only.
4.4.153 / 75a9fe8:
Includes kernel/common merges, and the following changes:
75a9fe87673a ANDROID: hikey{,960}_defconfig: Merge in base and recommended.
cd223adea6fb defconfigs: Enable CONFIG_IDLE_PAGE_TRACKING
963cbd14d938 hikey960: bifrost: Update to r10p0-01rel0 source
4.9.124 / 96a73cd:
Includes kernel/common merges, and the following changes:
96a73cde6d81 ANDROID: hikey{,960}_defconfig: Merge in base and recommended.
1e6579bee09b defconfigs: Enable CONFIG_IDLE_PAGE_TRACKING
02ba176613f0 Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state"
7a09fcb01601 Revert "KVM: arm64: Avoid storing the vcpu pointer on the stack"
22f7ebd6690b Revert "arm64: KVM: Add HYP per-cpu accessors"
dd678fc010ca Revert "arm64: KVM: Add ARCH_WORKAROUND_2 support for guests"
1d74828e6ea2 Revert "arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests"
029e9944f498 Revert "arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID"
3cbd59917901 hikey960: bifrost: Update to r10p0-01rel0 source
78042e7c3920 hikey960: mali: don't wait forever for job_fault events.
4.14.67 / 8dd908c:
Includes kernel/common merges, and the following changes:
b512006dd9c5 drm: kirin/kirin960: Remove useless "Scale not support" error message
cfc6496783ff drm: kirin960: Add support for ARGB888 and ABGR888 pixel formats
6f704fcf12d2 defconfigs: Enable CONFIG_IDLE_PAGE_TRACKING
5b2d6ac4dd6a Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state"
980aff97ec35 Revert "KVM: arm64: Avoid storing the vcpu pointer on the stack"
67a25f8a0d3d Revert "arm64: KVM: Add HYP per-cpu accessors"
b379c1e7c5d6 Revert "arm64: KVM: Add ARCH_WORKAROUND_2 support for guests"
2229cec02f44 Revert "arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests"
30743a532d5a Revert "arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID"
6503b939d9c2 Revert "Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state""
af25c6e3fa8d Revert "KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state"
696ddb70902d hikey960: bifrost: Update to r10p0-01rel0 source
Bug: none
Test: local
Change-Id: Ie6fadd6a3b72ba0b5e86c76bfac13073b860a3c8
Signed-off-by: Alistair Strachan <astrachan@google.com>
|
|
3ee73289aa am: f9a8ca624e am: 775b861c2d
am: ba7fd6cb4c
Change-Id: I9575563f5d5ebcbe116fcf7039636f9244f72351
|
|
3ee73289aa am: f9a8ca624e
am: 775b861c2d
Change-Id: Ia24df292e71ffe974c746c31eb0217a56f455a7e
|
|
am: f9a8ca624e
Change-Id: Ia856b917c1a4586a7f018a77f95abb427c0a8498
|