kernel: drm/vc4: Fix potential null pointer read when disabling vblank

See: raspberrypi/linux#6151 kernel: defconfigs: Add ILI9881 to rpi and bcm2709 defconfigs See: raspberrypi/linux#6025 kernel: configs: Enable BCACHEFS as a module See: raspberrypi/linux#6149 kernel: gpios: Adapt to the upstream persist_gpio_outputs change See: raspberrypi/linux#6150 kernel: dts: bcm2712: Drop snd_bcm2835 bootargs references from Pi5 See: raspberrypi/linux#6153 kernel: overlays: Add sc16is750-spi0
raspberrypi · May 9, 2024 · 8e3a9ee · 8e3a9ee
1 parent 6bb9965
commit 8e3a9ee
Show file tree

Hide file tree

Showing 61 changed files with 50 additions and 6 deletions.
diff --git a/bcm2708-rpi-b-plus.dtb b/bcm2708-rpi-b-plus.dtb
diff --git a/bcm2708-rpi-b-rev1.dtb b/bcm2708-rpi-b-rev1.dtb
diff --git a/bcm2708-rpi-b.dtb b/bcm2708-rpi-b.dtb
diff --git a/bcm2708-rpi-cm.dtb b/bcm2708-rpi-cm.dtb
diff --git a/bcm2708-rpi-zero-w.dtb b/bcm2708-rpi-zero-w.dtb
diff --git a/bcm2708-rpi-zero.dtb b/bcm2708-rpi-zero.dtb
diff --git a/bcm2709-rpi-2-b.dtb b/bcm2709-rpi-2-b.dtb
diff --git a/bcm2709-rpi-cm2.dtb b/bcm2709-rpi-cm2.dtb
diff --git a/bcm2710-rpi-2-b.dtb b/bcm2710-rpi-2-b.dtb
diff --git a/bcm2710-rpi-3-b-plus.dtb b/bcm2710-rpi-3-b-plus.dtb
diff --git a/bcm2710-rpi-3-b.dtb b/bcm2710-rpi-3-b.dtb
diff --git a/bcm2710-rpi-cm3.dtb b/bcm2710-rpi-cm3.dtb
diff --git a/bcm2710-rpi-zero-2-w.dtb b/bcm2710-rpi-zero-2-w.dtb
diff --git a/bcm2710-rpi-zero-2.dtb b/bcm2710-rpi-zero-2.dtb
diff --git a/bcm2711-rpi-4-b.dtb b/bcm2711-rpi-4-b.dtb
diff --git a/bcm2711-rpi-400.dtb b/bcm2711-rpi-400.dtb
diff --git a/bcm2711-rpi-cm4.dtb b/bcm2711-rpi-cm4.dtb
diff --git a/bcm2711-rpi-cm4s.dtb b/bcm2711-rpi-cm4s.dtb
diff --git a/bcm2712-rpi-5-b.dtb b/bcm2712-rpi-5-b.dtb
diff --git a/bcm2712-rpi-cm5-cm4io.dtb b/bcm2712-rpi-cm5-cm4io.dtb
diff --git a/bcm2712-rpi-cm5-cm5io.dtb b/bcm2712-rpi-cm5-cm5io.dtb
diff --git a/bcm2712d0-rpi-5-b.dtb b/bcm2712d0-rpi-5-b.dtb
diff --git a/git_hash b/git_hash
@@ -1 +1 @@
-ee713e438df8e09e01e4f7598382d3703db5d4c4
+e0c78d59082aaadb95fc301af239c991686a1822
diff --git a/kernel.img b/kernel.img
diff --git a/kernel7.img b/kernel7.img
diff --git a/kernel7l.img b/kernel7l.img
diff --git a/kernel8.img b/kernel8.img
diff --git a/kernel_2712.img b/kernel_2712.img
diff --git a/modules/6.6.30+/kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz b/modules/6.6.30+/kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz
diff --git a/modules/6.6.30+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz b/modules/6.6.30+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz
diff --git a/modules/6.6.30+/kernel/kernel/configs.ko.xz b/modules/6.6.30+/kernel/kernel/configs.ko.xz
diff --git a/modules/6.6.30+/modules.alias b/modules/6.6.30+/modules.alias
@@ -854,6 +854,22 @@ alias of:N*T*Ctxw,txw397017s2 panel_ilitek_ili9806e
 alias spi:hyperpixel4 panel_ilitek_ili9806e
 alias spi:ili9806e panel_ilitek_ili9806e
 alias spi:txw397017s2 panel_ilitek_ili9806e
+alias of:N*T*Craspberrypi,dsi-7inchC* panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-7inch panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-5inchC* panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-5inch panel_ilitek_ili9881c
+alias of:N*T*Ccrystalfontz,cfaf7201280a0_050txC* panel_ilitek_ili9881c
+alias of:N*T*Ccrystalfontz,cfaf7201280a0_050tx panel_ilitek_ili9881c
+alias of:N*T*Cwanchanglong,w552946abaC* panel_ilitek_ili9881c
+alias of:N*T*Cwanchanglong,w552946aba panel_ilitek_ili9881c
+alias of:N*T*Ctdo,tl050hdv35C* panel_ilitek_ili9881c
+alias of:N*T*Ctdo,tl050hdv35 panel_ilitek_ili9881c
+alias of:N*T*Cnwe,nwe080C* panel_ilitek_ili9881c
+alias of:N*T*Cnwe,nwe080 panel_ilitek_ili9881c
+alias of:N*T*Cfeixin,k101-im2byl02C* panel_ilitek_ili9881c
+alias of:N*T*Cfeixin,k101-im2byl02 panel_ilitek_ili9881c
+alias of:N*T*Cbananapi,lhr050h41C* panel_ilitek_ili9881c
+alias of:N*T*Cbananapi,lhr050h41 panel_ilitek_ili9881c
 alias of:N*T*Cjdi,lt070me05000C* panel_jdi_lt070me05000
 alias of:N*T*Cjdi,lt070me05000 panel_jdi_lt070me05000
 alias of:N*T*Craspberrypi,7inch-touchscreen-panelC* panel_raspberrypi_touchscreen

diff --git a/modules/6.6.30+/modules.alias.bin b/modules/6.6.30+/modules.alias.bin
diff --git a/modules/6.6.30+/modules.builtin.modinfo b/modules/6.6.30+/modules.builtin.modinfo
diff --git a/modules/6.6.30+/modules.dep b/modules/6.6.30+/modules.dep
@@ -195,6 +195,7 @@ kernel/drivers/char/raspberrypi-gpiomem.ko.xz:
 kernel/drivers/gpu/drm/display/drm_display_helper.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-simple.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-ilitek-ili9806e.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
+kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-jdi-lt070me05000.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-sitronix-st7701.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz

diff --git a/modules/6.6.30+/modules.dep.bin b/modules/6.6.30+/modules.dep.bin
diff --git a/modules/6.6.30+/modules.order b/modules/6.6.30+/modules.order
@@ -195,6 +195,7 @@ kernel/drivers/char/raspberrypi-gpiomem.ko
 kernel/drivers/gpu/drm/display/drm_display_helper.ko
 kernel/drivers/gpu/drm/panel/panel-simple.ko
 kernel/drivers/gpu/drm/panel/panel-ilitek-ili9806e.ko
+kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko
 kernel/drivers/gpu/drm/panel/panel-jdi-lt070me05000.ko
 kernel/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.ko
 kernel/drivers/gpu/drm/panel/panel-sitronix-st7701.ko

diff --git a/modules/6.6.30+/modules.symbols.bin b/modules/6.6.30+/modules.symbols.bin
diff --git a/modules/6.6.30-v7+/kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz b/modules/6.6.30-v7+/kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz
diff --git a/modules/6.6.30-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz b/modules/6.6.30-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz
diff --git a/modules/6.6.30-v7+/kernel/kernel/configs.ko.xz b/modules/6.6.30-v7+/kernel/kernel/configs.ko.xz
diff --git a/modules/6.6.30-v7+/modules.alias b/modules/6.6.30-v7+/modules.alias
@@ -864,6 +864,22 @@ alias of:N*T*Ctxw,txw397017s2 panel_ilitek_ili9806e
 alias spi:hyperpixel4 panel_ilitek_ili9806e
 alias spi:ili9806e panel_ilitek_ili9806e
 alias spi:txw397017s2 panel_ilitek_ili9806e
+alias of:N*T*Craspberrypi,dsi-7inchC* panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-7inch panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-5inchC* panel_ilitek_ili9881c
+alias of:N*T*Craspberrypi,dsi-5inch panel_ilitek_ili9881c
+alias of:N*T*Ccrystalfontz,cfaf7201280a0_050txC* panel_ilitek_ili9881c
+alias of:N*T*Ccrystalfontz,cfaf7201280a0_050tx panel_ilitek_ili9881c
+alias of:N*T*Cwanchanglong,w552946abaC* panel_ilitek_ili9881c
+alias of:N*T*Cwanchanglong,w552946aba panel_ilitek_ili9881c
+alias of:N*T*Ctdo,tl050hdv35C* panel_ilitek_ili9881c
+alias of:N*T*Ctdo,tl050hdv35 panel_ilitek_ili9881c
+alias of:N*T*Cnwe,nwe080C* panel_ilitek_ili9881c
+alias of:N*T*Cnwe,nwe080 panel_ilitek_ili9881c
+alias of:N*T*Cfeixin,k101-im2byl02C* panel_ilitek_ili9881c
+alias of:N*T*Cfeixin,k101-im2byl02 panel_ilitek_ili9881c
+alias of:N*T*Cbananapi,lhr050h41C* panel_ilitek_ili9881c
+alias of:N*T*Cbananapi,lhr050h41 panel_ilitek_ili9881c
 alias of:N*T*Cjdi,lt070me05000C* panel_jdi_lt070me05000
 alias of:N*T*Cjdi,lt070me05000 panel_jdi_lt070me05000
 alias of:N*T*Craspberrypi,7inch-touchscreen-panelC* panel_raspberrypi_touchscreen

