summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm64-96boards-Rock960-CE-board-support.patch139
-rw-r--r--bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch40
-rw-r--r--configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE1
-rw-r--r--gitrev2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec24
-rw-r--r--sources1
10 files changed, 208 insertions, 7 deletions
diff --git a/arm64-96boards-Rock960-CE-board-support.patch b/arm64-96boards-Rock960-CE-board-support.patch
index ee1fef5ec..1d08debaa 100644
--- a/arm64-96boards-Rock960-CE-board-support.patch
+++ b/arm64-96boards-Rock960-CE-board-support.patch
@@ -1657,3 +1657,142 @@ index 5a5d8e28ef55..f68254831ad9 100644
disable-wp;
sd-uhs-sdr104;
vqmmc-supply = <&vcc_sd>;
+From patchwork Tue Oct 16 14:00:20 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Daniel Lezcano <daniel.lezcano@linaro.org>
+X-Patchwork-Id: 1000432
+Return-Path: <SRS0=e/xi=M4=vger.kernel.org=linux-kernel-owner@kernel.org>
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+ by smtp.lore.kernel.org (Postfix) with ESMTP id 41BB8C04EBD
+ for <linux-kernel@archiver.kernel.org>; Tue, 16 Oct 2018 14:01:24 +0000 (UTC)
+Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
+ by mail.kernel.org (Postfix) with ESMTP id 032862089E
+ for <linux-kernel@archiver.kernel.org>; Tue, 16 Oct 2018 14:01:24 +0000 (UTC)
+Authentication-Results: mail.kernel.org;
+ dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org
+ header.b="OwrJnI6D"
+DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 032862089E
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=linaro.org
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S1727241AbeJPVv6 (ORCPT
+ <rfc822;linux-kernel@archiver.kernel.org>);
+ Tue, 16 Oct 2018 17:51:58 -0400
+Received: from mail-wr1-f68.google.com ([209.85.221.68]:43800 "EHLO
+ mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S1727149AbeJPVv6 (ORCPT
+ <rfc822;linux-kernel@vger.kernel.org>);
+ Tue, 16 Oct 2018 17:51:58 -0400
+Received: by mail-wr1-f68.google.com with SMTP id n1-v6so25672615wrt.10
+ for <linux-kernel@vger.kernel.org>;
+ Tue, 16 Oct 2018 07:01:21 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=linaro.org; s=google;
+ h=from:to:cc:subject:date:message-id;
+ bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=;
+ b=OwrJnI6D/huHRM5jiagiGiKBxUHFUlMvwe1t2GexoIKOTqtFGY3vwPCkrAUWdnT5+f
+ n+wvqEq+enR14QpmLTY3VNYAsxMcDtJOZ2R2Cw0rRdiHypMeUGRanfszUimV9omTlSGH
+ ApMgMERT+Pim+X1tp/uH775sDaVLHsJDyJb2Y=
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;
+ bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=;
+ b=DO/kT4iXCQgCsPC53FV7CMKKHaDQNQtZUIfHfJGQ2iRgCRNsZSYU6JYHxxjsqWSLyq
+ c46PNGLDG4qPZf/tveVt9wc9SPdKTk3klyT5NnQvdlNY8uv5/GTXINOWmNE0xD9hqvaP
+ ml6yJRUA51/KJU73p7XhGvWlMmEuStLUtXa4rlqKgush6lllYhSFpca2xkiKFhqcd+Bc
+ HHXRh2i0OVgTdmdb0+lSKyLXm74UHrhv1WEbgjGm+Mharwz/qsidTCXfqKPC7izgstBS
+ L+mjOACqna60eEsABW/p2nH9vxXAsU2ArAnmB714yeh9uckl1uRzYmMQCSD1LmmBN0q4
+ 4UvQ==
+X-Gm-Message-State: ABuFfojBZLkXjdlBc4AIjobar5Yk+68lR2+TEpPVGjsScLNzcmIj5eYO
+ yyEhPWYj3vc1MHjUcMfQLt7ahg==
+X-Google-Smtp-Source:
+ ACcGV614RNSZy+OjIvsEaE9ONlZaDAeI1a8EpD+wP5Gt58g75Bh8DJgL6KJJ2ZjTenoZPwHLydiQBg==
+X-Received: by 2002:adf:cd0c:: with SMTP id
+ w12-v6mr19534363wrm.67.1539698480294;
+ Tue, 16 Oct 2018 07:01:20 -0700 (PDT)
+Received: from localhost.localdomain (221.56.88.92.rev.sfr.net.
+ [92.88.56.221])
+ by smtp.gmail.com with ESMTPSA id
+ b81-v6sm10195012wmh.47.2018.10.16.07.01.18
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+ Tue, 16 Oct 2018 07:01:19 -0700 (PDT)
+From: Daniel Lezcano <daniel.lezcano@linaro.org>
+To: heiko@sntech.de
+Cc: linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
+ Mark Rutland <mark.rutland@arm.com>,
+ Vicente Bergas <vicencb@gmail.com>,
+ Shawn Lin <shawn.lin@rock-chips.com>,
+ Ezequiel Garcia <ezequiel@collabora.com>,
+ Enric Balletbo i Serra <enric.balletbo@collabora.com>,
+ Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
+ devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED
+ DEVICE TREE BINDINGS),
+ linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC
+ support),
+ linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC
+ support)
+Subject: [PATCH] DT: rockchip: Fix stability issues with the 'performance'
+ governor on rock960
+Date: Tue, 16 Oct 2018 16:00:20 +0200
+Message-Id: <1539698431-12616-1-git-send-email-daniel.lezcano@linaro.org>
+X-Mailer: git-send-email 2.7.4
+Sender: linux-kernel-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+When the performance governor is set as default, the rock960 hangs
+around one minute after booting, whatever the activity is (idle, key
+pressed, loaded, ...).
+
+Based on the commit log found at https://patchwork.kernel.org/patch/10092377/
+
+"vdd_log has no consumer and therefore will not be set to a specific
+voltage. Still the PWM output pin gets configured and thence the vdd_log
+output voltage will changed from it's default. Depending on the idle
+state of the PWM this will slightly over or undervoltage the logic supply
+of the RK3399 and cause instability with GbE (undervoltage) and PCIe
+(overvoltage). Since the default value set by a voltage divider is the
+correct supply voltage and we don't need to change it during runtime we
+remove the rail from the devicetree completely so the PWM pin will not
+be configured."
+
+After removing the vdd-log from the rock960's specific DT, the board
+does no longer hang and shows a stable behavior.
+
+Apply the same change for the rock960 by removing the vdd-log from the
+DT.
+
+Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+---
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+index 6c8c4ab..56abbb0 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+@@ -57,18 +57,6 @@
+ regulator-always-on;
+ vin-supply = <&vcc_sys>;
+ };
+-
+- vdd_log: vdd-log {
+- compatible = "pwm-regulator";
+- pwms = <&pwm2 0 25000 0>;
+- regulator-name = "vdd_log";
+- regulator-min-microvolt = <800000>;
+- regulator-max-microvolt = <1400000>;
+- regulator-always-on;
+- regulator-boot-on;
+- vin-supply = <&vcc_sys>;
+- };
+-
+ };
+
+ &cpu_l0 {
diff --git a/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch b/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
new file mode 100644
index 000000000..5aa9668bc
--- /dev/null
+++ b/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
@@ -0,0 +1,40 @@
+From patchwork Tue Oct 9 13:24:46 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: drm/vc4: Set ->is_yuv to false when num_planes == 1
+From: Boris Brezillon <boris.brezillon@bootlin.com>
+X-Patchwork-Id: 255528
+Message-Id: <20181009132446.21960-1-boris.brezillon@bootlin.com>
+To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
+ dri-devel@lists.freedesktop.org, Eric Anholt <eric@anholt.net>
+Cc: Boris Brezillon <boris.brezillon@bootlin.com>, stable@vger.kernel.org
+Date: Tue, 9 Oct 2018 15:24:46 +0200
+
+When vc4_plane_state is duplicated ->is_yuv is left assigned to its
+previous value, and we never set it back to false when switching to
+a non-YUV format.
+
+Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch
+of the vc4_plane_setup_clipping_and_scaling() function.
+
+Fixes: fc04023fafecf ("drm/vc4: Add support for YUV planes.")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
+index d04b3c3246ba..60d5ad19cedd 100644
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -321,6 +321,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
+ if (vc4_state->is_unity)
+ vc4_state->x_scaling[0] = VC4_SCALING_PPF;
+ } else {
++ vc4_state->is_yuv = false;
+ vc4_state->x_scaling[1] = VC4_SCALING_NONE;
+ vc4_state->y_scaling[1] = VC4_SCALING_NONE;
+ }
diff --git a/configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE b/configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE
new file mode 100644
index 000000000..db4143366
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE
@@ -0,0 +1 @@
+CONFIG_PINCTRL_CANNONLAKE=m
diff --git a/gitrev b/gitrev
index 114d236be..3c5571163 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-6b3944e42e2e554aa5a4be681ecd70dccd459114
+91b15613ce7fb3e724ca0d433eef8e6bf15322af
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 39a60e217..e92945cfb 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4282,7 +4282,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_AXP209 is not set
CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_DENVERTON=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 92b5bbfab..2c9bd6f53 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4259,7 +4259,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_AXP209 is not set
CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_DENVERTON=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a9ebce6c3..01facd8a7 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4325,7 +4325,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_AXP209 is not set
CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_DENVERTON=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 688acceb6..479a3b905 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4302,7 +4302,7 @@ CONFIG_PINCTRL_AMD=m
# CONFIG_PINCTRL_AXP209 is not set
CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_BROXTON=m
-# CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CANNONLAKE=m
CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_DENVERTON=m
diff --git a/kernel.spec b/kernel.spec
index 85613fde4..ea6bb239c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 8
# The git snapshot level
-%define gitrev 0
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Kernel headers are being split out into a separate package
%if 0%{fedora}
@@ -612,6 +612,8 @@ Patch310: gpio-pxa-handle-corner-case-of-unprobed-device.patch
Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
+
# Patches enabling device specific brcm firmware nvram
# https://www.spinics.net/lists/linux-wireless/msg178827.html
Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch
@@ -1905,6 +1907,24 @@ fi
#
#
%changelog
+* Fri Oct 19 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git4.1
+- Linux v4.19-rc8-95-g91b15613ce7f
+- Enable pinctrl-cannonlake (rhbz 1641057)
+
+* Thu Oct 18 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git3.1
+- Linux v4.19-rc8-27-gfa520c47eaa1
+
+* Wed Oct 17 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git2.1
+- Linux v4.19-rc8-16-gc343db455eb3
+
+* Tue Oct 16 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes to Rock960 series of devices, improves stability considerably
+- Raspberry Pi graphics fix
+
+* Tue Oct 16 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git1.1
+- Linux v4.19-rc8-11-gb955a910d7fd
+- Re-enable debugging options.
+
* Mon Oct 15 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git0.1
- Linux v4.19-rc8
diff --git a/sources b/sources
index ea17cfd9c..506b507ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
SHA512 (patch-4.19-rc8.xz) = b32fa273bb2076034352176b6e026424e24716815f7dcbd39256feeb3e2867501ac0dd7ba6ef62d94b295880694a99fff84047f69e828bbd09ec9fba092bd856
+SHA512 (patch-4.19-rc8-git4.xz) = eedd548475e79a8f385f4f0e9e66a9710416de01b0dc4bc3866866266640c07004ec09114e36a9df552b472a1115b874847a0a4611ead14f43aa49fdec5ee417
generated by cgit (git 2.34.1) at 2024-06-15 03:36:08 +0000