From 9155569b4e3a2c3c453e30145037a851c2db0d2a Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Oct 15 2022 21:15:33 +0000 Subject: Update to 5.4.218 --- diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 600b1a8..1674999 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd SOURCES/linux-5.4.tar.xz -d098546cce110434e14e61840613e613ab83f9f6 SOURCES/f95b607c72f9f6d4ea27140635f1e55078ef6f74.tar.gz -cf83e306f80880c9cad081e996eea51e8ec25531 SOURCES/patch-5.4.209.xz +3eb231be42d1b671573d4054c3927b84d18aa793 SOURCES/bfbd42ef2c93eb4c4b688759a9c879423b479448.tar.gz +000c09e6f5877736257b310ae92c413674c5f912 SOURCES/patch-5.4.218.xz diff --git a/SOURCES/rpi-5.4.x.patch b/SOURCES/rpi-5.4.x.patch index 358ec99..e1b2f76 100644 --- a/SOURCES/rpi-5.4.x.patch +++ b/SOURCES/rpi-5.4.x.patch @@ -1855,10 +1855,10 @@ Signed-off-by: Eric Anholt 1 file changed, 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index f08ce248af2a..e5c25efa7339 100644 +index c30a8bac5c13..6a36a0b33907 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -8521,8 +8521,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, +@@ -8566,8 +8566,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { @@ -3533,7 +3533,7 @@ index 38f8b3e31762..64e41961ffb1 100644 return i; } diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 4cf0dc7f330d..2a0f8e649f7f 100644 +index 50c7df59f7e8..390df70cb90f 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5382,7 +5382,7 @@ static void port_event(struct usb_hub *hub, int port1) @@ -300357,10 +300357,10 @@ Subject: [PATCH 0089/1217] ARM64: Force hardware emulation of deprecated 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c -index bcb14d11232f..bfa3a069cbf1 100644 +index fbf66e0973aa..f9657593354d 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c -@@ -182,10 +182,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops) +@@ -183,10 +183,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops) switch (ops->status) { case INSN_DEPRECATED: @@ -301242,10 +301242,10 @@ Signed-off-by: Phil Elwell 1 file changed, 38 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 23f0db2900e4..e146b16eb6a9 100644 +index d14575c0e464..70ee034fa42e 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5797,6 +5797,9 @@ int __init cgroup_init_early(void) +@@ -5860,6 +5860,9 @@ int __init cgroup_init_early(void) return 0; } @@ -301255,7 +301255,7 @@ index 23f0db2900e4..e146b16eb6a9 100644 /** * cgroup_init - cgroup initialization * -@@ -5835,6 +5838,12 @@ int __init cgroup_init(void) +@@ -5898,6 +5901,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -301268,7 +301268,7 @@ index 23f0db2900e4..e146b16eb6a9 100644 for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6244,6 +6253,10 @@ static int __init cgroup_disable(char *str) +@@ -6307,6 +6316,10 @@ static int __init cgroup_disable(char *str) strcmp(token, ss->legacy_name)) continue; @@ -301279,7 +301279,7 @@ index 23f0db2900e4..e146b16eb6a9 100644 static_branch_disable(cgroup_subsys_enabled_key[i]); pr_info("Disabling %s control group subsystem\n", ss->name); -@@ -6253,6 +6266,31 @@ static int __init cgroup_disable(char *str) +@@ -6316,6 +6329,31 @@ static int __init cgroup_disable(char *str) } __setup("cgroup_disable=", cgroup_disable); @@ -308759,7 +308759,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS -index f45d6548a4aa..8ab15df83285 100644 +index 973fcc9143d1..35ebd1661f1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,13 @@ N: bcm2711 @@ -324271,10 +324271,10 @@ Signed-off-by: Jonathan Bell 4 files changed, 34 insertions(+) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index fde211519a97..1aaed1815106 100644 +index d58098c2af10..61f1d1defbba 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1962,6 +1962,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, +@@ -1965,6 +1965,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, return ret; } @@ -324318,10 +324318,10 @@ index a6ee5a74b4a1..190ece841c95 100644 * usb_disable_endpoint -- Disable an endpoint by address * @dev: the device whose endpoint is being disabled diff --git a/include/linux/usb.h b/include/linux/usb.h -index e656e7b4b1e4..3ac4b26b12ff 100644 +index 703c7464d895..4df151626672 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -1816,6 +1816,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe); +@@ -1818,6 +1818,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe); extern int usb_reset_configuration(struct usb_device *dev); extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); @@ -324331,10 +324331,10 @@ index e656e7b4b1e4..3ac4b26b12ff 100644 /* this request isn't really synchronous, but it belongs with the others */ extern int usb_driver_set_configuration(struct usb_device *udev, int config); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index c0eb85b2981e..362f71a47007 100644 +index a400e86f6218..ff446eefb42d 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -384,6 +384,11 @@ struct hc_driver { +@@ -385,6 +385,11 @@ struct hc_driver { * or bandwidth constraints. */ void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); @@ -324346,7 +324346,7 @@ index c0eb85b2981e..362f71a47007 100644 /* Returns the hardware-chosen device address */ int (*address_device)(struct usb_hcd *, struct usb_device *udev); /* prepares the hardware to send commands to the device */ -@@ -445,6 +450,8 @@ extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *); +@@ -446,6 +451,8 @@ extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_flush_endpoint(struct usb_device *udev, struct usb_host_endpoint *ep); @@ -324375,10 +324375,10 @@ Signed-off-by: Jonathan Bell 1 file changed, 98 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 9fe35bb67731..f1aa600f0ace 100644 +index 5ce16a259e61..3902f72632e3 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1493,6 +1493,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, +@@ -1484,6 +1484,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, return ret; } @@ -324482,7 +324482,7 @@ index 9fe35bb67731..f1aa600f0ace 100644 /* * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it -@@ -5395,6 +5492,7 @@ static const struct hc_driver xhci_hc_driver = { +@@ -5386,6 +5483,7 @@ static const struct hc_driver xhci_hc_driver = { .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, @@ -328509,10 +328509,10 @@ Signed-off-by: Chris G Miller 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c -index 0983949cc8c9..a27a5b34ea93 100644 +index e249ab378700..1438485e2f39 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c -@@ -1485,9 +1485,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1483,9 +1483,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) /* DSI1 has a broken AXI slave that doesn't respond to writes * from the ARM. It does handle writes from the DMA engine, * so set up a channel for talking to it. @@ -328525,7 +328525,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 &dsi->reg_dma_paddr, GFP_KERNEL); if (!dsi->reg_dma_mem) { -@@ -1506,6 +1508,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1504,6 +1506,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) return ret; } @@ -328534,7 +328534,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 /* Get the physical address of the device's registers. The * struct resource for the regs gives us the bus address * instead. -@@ -1532,7 +1536,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1530,7 +1534,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) if (ret) { if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get interrupt: %d\n", ret); @@ -328543,7 +328543,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } dsi->escape_clock = devm_clk_get(dev, "escape"); -@@ -1540,7 +1544,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1538,7 +1542,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) ret = PTR_ERR(dsi->escape_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get escape clock: %d\n", ret); @@ -328552,7 +328552,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } dsi->pll_phy_clock = devm_clk_get(dev, "phy"); -@@ -1548,7 +1552,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1546,7 +1550,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) ret = PTR_ERR(dsi->pll_phy_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get phy clock: %d\n", ret); @@ -328561,7 +328561,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } dsi->pixel_clock = devm_clk_get(dev, "pixel"); -@@ -1556,7 +1560,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1554,7 +1558,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) ret = PTR_ERR(dsi->pixel_clock); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get pixel clock: %d\n", ret); @@ -328570,7 +328570,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, -@@ -1571,26 +1575,28 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1569,26 +1573,28 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) if (ret == -ENODEV) return 0; @@ -328604,7 +328604,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 if (dsi->port == 1) vc4->dsi1 = dsi; -@@ -1602,7 +1608,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1600,7 +1606,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL); if (ret) { dev_err(dev, "bridge attach failed: %d\n", ret); @@ -328613,7 +328613,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } /* Disable the atomic helper calls into the bridge. We * manually call the bridge pre_enable / enable / etc. calls -@@ -1619,6 +1625,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) +@@ -1617,6 +1623,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data) pm_runtime_enable(dev); return 0; @@ -328625,7 +328625,7 @@ index 0983949cc8c9..a27a5b34ea93 100644 } static void vc4_dsi_unbind(struct device *dev, struct device *master, -@@ -1633,6 +1644,8 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master, +@@ -1631,6 +1642,8 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master, vc4_dsi_encoder_destroy(dsi->encoder); @@ -328933,7 +328933,7 @@ index 6cedae902adf..bc761428f4b5 100644 /* diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index a9031f494984..5c6f90cdcf09 100644 +index 0dc448630197..bb2ce3f6d84e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1880,6 +1880,7 @@ struct xhci_hcd { @@ -334306,7 +334306,7 @@ index ef23a69c6553..0f27303debaf 100644 "// Write ERST size = %i to ir_set 0 (some bits preserved)", val); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 5c6f90cdcf09..bc8cb6b4f549 100644 +index bb2ce3f6d84e..942505172ef2 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1656,8 +1656,8 @@ struct urb_priv { @@ -337041,10 +337041,10 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 7093e3b03b9f..802a9b9f61fe 100644 +index c26d5ce1d676..16f343338534 100644 --- a/Makefile +++ b/Makefile -@@ -1269,6 +1269,9 @@ ifneq ($(dtstree),) +@@ -1272,6 +1272,9 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -337353,10 +337353,10 @@ Signed-off-by: Dave Stevenson 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 363f456ea713..5ea6c84d7f6d 100644 +index cdcd19698b3c..b170421a426f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -585,6 +585,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) +@@ -581,6 +581,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) return 0; } @@ -337410,7 +337410,7 @@ index 363f456ea713..5ea6c84d7f6d 100644 /* Writes out a full display list for an active plane to the plane's * private dlist state. */ -@@ -864,9 +911,20 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -860,9 +907,20 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Colorspace conversion words */ if (vc4_state->is_yuv) { @@ -337434,7 +337434,7 @@ index 363f456ea713..5ea6c84d7f6d 100644 } vc4_state->lbm_offset = 0; -@@ -1275,5 +1333,13 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1271,5 +1329,13 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); @@ -337495,10 +337495,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 5ea6c84d7f6d..68aa6db8ea05 100644 +index b170421a426f..b2cb5436c3c4 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -645,6 +645,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -641,6 +641,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier); int num_planes = fb->format->num_planes; @@ -337506,7 +337506,7 @@ index 5ea6c84d7f6d..68aa6db8ea05 100644 u32 h_subsample = fb->format->hsub; u32 v_subsample = fb->format->vsub; bool mix_plane_alpha; -@@ -662,6 +663,24 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -658,6 +659,24 @@ static int vc4_plane_mode_set(struct drm_plane *plane, if (ret) return ret; @@ -337531,7 +337531,7 @@ index 5ea6c84d7f6d..68aa6db8ea05 100644 /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs -@@ -676,15 +695,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -672,15 +691,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, scl1 = vc4_get_scl_field(state, 0); } @@ -337556,7 +337556,7 @@ index 5ea6c84d7f6d..68aa6db8ea05 100644 switch (base_format_mod) { case DRM_FORMAT_MOD_LINEAR: -@@ -744,7 +763,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -740,7 +759,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, * definitely required (I guess it's also related to the "going * backward" situation). */ @@ -337565,7 +337565,7 @@ index 5ea6c84d7f6d..68aa6db8ea05 100644 y_off = tile_h_mask - y_off; pitch0 = SCALER_PITCH0_TILE_LINE_DIR; } else { -@@ -842,7 +861,9 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -838,7 +857,9 @@ static int vc4_plane_mode_set(struct drm_plane *plane, VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | @@ -337576,7 +337576,7 @@ index 5ea6c84d7f6d..68aa6db8ea05 100644 /* Position Word 0: Image Positions and Alpha Value */ vc4_state->pos0_offset = vc4_state->dlist_count; -@@ -1341,5 +1362,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1337,5 +1358,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE); @@ -340488,7 +340488,7 @@ Signed-off-by: popcornmix 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index 1654fd0eedc9..e4e139240340 100644 +index a790a8ca02ff..816709b048fb 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -70,7 +70,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag, @@ -340515,7 +340515,7 @@ Signed-off-by: popcornmix 1 file changed, 412 insertions(+), 89 deletions(-) diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index e4e139240340..8daf26df5430 100644 +index 816709b048fb..8daf26df5430 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -15,33 +15,103 @@ @@ -340673,7 +340673,7 @@ index e4e139240340..8daf26df5430 100644 + clock_id, &val); if (ret) -- return ret; +- return 0; - - return val * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; + dev_err_ratelimited(rpi->dev, "Failed to get %s frequency: %d", @@ -341706,10 +341706,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 68aa6db8ea05..5ea6c84d7f6d 100644 +index b2cb5436c3c4..b170421a426f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -645,7 +645,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -641,7 +641,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, const struct hvs_format *format = vc4_get_hvs_format(fb->format->format); u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier); int num_planes = fb->format->num_planes; @@ -341717,7 +341717,7 @@ index 68aa6db8ea05..5ea6c84d7f6d 100644 u32 h_subsample = fb->format->hsub; u32 v_subsample = fb->format->vsub; bool mix_plane_alpha; -@@ -663,24 +662,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -659,24 +658,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, if (ret) return ret; @@ -341742,7 +341742,7 @@ index 68aa6db8ea05..5ea6c84d7f6d 100644 /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs -@@ -695,15 +676,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -691,15 +672,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane, scl1 = vc4_get_scl_field(state, 0); } @@ -341767,7 +341767,7 @@ index 68aa6db8ea05..5ea6c84d7f6d 100644 switch (base_format_mod) { case DRM_FORMAT_MOD_LINEAR: -@@ -763,7 +744,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -759,7 +740,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, * definitely required (I guess it's also related to the "going * backward" situation). */ @@ -341776,7 +341776,7 @@ index 68aa6db8ea05..5ea6c84d7f6d 100644 y_off = tile_h_mask - y_off; pitch0 = SCALER_PITCH0_TILE_LINE_DIR; } else { -@@ -861,9 +842,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -857,9 +838,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane, VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) | (vc4_state->is_unity ? SCALER_CTL0_UNITY : 0) | VC4_SET_FIELD(scl0, SCALER_CTL0_SCL0) | @@ -341787,7 +341787,7 @@ index 68aa6db8ea05..5ea6c84d7f6d 100644 /* Position Word 0: Image Positions and Alpha Value */ vc4_state->pos0_offset = vc4_state->dlist_count; -@@ -1362,11 +1341,5 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1358,11 +1337,5 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE); @@ -364920,7 +364920,7 @@ index 8a41b359cf90..40efc990cdce 100644 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI, quirk_sb1250_pci_dac); diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c -index ff0e2b156cb5..617a443d673d 100644 +index 6adf2fdec799..77995af3122c 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -115,8 +115,8 @@ static void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev) @@ -367995,7 +367995,7 @@ index 000000000000..32d6b693274f + +... diff --git a/MAINTAINERS b/MAINTAINERS -index 8ab15df83285..d3558854306b 100644 +index 35ebd1661f1d..e1b40efad78d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15144,6 +15144,14 @@ S: Maintained @@ -369447,10 +369447,10 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 802a9b9f61fe..c56fa4505ecf 100644 +index 16f343338534..badbabf35225 100644 --- a/Makefile +++ b/Makefile -@@ -1269,7 +1269,7 @@ ifneq ($(dtstree),) +@@ -1272,7 +1272,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ @@ -375010,7 +375010,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 128 insertions(+), 35 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 639dc8d45e60..d1937ae04e27 100644 +index d56837c04a81..5b05a0b455cf 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -284,7 +284,8 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev) @@ -375342,10 +375342,10 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 57 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index d1937ae04e27..5b562494445d 100644 +index 5b05a0b455cf..3f51bfb48ecf 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c -@@ -1216,6 +1216,59 @@ int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh, +@@ -1248,6 +1248,59 @@ int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh, } EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_try_decoder_cmd); @@ -375444,7 +375444,7 @@ Signed-off-by: Mauro Carvalho Chehab 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 5b562494445d..553bdf41cabf 100644 +index 3f51bfb48ecf..350d84b0dec4 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -319,8 +319,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, @@ -376687,7 +376687,7 @@ Signed-off-by: Mauro Carvalho Chehab 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index 553bdf41cabf..ab27935e1742 100644 +index 350d84b0dec4..4cd0d1c07e1e 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, @@ -377410,7 +377410,7 @@ Signed-off-by: John Cox 3 files changed, 149 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index ab27935e1742..71fe1a140bef 100644 +index 4cd0d1c07e1e..991a63ff14c1 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -399,15 +399,18 @@ static void v4l2_m2m_cancel_job(struct v4l2_m2m_ctx *m2m_ctx) @@ -377563,7 +377563,7 @@ index ab27935e1742..71fe1a140bef 100644 } schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx); unlock: -@@ -981,12 +1072,14 @@ struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev, +@@ -1013,12 +1104,14 @@ struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev, m2m_ctx->priv = drv_priv; m2m_ctx->m2m_dev = m2m_dev; init_waitqueue_head(&m2m_ctx->finished); @@ -377769,7 +377769,7 @@ index 000000000000..ce6b81a10303 + +... diff --git a/MAINTAINERS b/MAINTAINERS -index d3558854306b..a624c2a2e1e7 100644 +index e1b40efad78d..149213dce3e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,13 @@ N: bcm2711 @@ -383244,7 +383244,7 @@ index 0380609b177a..000000000000 -}; - diff --git a/MAINTAINERS b/MAINTAINERS -index a624c2a2e1e7..d834f4fdd7fd 100644 +index 149213dce3e0..66ace263a899 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3349,7 +3349,7 @@ L: linux-i2c@vger.kernel.org @@ -386109,7 +386109,7 @@ index 000000000000..d900cc57b4ec + +... diff --git a/MAINTAINERS b/MAINTAINERS -index d834f4fdd7fd..afc2428a0a88 100644 +index 66ace263a899..ad44922b24fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5574,7 +5574,7 @@ T: git git://github.com/anholt/linux @@ -386437,10 +386437,10 @@ index 1b921e114c03..b82136138370 100644 drm_mode_config_reset(dev); diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 5ea6c84d7f6d..12080775a770 100644 +index b170421a426f..a2bf3ee65ada 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -500,6 +500,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) +@@ -496,6 +496,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) struct vc4_plane_state *vc4_state; struct drm_crtc_state *crtc_state; unsigned int vscale_factor; @@ -386578,7 +386578,7 @@ index 9936b15d0bf1..650d4d9a5980 100644 /* Upload filter kernels. We only have the one for now, so we * keep it around for the lifetime of the driver. diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 12080775a770..770f4112b3f9 100644 +index a2bf3ee65ada..8c7edbdbbe53 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -32,45 +32,60 @@ static const struct hvs_format { @@ -386652,7 +386652,7 @@ index 12080775a770..770f4112b3f9 100644 .pixel_order = HVS_PIXEL_ORDER_XBGR, }, { -@@ -836,35 +851,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -832,35 +847,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane, return -EINVAL; } @@ -386688,7 +386688,7 @@ index 12080775a770..770f4112b3f9 100644 /* Don't waste cycles mixing with plane alpha if the set alpha * is opaque or there is no per-pixel alpha information. * In any case we use the alpha property value as the fixed alpha. -@@ -872,20 +858,120 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -868,20 +854,120 @@ static int vc4_plane_mode_set(struct drm_plane *plane, mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE && fb->format->has_alpha; @@ -386822,7 +386822,7 @@ index 12080775a770..770f4112b3f9 100644 /* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers -@@ -1276,6 +1362,10 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, +@@ -1272,6 +1358,10 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, default: return false; } @@ -386987,7 +386987,7 @@ Signed-off-by: Maxime Ripard 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 770f4112b3f9..694779cfafe0 100644 +index 8c7edbdbbe53..c6fba25b83f0 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -142,9 +142,10 @@ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format) @@ -387003,7 +387003,7 @@ index 770f4112b3f9..694779cfafe0 100644 return VC4_SCALING_NONE; if (3 * dst >= 2 * src) return VC4_SCALING_PPF; -@@ -377,9 +378,11 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) +@@ -373,9 +374,11 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) return ret; vc4_state->x_scaling[0] = vc4_get_scaling_mode(vc4_state->src_w[0], @@ -387017,7 +387017,7 @@ index 770f4112b3f9..694779cfafe0 100644 vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE && vc4_state->y_scaling[0] == VC4_SCALING_NONE); -@@ -392,10 +395,12 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) +@@ -388,10 +391,12 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) vc4_state->x_scaling[1] = vc4_get_scaling_mode(vc4_state->src_w[1], @@ -387032,7 +387032,7 @@ index 770f4112b3f9..694779cfafe0 100644 /* YUV conversion requires that horizontal scaling be enabled * on the UV plane even if vc4_get_scaling_mode() returned -@@ -445,10 +450,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst) +@@ -441,10 +446,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst) static u32 vc4_lbm_size(struct drm_plane_state *state) { struct vc4_plane_state *vc4_state = to_vc4_plane_state(state); @@ -387044,7 +387044,7 @@ index 770f4112b3f9..694779cfafe0 100644 u32 lbm; /* LBM is not needed when there's no vertical scaling. */ -@@ -456,6 +458,11 @@ static u32 vc4_lbm_size(struct drm_plane_state *state) +@@ -452,6 +454,11 @@ static u32 vc4_lbm_size(struct drm_plane_state *state) vc4_state->y_scaling[1] == VC4_SCALING_NONE) return 0; @@ -387056,7 +387056,7 @@ index 770f4112b3f9..694779cfafe0 100644 if (!vc4_state->is_yuv) { if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ) lbm = pix_per_line * 8; -@@ -591,7 +598,9 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) +@@ -587,7 +594,9 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state) spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags); ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm, &vc4_state->lbm, @@ -387157,10 +387157,10 @@ index 70f2457bdab0..4898384b6188 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 694779cfafe0..0fa3df7d6d59 100644 +index c6fba25b83f0..02d5f97ef039 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1447,3 +1447,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1443,3 +1443,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return plane; } @@ -387349,10 +387349,10 @@ index 4898384b6188..6a9b873f8195 100644 u32 vc4_plane_dlist_size(const struct drm_plane_state *state); void vc4_plane_async_set_fb(struct drm_plane *plane, diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 0fa3df7d6d59..9e4f663c7d2b 100644 +index 02d5f97ef039..155ce7429b64 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1448,39 +1448,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1444,39 +1444,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return plane; } @@ -387448,10 +387448,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 9e4f663c7d2b..1a972505c369 100644 +index 155ce7429b64..f605a7d8141f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1454,26 +1454,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) +@@ -1450,26 +1450,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) struct drm_crtc *crtc; unsigned int i; @@ -387522,10 +387522,10 @@ Signed-off-by: Maxime Ripard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 1a972505c369..54bdbeb46390 100644 +index f605a7d8141f..8cc22af84b29 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1463,7 +1463,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) +@@ -1459,7 +1459,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) * modest number of planes to expose, that should hopefully * still cover any sane usecase. */ @@ -395796,7 +395796,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 59 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 54bdbeb46390..f355ed9c3874 100644 +index 8cc22af84b29..c5eb12ee41af 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -33,6 +33,7 @@ static const struct hvs_format { @@ -395820,7 +395820,7 @@ index 54bdbeb46390..f355ed9c3874 100644 }; static const struct hvs_format *vc4_get_hvs_format(u32 drm_format) -@@ -809,27 +816,33 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -805,27 +812,33 @@ static int vc4_plane_mode_set(struct drm_plane *plane, uint32_t param = fourcc_mod_broadcom_param(fb->modifier); u32 tile_w, tile, x_off, pix_per_tile; @@ -395872,7 +395872,7 @@ index 54bdbeb46390..f355ed9c3874 100644 return -EINVAL; } -@@ -839,6 +852,13 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -835,6 +848,13 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Adjust the base pointer to the first pixel to be scanned * out. @@ -395886,7 +395886,7 @@ index 54bdbeb46390..f355ed9c3874 100644 */ for (i = 0; i < num_planes; i++) { vc4_state->offsets[i] += param * tile_w * tile; -@@ -951,8 +971,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -947,8 +967,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, vc4_dlist_write(vc4_state, VC4_SET_FIELD(state->alpha >> 4, SCALER5_CTL2_ALPHA) | @@ -395897,7 +395897,7 @@ index 54bdbeb46390..f355ed9c3874 100644 (mix_plane_alpha ? SCALER5_CTL2_ALPHA_MIX : 0) | VC4_SET_FIELD(fb->format->has_alpha ? -@@ -1000,7 +1020,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, +@@ -996,7 +1016,8 @@ static int vc4_plane_mode_set(struct drm_plane *plane, /* Pitch word 1/2 */ for (i = 1; i < num_planes; i++) { @@ -395907,7 +395907,7 @@ index 54bdbeb46390..f355ed9c3874 100644 vc4_dlist_write(vc4_state, VC4_SET_FIELD(fb->pitches[i], SCALER_SRC_PITCH)); -@@ -1371,6 +1392,13 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, +@@ -1367,6 +1388,13 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, default: return false; } @@ -395921,7 +395921,7 @@ index 54bdbeb46390..f355ed9c3874 100644 case DRM_FORMAT_RGBX1010102: case DRM_FORMAT_BGRX1010102: case DRM_FORMAT_RGBA1010102: -@@ -1403,8 +1431,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1399,8 +1427,11 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, struct drm_plane *plane = NULL; struct vc4_plane *vc4_plane; u32 formats[ARRAY_SIZE(hvs_formats)]; @@ -395933,7 +395933,7 @@ index 54bdbeb46390..f355ed9c3874 100644 static const uint64_t modifiers[] = { DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, DRM_FORMAT_MOD_BROADCOM_SAND128, -@@ -1419,13 +1450,17 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1415,13 +1446,17 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, if (!vc4_plane) return ERR_PTR(-ENOMEM); @@ -395974,10 +395974,10 @@ Signed-off-by: Dave Stevenson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index f355ed9c3874..3732b24a2a8a 100644 +index c5eb12ee41af..f52141e379cf 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -1451,7 +1451,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, +@@ -1447,7 +1447,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, return ERR_PTR(-ENOMEM); for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) { @@ -400439,7 +400439,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index afc2428a0a88..b6bb8f0e44db 100644 +index ad44922b24fb..d0cbef2e70b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3206,7 +3206,7 @@ F: Documentation/devicetree/bindings/media/rpivid_hevc.jaml @@ -409921,7 +409921,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h diff --git a/MAINTAINERS b/MAINTAINERS -index b6bb8f0e44db..f816a2ad3096 100644 +index d0cbef2e70b9..fd06fd66595a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3212,6 +3212,15 @@ S: Maintained @@ -417229,7 +417229,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/i2c/imx477.c diff --git a/MAINTAINERS b/MAINTAINERS -index f816a2ad3096..ba31ff549185 100644 +index fd06fd66595a..9e8b188808d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15197,6 +15197,14 @@ T: git git://linuxtv.org/media_tree.git @@ -419781,7 +419781,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maar 1 file changed, 16 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index c6e9b7bd7618..9702a50d0d07 100644 +index 80ccdf96093f..fe23dbac6fa7 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -96,26 +96,10 @@ static void release_udmabuf(struct dma_buf *buf) @@ -419833,7 +419833,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 9702a50d0d07..5afd913d0360 100644 +index fe23dbac6fa7..024d18fe057a 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -97,10 +97,11 @@ static void release_udmabuf(struct dma_buf *buf) @@ -419876,7 +419876,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 5afd913d0360..648646285171 100644 +index 024d18fe057a..cf7656ac4429 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes */ @@ -419947,7 +419947,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 648646285171..735e6a116241 100644 +index cf7656ac4429..8e2f991a4b8c 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -50,10 +50,10 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) @@ -420028,7 +420028,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 39 insertions(+) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 735e6a116241..10a7f650fa2d 100644 +index 8e2f991a4b8c..79806da4f808 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes */ @@ -420140,7 +420140,7 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c -index 10a7f650fa2d..da4f089aeedc 100644 +index 79806da4f808..e25b93649aac 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -125,9 +125,8 @@ static int begin_cpu_udmabuf(struct dma_buf *buf, @@ -420223,7 +420223,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-2-john. create mode 100644 include/uapi/linux/dma-heap.h diff --git a/MAINTAINERS b/MAINTAINERS -index ba31ff549185..701a5772a22f 100644 +index 9e8b188808d0..97600368354f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4963,6 +4963,24 @@ F: include/linux/*fence.h @@ -436694,7 +436694,7 @@ Reported-by: kbuild test robot create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index 701a5772a22f..67ab6062fcd6 100644 +index 97600368354f..148660a07f31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3210,7 +3210,7 @@ M: Raspberry Pi Kernel Maintenance @@ -440598,7 +440598,7 @@ index 000000000000..a3cc21410f7c + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS -index 67ab6062fcd6..1e66773ee39c 100644 +index 148660a07f31..5817db5ecc30 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15201,6 +15201,14 @@ S: Maintained @@ -480847,7 +480847,7 @@ index bc761428f4b5..a52d4469da0c 100644 state->new_deq_ptr = new_deq; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index bc8cb6b4f549..c45460570551 100644 +index 942505172ef2..db4c34e10fad 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1884,6 +1884,7 @@ struct xhci_hcd { diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 3cd79c4..c711b95 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,4 +1,4 @@ -%global commit_firmware_long f95b607c72f9f6d4ea27140635f1e55078ef6f74 +%global commit_firmware_long bfbd42ef2c93eb4c4b688759a9c879423b479448 %global commit_linux_long ec0dcf3064b8ba99f226438214407fcea9870f76 ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.4 -%define kfullversion %{kversion}.209 +%define kfullversion %{kversion}.218 Name: raspberrypi2 Version: %{kfullversion} @@ -285,6 +285,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Sat Oct 15 2022 Pablo Greco - 5.4.218 +- Update to version v5.4.218 + * Sun Aug 7 2022 Pablo Greco - 5.4.209 - Update to version v5.4.209