diff options
| author | John Audia <therealgraysky@proton.me> | 2023-02-09 07:45:03 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-11 23:39:30 +0100 |
| commit | 3c0676911b4622631180782ba54d7ce157dad2cc (patch) | |
| tree | bc55a419d46c2dfd9fa2df4a875f32242b85f06a /target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch | |
| parent | b174de2c5ffee79b222f98a62c02aa1b6378ba62 (diff) | |
| download | upstream-3c0676911b4622631180782ba54d7ce157dad2cc.tar.gz upstream-3c0676911b4622631180782ba54d7ce157dad2cc.tar.bz2 upstream-3c0676911b4622631180782ba54d7ce157dad2cc.zip | |
kernel: bump 5.15 to 5.15.93
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch b/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch index bec81e3f16..25dd5b5427 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch @@ -30,7 +30,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> int ret; if (!of_find_property(dev->of_node, "interrupts", NULL)) { -@@ -2212,15 +2211,6 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -2213,15 +2212,6 @@ static int vc4_hdmi_cec_init(struct vc4_ cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); @@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> if (vc4_hdmi->variant->external_irq_controller) { ret = request_threaded_irq(platform_get_irq_byname(pdev, "cec-rx"), vc4_cec_irq_handler_rx_bare, -@@ -2283,6 +2273,29 @@ static void vc4_hdmi_cec_exit(struct vc4 +@@ -2284,6 +2274,29 @@ static void vc4_hdmi_cec_exit(struct vc4 cec_unregister_adapter(vc4_hdmi->cec_adap); } @@ -76,7 +76,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> #else static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) { -@@ -2291,6 +2304,10 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -2292,6 +2305,10 @@ static int vc4_hdmi_cec_init(struct vc4_ static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) {}; @@ -87,7 +87,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> #endif static int vc4_hdmi_build_regset(struct vc4_hdmi *vc4_hdmi, -@@ -2525,6 +2542,15 @@ static int vc4_hdmi_runtime_resume(struc +@@ -2526,6 +2543,15 @@ static int vc4_hdmi_runtime_resume(struc if (ret) return ret; |