Verified Commit ccc51b36 authored by Dan Johansen's avatar Dan Johansen
Browse files

update to 5.13.12


Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent a7b53e0d
Pipeline #4491 passed with stage
in 97 minutes and 47 seconds
From abbbb268cbecbfb728aeac204091c98de5ac0b66 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Thu, 22 Apr 2021 15:29:26 +0200
Subject: [PATCH] drm/meson: fix green/pink color distortion set from uboot
Signed-off-by: Dan Johansen <strit@manjaro.org>
---
drivers/gpu/drm/meson/meson_drv.c | 4 ++++
drivers/gpu/drm/meson/meson_registers.h | 3 +++
2 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 453d8b4c5763..fb99faeac1ff 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -308,6 +308,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
drm->mode_config.funcs = &meson_mode_config_funcs;
drm->mode_config.helper_private = &meson_mode_config_helpers;
+ /* undo settings made in vendor Uboot */
+
+ writel_bits_relaxed(15 << 13, 0, priv->io_base + _REG(OSD1_HDR2_CTRL)); // fixes green/pink color distortion - reg_only_mat must be 0
+
/* Hardware Initialization */
meson_vpu_init(priv);
diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
index 446e7961da48..91351f9a3515 100644
--- a/drivers/gpu/drm/meson/meson_registers.h
+++ b/drivers/gpu/drm/meson/meson_registers.h
@@ -634,6 +634,9 @@
#define VPP_WRAP_OSD3_MATRIX_PRE_OFFSET2 0x3dbc
#define VPP_WRAP_OSD3_MATRIX_EN_CTRL 0x3dbd
+/* osd1 HDR */
+#define OSD1_HDR2_CTRL 0x38a0
+
/* osd2 scaler */
#define OSD2_VSC_PHASE_STEP 0x3d00
#define OSD2_VSC_INI_PHASE 0x3d01
--
2.31.1
......@@ -6,7 +6,7 @@ pkgbase=linux
_srcname=linux-5.13
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
pkgver=5.13.11
pkgver=5.13.12
pkgrel=1
arch=('aarch64')
url="http://www.kernel.org/"
......@@ -31,7 +31,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
'0014-drm-meson-add-YUV422-output-support.patch'
'0015-arm64-dts-meson-add-initial-Beelink-GT1-Ultimate-dev.patch'
'0016-add-ugoos-device.patch'
'0017-drm-meson-fix-green-pink-color-distortion-set-from-u.patch'
'0018-drm-bridge-dw-hdmi-disable-loading-of-DW-HDMI-CEC-sub-driver.patch' #Applied for -next
'0019-drm-panfrost-Handle-failure-in-panfrost_job_hw_submit.patch'
'0001-phy-rockchip-typec-Set-extcon-capabilities.patch'
......@@ -53,7 +52,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
'60-linux.hook'
'90-linux.hook')
md5sums=('76c60fb304510a7bbd9c838790bc5fe4'
'33b12686c6f185e49a35c45e233d558e'
'7d83ac5db385ebe63f68a7ee1774c685'
'9e6b7f44db105fef525d715213dce7cf'
'a8954ca19639be0e0e9053d23711f670'
'fa586447846ec5aef8ab972058c5548e'
......@@ -70,7 +69,6 @@ md5sums=('76c60fb304510a7bbd9c838790bc5fe4'
'469417b64e6a2bf65bd74c6d9cad2040'
'c41b101c033ac487c15298bc5a9e95cd'
'1b92d7617e60d3c525a4b18ab4351185'
'63ec4c70352a86a02e1aacf2bc8e6fc5'
'581a3ca441098d9f323fecfff0e37d79'
'a90a366662357233db7022f8a1e7ac46'
'252b4dbd2d0f560b6d254f29dd5b0f5f'
......@@ -117,7 +115,6 @@ prepare() {
patch -Np1 -i "${srcdir}/0014-drm-meson-add-YUV422-output-support.patch" #G12B
patch -Np1 -i "${srcdir}/0015-arm64-dts-meson-add-initial-Beelink-GT1-Ultimate-dev.patch" #Beelink
patch -Np1 -i "${srcdir}/0016-add-ugoos-device.patch" #Ugoos
patch -Np1 -i "${srcdir}/0017-drm-meson-fix-green-pink-color-distortion-set-from-u.patch" #AMLogic
patch -Np1 -i "${srcdir}/0018-drm-bridge-dw-hdmi-disable-loading-of-DW-HDMI-CEC-sub-driver.patch" #AMLogic
patch -Np1 -i "${srcdir}/0019-drm-panfrost-Handle-failure-in-panfrost_job_hw_submit.patch" #AMLogic
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment