kernel: bump 5.19 to 5.19.3 (#9983)

Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>

Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
aakkll 2022-08-22 18:40:03 +08:00 committed by GitHub
parent a5133362ed
commit a36ce8009b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 17 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.19 = .2 LINUX_VERSION-5.19 = .3
LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721

View File

@ -15,8 +15,8 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -196,6 +196,10 @@ @@ -200,6 +200,10 @@
}; status = "okay";
}; };
+&hdmi_sound { +&hdmi_sound {
@ -26,14 +26,14 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
&i2c0 { &i2c0 {
status = "okay"; status = "okay";
@@ -436,6 +440,10 @@ @@ -441,6 +445,10 @@
};
}; };
+&i2s0_8ch { &i2s0_8ch {
+ status = "okay"; + status = "okay";
+}; +};
+ +
&i2s1_8ch { +&i2s0_8ch {
rockchip,trcm-sync-tx-only;
status = "okay"; status = "okay";
};

View File

@ -0,0 +1,33 @@
From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001
From: Brian Norris <briannorris@chromium.org>
Date: Fri, 17 Jun 2022 17:26:52 -0700
Subject: [PATCH 39/51] drm/rockchip: vop: Don't crash for invalid
duplicate_state()
It's possible for users to try to duplicate the CRTC state even when the
state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other
users of __drm_atomic_helper_crtc_duplicate_state()) already guard this
with a WARN_ON() instead of crashing, so let's do that here too.
Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1573,6 +1573,9 @@ static struct drm_crtc_state *vop_crtc_d
if (WARN_ON(!crtc->state))
return NULL;
+ if (WARN_ON(!crtc->state))
+ return NULL;
+
rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL);
if (!rockchip_state)
return NULL;

View File

@ -110,7 +110,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
status = "okay"; status = "okay";
}; };
@@ -313,6 +358,7 @@ @@ -317,6 +362,7 @@
vdda0v9_image: LDO_REG1 { vdda0v9_image: LDO_REG1 {
regulator-name = "vdda0v9_image"; regulator-name = "vdda0v9_image";
@ -118,7 +118,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>; regulator-max-microvolt = <900000>;
@@ -349,6 +395,7 @@ @@ -353,6 +399,7 @@
vccio_acodec: LDO_REG4 { vccio_acodec: LDO_REG4 {
regulator-name = "vccio_acodec"; regulator-name = "vccio_acodec";
regulator-always-on; regulator-always-on;
@ -126,7 +126,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -407,6 +454,7 @@ @@ -411,6 +458,7 @@
vcca1v8_image: LDO_REG9 { vcca1v8_image: LDO_REG9 {
regulator-name = "vcca1v8_image"; regulator-name = "vcca1v8_image";
@ -134,7 +134,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -427,6 +475,7 @@ @@ -431,6 +479,7 @@
vcc3v3_sd: SWITCH_REG2 { vcc3v3_sd: SWITCH_REG2 {
regulator-name = "vcc3v3_sd"; regulator-name = "vcc3v3_sd";
@ -142,7 +142,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
regulator-state-mem { regulator-state-mem {
regulator-off-in-suspend; regulator-off-in-suspend;
@@ -453,14 +502,30 @@ @@ -461,14 +510,30 @@
rgmii_phy1: ethernet-phy@0 { rgmii_phy1: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>; reg = <0x0>;
@ -178,7 +178,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
&pinctrl { &pinctrl {
ethernet { ethernet {
eth_phy_rst: eth_phy_rst { eth_phy_rst: eth_phy_rst {
@@ -555,7 +620,7 @@ @@ -563,7 +628,7 @@
}; };
&usb_host0_xhci { &usb_host0_xhci {
@ -187,7 +187,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
status = "okay"; status = "okay";
}; };
@@ -581,7 +646,7 @@ @@ -589,7 +654,7 @@
}; };
&usb2phy0_otg { &usb2phy0_otg {
@ -196,7 +196,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
status = "okay"; status = "okay";
}; };
@@ -590,12 +655,10 @@ @@ -598,12 +663,10 @@
}; };
&usb2phy1_host { &usb2phy1_host {