aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2021-08-18 14:41:33 +0000
committerMilan P. Stanić <mps@arvanta.net>2021-08-18 19:48:53 +0000
commit51434c7d54a901a114dfb488d6e915984f3bc3f8 (patch)
treed2ad363d6162667fd8e59b6b5e571a9033aac1ad
parentd246df6e4330c162679eaca4f5ca83379e04aa01 (diff)
downloadaports-51434c7d54a901a114dfb488d6e915984f3bc3f8.tar.gz
aports-51434c7d54a901a114dfb488d6e915984f3bc3f8.tar.bz2
aports-51434c7d54a901a114dfb488d6e915984f3bc3f8.tar.xz
testing/linux-elm: upgrade to 5.13.12
remove fix-cursor.patch, fixed upstream
-rw-r--r--testing/linux-elm/APKBUILD10
-rw-r--r--testing/linux-elm/config-elm.aarch644
-rw-r--r--testing/linux-elm/fix-cursor.patch68
3 files changed, 6 insertions, 76 deletions
diff --git a/testing/linux-elm/APKBUILD b/testing/linux-elm/APKBUILD
index 41aec466cb..f8e2ccc802 100644
--- a/testing/linux-elm/APKBUILD
+++ b/testing/linux-elm/APKBUILD
@@ -4,12 +4,12 @@ _flavor=elm
pkgname=linux-${_flavor}
# NOTE: this kernel is intended for testing
# please resist urge to upgrade it blindly
-pkgver=5.13.11
+pkgver=5.13.12
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=1
+pkgrel=0
pkgdesc="Linux latest stable kernel for elm chromebooks"
url="https://www.kernel.org"
#depends="mkinitfs linux-firmware-any"
@@ -34,7 +34,6 @@ esac
fix-mmc1-speed.patch
fix-spi-nor-max-frequency.patch
fix-mmc-order.patch
- fix-cursor.patch
"
arch="aarch64"
@@ -236,11 +235,10 @@ _dev() {
sha512sums="
a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e linux-5.13.tar.xz
-ee966e45e0794fa2bb2ddd7b77ba13b8ef1b2f1e685a2e02825d91abc3db1d9fd6a0c23a330cef5553748470f7c67a0b24f88bd9566a8fdd6f04edf687ca7ec3 patch-5.13.11.xz
-2c23868afc8b73b8f5a2cba0a8d8da4513771769efc098a6a383710a1189cb0e3ccb8199eebb3606b260f8d7ff2ea86385372d860e37f8c086b25b8718f6a58b config-elm.aarch64
+1d889088c44ee620adebc51fc1606813dc3bee38c8c6a5a94dcba7de3e6276b05081ca85e5d6e91433fa7789c7cd5e0bb1fbf0b7a85e96ff76fe43adecd8bf74 patch-5.13.12.xz
+562145e37d92931165cb6a92fa926dfb5b5a87efb3700c2a9a1f9b23ad55c076d2226716dbac85cfad9ebdc0278fbb3f9d17772aac803b5ba4f574b6dee66284 config-elm.aarch64
112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775 kernel.its.elm
65c57a6d9a5bd5b6ec8798d1c46091bb72377ed1349b66e9a0a1a50ffa077f044f2bfdd30eab974c9c9774fc62d8dd5020a38432d108fce7f4fc1ed6648ea703 fix-mmc1-speed.patch
9e17fb96b81590da0f9b0917ddd2b9d195bab5cde2a4e7feb19991c50a8ac8e4502445715153ced8666e5b6575137c1d49899bb0ae9ab4505ed8f1ff7e569269 fix-spi-nor-max-frequency.patch
00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835 fix-mmc-order.patch
-cadb1e1d651ffb3bd3ef2f32585cd2842249b933b99614c2b01a29a3471998090ff76b7c159c4330b88fda520902cabd5d5b4c9d630be5e4d64c56ecba813612 fix-cursor.patch
"
diff --git a/testing/linux-elm/config-elm.aarch64 b/testing/linux-elm/config-elm.aarch64
index b061f73835..72b1e35ed6 100644
--- a/testing/linux-elm/config-elm.aarch64
+++ b/testing/linux-elm/config-elm.aarch64
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.13.6 Kernel Configuration
+# Linux/arm64 5.13.12 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=100301
CONFIG_CLANG_VERSION=0
diff --git a/testing/linux-elm/fix-cursor.patch b/testing/linux-elm/fix-cursor.patch
deleted file mode 100644
index feb1a87a84..0000000000
--- a/testing/linux-elm/fix-cursor.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
-old mode 100644
-new mode 100755
-index b5582dc..27ab307
---- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
-+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
-@@ -184,13 +184,11 @@
- }
-
- static void mtk_plane_atomic_update(struct drm_plane *plane,
-- struct drm_atomic_state *state)
-+ struct drm_atomic_state *old_state)
- {
-- struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,
-- plane);
-- struct mtk_plane_state *mtk_plane_state = to_mtk_plane_state(new_state);
-- struct drm_crtc *crtc = new_state->crtc;
-- struct drm_framebuffer *fb = new_state->fb;
-+ struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
-+ struct drm_crtc *crtc = plane->state->crtc;
-+ struct drm_framebuffer *fb = plane->state->fb;
- struct drm_gem_object *gem;
- struct mtk_drm_gem_obj *mtk_gem;
- unsigned int pitch, format;
-@@ -199,8 +197,8 @@
- if (!crtc || WARN_ON(!fb))
- return;
-
-- if (!new_state->visible) {
-- mtk_plane_atomic_disable(plane, state);
-+ if (!plane->state->visible) {
-+ mtk_plane_atomic_disable(plane, old_state);
- return;
- }
-
-@@ -210,20 +208,20 @@
- pitch = fb->pitches[0];
- format = fb->format->format;
-
-- addr += (new_state->src.x1 >> 16) * fb->format->cpp[0];
-- addr += (new_state->src.y1 >> 16) * pitch;
-+ addr += (plane->state->src.x1 >> 16) * fb->format->cpp[0];
-+ addr += (plane->state->src.y1 >> 16) * pitch;
-
-- mtk_plane_state->pending.enable = true;
-- mtk_plane_state->pending.pitch = pitch;
-- mtk_plane_state->pending.format = format;
-- mtk_plane_state->pending.addr = addr;
-- mtk_plane_state->pending.x = new_state->dst.x1;
-- mtk_plane_state->pending.y = new_state->dst.y1;
-- mtk_plane_state->pending.width = drm_rect_width(&new_state->dst);
-- mtk_plane_state->pending.height = drm_rect_height(&new_state->dst);
-- mtk_plane_state->pending.rotation = new_state->rotation;
-+ state->pending.enable = true;
-+ state->pending.pitch = pitch;
-+ state->pending.format = format;
-+ state->pending.addr = addr;
-+ state->pending.x = plane->state->dst.x1;
-+ state->pending.y = plane->state->dst.y1;
-+ state->pending.width = drm_rect_width(&plane->state->dst);
-+ state->pending.height = drm_rect_height(&plane->state->dst);
-+ state->pending.rotation = plane->state->rotation;
- wmb(); /* Make sure the above parameters are set before update */
-- mtk_plane_state->pending.dirty = true;
-+ state->pending.dirty = true;
- }
-
- static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {