From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org
Cc: kernel-list@raspberrypi.com, laurent.pinchart@ideasonboard.com,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
Dave Stevenson <dave.stevenson@raspberrypi.org>,
Jacopo Mondi <jacopo@jmondi.org>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH 02/50] staging: mmal-vchiq: Allocate and free components as required
Date: Tue, 23 Jun 2020 18:41:48 +0200 [thread overview]
Message-ID: <20200623164235.29566-3-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200623164235.29566-1-nsaenzjulienne@suse.de>
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
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>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
.../vc04_services/vchiq-mmal/mmal-vchiq.c | 29 ++++++++++++-------
.../vc04_services/vchiq-mmal/mmal-vchiq.h | 1 +
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index daf21087f8f9..cbe262b111fe 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -32,8 +32,11 @@
#define USE_VCHIQ_ARM
#include "interface/vchi/vchi.h"
-/* 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*/
@@ -168,8 +171,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 */
@@ -1626,18 +1627,24 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
{
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",
@@ -1688,8 +1695,6 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
goto release_component;
}
- instance->component_idx++;
-
*component_out = component;
mutex_unlock(&instance->vchiq_mutex);
@@ -1699,6 +1704,8 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
release_component:
destroy_component(instance, component);
unlock:
+ if (component)
+ component->in_use = 0;
mutex_unlock(&instance->vchiq_mutex);
return ret;
@@ -1721,6 +1728,8 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
ret = destroy_component(instance, component);
+ component->in_use = 0;
+
mutex_unlock(&instance->vchiq_mutex);
return ret;
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
index 47897e81ec58..4e34728d87e5 100644
--- 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;
u32 enabled:1;
u32 handle; /* VideoCore handle for component */
u32 inputs; /* Number of input ports */
--
2.27.0
next prev parent reply other threads:[~2020-06-23 16:45 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 16:41 [PATCH 00/50] staging: vchiq: Getting rid of the vchi/vchiq split Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 01/50] staging: bcm2835: Break MMAL support out from camera Nicolas Saenz Julienne
2020-06-23 19:20 ` kernel test robot
2020-06-23 16:41 ` Nicolas Saenz Julienne [this message]
2020-06-23 16:41 ` [PATCH 03/50] staging: mmal-vchiq: Avoid use of bool in structures Nicolas Saenz Julienne
2020-06-23 22:11 ` Joe Perches
2020-06-24 10:26 ` Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 04/50] staging: mmal-vchiq: Make timeout a defined parameter Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 05/50] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 06/50] staging: mmal-vchiq: Fixup vchiq-mmal include ordering Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 07/50] staging: mmal-vchiq: Fix client_component for 64 bit kernel Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 08/50] staging: mmal-vchiq: Always return the param size from param_get Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 09/50] staging: mmal-vchiq: If the VPU returns an error, don't negate it Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 10/50] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 11/50] staging: vchiq_arm: Add a matching unregister call Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 12/50] staging: vchi: Get rid of all useless callback reasons Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 13/50] staging: vchi: Get rid of vchi_msg_peek() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 14/50] staging: vchi: Get rid of struct vchi_instance_handle Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 15/50] staging: vchi: Unify struct shim_service and struct vchi_service_handle Nicolas Saenz Julienne
2020-06-24 14:11 ` Dan Carpenter
2020-06-24 14:13 ` Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 16/50] staging: vc04_services: bcm2835-audio: Use vchi_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 17/50] staging: vchi: Get rid of vchi_msg_dequeue() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 18/50] staging: vchi_common: Get rid of all unused definitions Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 19/50] staging: vchi: Get rid of unnecessary defines Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 20/50] staging: vc04_services: Get rid of vchi_cfg.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 21/50] staging: vchi: Get rid of flags argument in vchi_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 22/50] staging: vchi: Use enum vchiq_bulk_mode instead of vchi's transmission flags Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 23/50] staging: vchi: Use vchiq's enum vchiq_reason Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 24/50] staging: vchi: Get rid of effect less expression Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 25/50] staging: vchiq: Introduce vchiq_validate_params() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 26/50] staging: vchiq: Move message queue into struct vchiq_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 27/50] staging: vchiq: Get rid of vchiq_util.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 28/50] staging: vchi: Expose struct vchi_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 29/50] staging: vchiq: Export vchiq_get_service_userdata() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 30/50] staging: vchiq: Export vchiq_msg_queue_push Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 31/50] staging: vchi: Get rid of vchiq_shim's message callback Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 32/50] staging: vchiq: Don't use a typedef for vchiq_callback Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 33/50] staging: vchi: Use struct vchiq_service_params Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 34/50] staging: vchi: Get rid of struct vchi_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 35/50] staging: vchiq: Pass vchiq's message when holding a message Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 36/50] staging: vchi: Rework vchi_msg_hold() to match vchiq_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 37/50] staging: vchiq: Unify fourcc definition mechanisms Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 38/50] staging: vchi: Get rid of struct vchiq_instance forward declaration Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 39/50] staging: vchi: Don't include vchiq_core.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 40/50] staging: vchiq: Get rid of unnecessary definitions in vchiq_if.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 41/50] staging: vchiq: Make vchiq_add_service() local Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 42/50] staging: vchiq: Move definitions only used by core into core header Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 43/50] staging: vchi: Get rid of vchi_bulk_queue_receive() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 44/50] staging: vchi: Get rid of vchi_bulk_queue_transmit() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 45/50] staging: vchi: Move vchi_queue_kernel_message() into vchiq Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 46/50] staging: vchiq: Get rid of vchi Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 47/50] staging: vchiq: Move conditional barrier definition into vchiq_core.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 48/50] staging: vchiq: Use vchiq.h as the main header file for services Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 49/50] staging: vchiq: Move defines into core header Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 50/50] staging: vchiq: Move vchiq.h into include directory Nicolas Saenz Julienne
2020-06-25 8:24 ` Nicolas Saenz Julienne
2020-06-25 14:34 ` [PATCH 00/50] staging: vchiq: Getting rid of the vchi/vchiq split Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623164235.29566-3-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=dave.stevenson@raspberrypi.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jacopo@jmondi.org \
--cc=kernel-list@raspberrypi.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).