diff --git a/modules/6.6.30-v7+/modules.alias.bin b/modules/6.6.30-v7+/modules.alias.bin
diff --git a/modules/6.6.30-v7+/modules.builtin.modinfo b/modules/6.6.30-v7+/modules.builtin.modinfo
diff --git a/modules/6.6.30-v7+/modules.dep b/modules/6.6.30-v7+/modules.dep
@@ -195,6 +195,7 @@ kernel/drivers/char/raspberrypi-gpiomem.ko.xz:
 kernel/drivers/gpu/drm/display/drm_display_helper.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-simple.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-ilitek-ili9806e.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
+kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-jdi-lt070me05000.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz
 kernel/drivers/gpu/drm/panel/panel-sitronix-st7701.ko.xz: kernel/drivers/gpu/drm/drm.ko.xz kernel/drivers/gpu/drm/drm_panel_orientation_quirks.ko.xz kernel/drivers/video/backlight/backlight.ko.xz

diff --git a/modules/6.6.30-v7+/modules.dep.bin b/modules/6.6.30-v7+/modules.dep.bin
diff --git a/modules/6.6.30-v7+/modules.order b/modules/6.6.30-v7+/modules.order
@@ -195,6 +195,7 @@ kernel/drivers/char/raspberrypi-gpiomem.ko
 kernel/drivers/gpu/drm/display/drm_display_helper.ko
 kernel/drivers/gpu/drm/panel/panel-simple.ko
 kernel/drivers/gpu/drm/panel/panel-ilitek-ili9806e.ko
+kernel/drivers/gpu/drm/panel/panel-ilitek-ili9881c.ko
 kernel/drivers/gpu/drm/panel/panel-jdi-lt070me05000.ko
 kernel/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.ko
 kernel/drivers/gpu/drm/panel/panel-sitronix-st7701.ko

diff --git a/modules/6.6.30-v7+/modules.symbols.bin b/modules/6.6.30-v7+/modules.symbols.bin
diff --git a/modules/6.6.30-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz b/modules/6.6.30-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz
diff --git a/modules/6.6.30-v7l+/modules.builtin.modinfo b/modules/6.6.30-v7l+/modules.builtin.modinfo
diff --git a/modules/6.6.30-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz b/modules/6.6.30-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz
diff --git a/modules/6.6.30-v8+/modules.builtin.modinfo b/modules/6.6.30-v8+/modules.builtin.modinfo
diff --git a/modules/6.6.30-v8-16k+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz b/modules/6.6.30-v8-16k+/kernel/drivers/gpu/drm/vc4/vc4.ko.xz
diff --git a/modules/6.6.30-v8-16k+/modules.builtin.modinfo b/modules/6.6.30-v8-16k+/modules.builtin.modinfo
diff --git a/overlays/README b/overlays/README
@@ -4128,6 +4128,14 @@ Params: int_pin                 GPIO used for IRQ (default 24)
         xtal                    On-board crystal frequency (default 14745600)
 
 
+Name:   sc16is750-spi0
+Info:   Overlay for the NXP SC16IS750 UART with SPI Interface
+        Enables the chip on SPI0.
+Load:   dtoverlay=sc16is750-spi0,<param>=<val>
+Params: int_pin                 GPIO used for IRQ (default 24)
+        xtal                    On-board crystal frequency (default 14745600)
+
+
 Name:   sc16is752-i2c
 Info:   Overlay for the NXP SC16IS752 dual UART with I2C Interface
         Enables the chip on I2C1 at 0x48 (or the "addr" parameter value). To

diff --git a/overlays/sc16is750-spi0.dtbo b/overlays/sc16is750-spi0.dtbo
diff --git a/uname_string b/uname_string
@@ -1 +1 @@
-Linux version 6.6.30+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1761 Thu May  2 16:49:26 BST 2024
+Linux version 6.6.30+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1762 Thu May  9 15:14:42 BST 2024
diff --git a/uname_string7 b/uname_string7
@@ -1 +1 @@
-Linux version 6.6.30-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1761 SMP Thu May  2 16:51:08 BST 2024
+Linux version 6.6.30-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1762 SMP Thu May  9 15:15:51 BST 2024
diff --git a/uname_string7l b/uname_string7l
@@ -1 +1 @@
-Linux version 6.6.30-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1761 SMP Thu May  2 16:52:53 BST 2024
+Linux version 6.6.30-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1762 SMP Thu May  9 15:16:49 BST 2024
diff --git a/uname_string8 b/uname_string8
@@ -1 +1 @@
-Linux version 6.6.30-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1761 SMP PREEMPT Thu May  2 16:54:52 BST 2024
+Linux version 6.6.30-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1762 SMP PREEMPT Thu May  9 15:17:51 BST 2024
diff --git a/uname_string_2712 b/uname_string_2712
@@ -1 +1 @@
-Linux version 6.6.30-v8-16k+ (dom@buildbot) (aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1761 SMP PREEMPT Thu May  2 16:57:02 BST 2024
+Linux version 6.6.30-v8-16k+ (dom@buildbot) (aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #1762 SMP PREEMPT Thu May  9 15:18:59 BST 2024