kernel: bump 5.15 to 5.15.155

[openwrt/staging/blocktrron.git] / target / linux / bcm27xx / patches-5.15 / 950-0299-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0299-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch b/target/linux/bcm27xx/patches-5.15/950-0299-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
index 6a58041e9403dcac7b9a49d1a79104c41c754710..5404ce60eaa9a10ef87c4b5f8fb13717428a7194 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0299-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0299-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
@@ -91,7 +91,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
        } else if (msg->u.buffer_from_host.buffer_header.length == 0) {
                /* empty buffer */
                if (msg->u.buffer_from_host.buffer_header.flags &
-@@ -1530,6 +1553,9 @@ int vchiq_mmal_port_parameter_set(struct
+@@ -1531,6 +1554,9 @@ int vchiq_mmal_port_parameter_set(struct
  
        mutex_unlock(&instance->vchiq_mutex);
  
@@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
        return ret;
  }
  EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set);
-@@ -1698,6 +1724,31 @@ int vchiq_mmal_submit_buffer(struct vchi
+@@ -1699,6 +1725,31 @@ int vchiq_mmal_submit_buffer(struct vchi
        unsigned long flags = 0;
        int ret;
  
@@ -133,7 +133,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
        ret = buffer_from_host(instance, port, buffer);
        if (ret == -EINVAL) {
                /* Port is disabled. Queue for when it is enabled. */
-@@ -1731,6 +1782,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
+@@ -1732,6 +1783,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
                release_msg_context(msg_context);
        buf->msg_context = NULL;