brcm2708: rename target to bcm27xx

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0233-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0233-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch b/target/linux/brcm2708/patches-4.19/950-0233-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch
deleted file mode 100644 (file)
index 7e4100f..0000000
--- a/target/linux/brcm2708/patches-4.19/950-0233-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From f94642597f63c71b2ccffddd4f447190c131af56 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 24 Sep 2018 16:51:13 +0100
-Subject: [PATCH] staging: mmal-vchiq: Allocate and free components as
- required
-
-The existing code assumed that there would only ever be 4 components,
-and never freed the entries once used.
-Allow arbitrary creation and destruction of components.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 29 ++++++++++++-------
- .../vc04_services/vchiq-mmal/mmal-vchiq.h     |  1 +
- 2 files changed, 20 insertions(+), 10 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -38,8 +38,11 @@ MODULE_AUTHOR("Dave Stevenson, <dave.ste
- MODULE_LICENSE("GPL");
- MODULE_VERSION("0.0.1");
- 
--/* maximum number of components supported */
--#define VCHIQ_MMAL_MAX_COMPONENTS 4
-+/*
-+ * maximum number of components supported.
-+ * This matches the maximum permitted by default on the VPU
-+ */
-+#define VCHIQ_MMAL_MAX_COMPONENTS 64
- 
- /*#define FULL_MSG_DUMP 1*/
- 
-@@ -174,8 +177,6 @@ struct vchiq_mmal_instance {
-       /* protect accesses to context_map */
-       struct mutex context_map_lock;
- 
--      /* component to use next */
--      int component_idx;
-       struct vchiq_mmal_component component[VCHIQ_MMAL_MAX_COMPONENTS];
- 
-       /* ordered workqueue to process all bulk operations */
-@@ -1632,18 +1633,24 @@ int vchiq_mmal_component_init(struct vch
- {
-       int ret;
-       int idx;                /* port index */
--      struct vchiq_mmal_component *component;
-+      struct vchiq_mmal_component *component = NULL;
- 
-       if (mutex_lock_interruptible(&instance->vchiq_mutex))
-               return -EINTR;
- 
--      if (instance->component_idx == VCHIQ_MMAL_MAX_COMPONENTS) {
-+      for (idx = 0; idx < VCHIQ_MMAL_MAX_COMPONENTS; idx++) {
-+              if (!instance->component[idx].in_use) {
-+                      component = &instance->component[idx];
-+                      component->in_use = 1;
-+                      break;
-+              }
-+      }
-+
-+      if (!component) {
-               ret = -EINVAL;  /* todo is this correct error? */
-               goto unlock;
-       }
- 
--      component = &instance->component[instance->component_idx];
--
-       ret = create_component(instance, component, name);
-       if (ret < 0) {
-               pr_err("%s: failed to create component %d (Not enough GPU mem?)\n",
-@@ -1694,8 +1701,6 @@ int vchiq_mmal_component_init(struct vch
-                       goto release_component;
-       }
- 
--      instance->component_idx++;
--
-       *component_out = component;
- 
-       mutex_unlock(&instance->vchiq_mutex);
-@@ -1705,6 +1710,8 @@ int vchiq_mmal_component_init(struct vch
- release_component:
-       destroy_component(instance, component);
- unlock:
-+      if (component)
-+              component->in_use = 0;
-       mutex_unlock(&instance->vchiq_mutex);
- 
-       return ret;
-@@ -1727,6 +1734,8 @@ int vchiq_mmal_component_finalise(struct
- 
-       ret = destroy_component(instance, component);
- 
-+      component->in_use = 0;
-+
-       mutex_unlock(&instance->vchiq_mutex);
- 
-       return ret;
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-@@ -82,6 +82,7 @@ struct vchiq_mmal_port {
- };
- 
- struct vchiq_mmal_component {
-+      u32 in_use:1;
-       bool enabled;
-       u32 handle;  /* VideoCore handle for component */
-       u32 inputs;  /* Number of input ports */