Skip to content
Snippets Groups Projects
Commit cd6f2a98 authored by Milan P. Stanić's avatar Milan P. Stanić
Browse files

testing/linux-elm: upgrade to 5.12.5

remove revert-mtk-dpi.patch, fixed upstream
parent 488db733
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@ _flavor=elm
pkgname=linux-${_flavor}
# NOTE: this kernel is intended for testing
# please resist urge to upgrade it blindly
pkgver=5.12.1
pkgver=5.12.5
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
......@@ -34,7 +34,6 @@ esac
fix-mmc1-speed.patch
fix-spi-nor-max-frequency.patch
fix-mmc-order.patch
revert-mtk-dpi.patch
"
arch="aarch64"
......@@ -234,11 +233,12 @@ _dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
sha512sums="be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d linux-5.12.tar.xz
82499f14e1d559ed060478109720ac33b14a58be55f1e155f87902ed9df7c723cd05e001034c5f89b9716c396fc154e1176b55e83b22c15b043e8fec63e6814b patch-5.12.1.xz
23d7d01a89fe30befffa9b13df703d9d24858f9888922c823ba483d35eb66d540c3f7485916429088295c6605f1628b44b1f10f58380ad028f7efdbfdc19d6c8 config-elm.aarch64
sha512sums="
be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d linux-5.12.tar.xz
9cbbce4a912188aa52ffb0f5b978b9835f56eb89ad18f22d44b434161d190e1466fa81e3f88b2444d351fdb81a15dbc7860b05a6703b3de14a9f6f2968992611 patch-5.12.5.xz
5ff604b532d55465ad3067915d2aa658228f3cc27f5be50d7891ff8212d4cfa09d610d15f43a0a957cb7cd0a9a1b6a4fd3a6eeae9325d9ab0770156f4a16a1eb config-elm.aarch64
112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775 kernel.its.elm
65c57a6d9a5bd5b6ec8798d1c46091bb72377ed1349b66e9a0a1a50ffa077f044f2bfdd30eab974c9c9774fc62d8dd5020a38432d108fce7f4fc1ed6648ea703 fix-mmc1-speed.patch
9e17fb96b81590da0f9b0917ddd2b9d195bab5cde2a4e7feb19991c50a8ac8e4502445715153ced8666e5b6575137c1d49899bb0ae9ab4505ed8f1ff7e569269 fix-spi-nor-max-frequency.patch
00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835 fix-mmc-order.patch
ad3454af8b7b383d37b7815ac36a20fad2889bf2ac88bac924f194fc08a441d542df067b283d2c871afaf17f323fbe6d87fa119c31196d90f5063ba3891e4899 revert-mtk-dpi.patch"
"
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.12.1 Kernel Configuration
# Linux/arm64 5.12.5 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
CONFIG_CC_IS_GCC=y
......@@ -4830,7 +4830,6 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
# CONFIG_AD7923 is not set
# CONFIG_AD7949 is not set
# CONFIG_AD799X is not set
# CONFIG_AD9467 is not set
# CONFIG_ADI_AXI_ADC is not set
# CONFIG_CC10001_ADC is not set
# CONFIG_ENVELOPE_DETECTOR is not set
......
revert mainline f011951489678a9c679489136f5df064a86c84dd commit
with this commit display is blank on elm, so reverting it fixed problem
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c 2021-05-04 00:29:31.993513316 +0000
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c 2021-05-04 00:29:52.470179343 +0000
@@ -20,7 +20,6 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
-#include <drm/drm_bridge_connector.h>
#include <drm/drm_crtc.h>
#include <drm/drm_of.h>
#include <drm/drm_simple_kms_helper.h>
@@ -67,7 +66,6 @@
struct drm_encoder encoder;
struct drm_bridge bridge;
struct drm_bridge *next_bridge;
- struct drm_connector *connector;
void __iomem *regs;
struct device *dev;
struct clk *engine_clk;
@@ -593,21 +591,12 @@
dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev);
- ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
- DRM_BRIDGE_ATTACH_NO_CONNECTOR);
+ ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, 0);
if (ret) {
dev_err(dev, "Failed to attach bridge: %d\n", ret);
goto err_cleanup;
}
- dpi->connector = drm_bridge_connector_init(drm_dev, &dpi->encoder);
- if (IS_ERR(dpi->connector)) {
- dev_err(dev, "Unable to create bridge connector\n");
- ret = PTR_ERR(dpi->connector);
- goto err_cleanup;
- }
- drm_connector_attach_encoder(dpi->connector, &dpi->encoder);
-
dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS;
dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB;
dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment