mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Link: https://lore.kernel.org/r/20200623164235.29566-3-nsaenzjulienne@suse.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b18ee53ad2
commit
8c589e1794
2 changed files with 20 additions and 10 deletions
|
@ -32,8 +32,11 @@
|
||||||
#define USE_VCHIQ_ARM
|
#define USE_VCHIQ_ARM
|
||||||
#include "interface/vchi/vchi.h"
|
#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*/
|
/*#define FULL_MSG_DUMP 1*/
|
||||||
|
|
||||||
|
@ -168,8 +171,6 @@ struct vchiq_mmal_instance {
|
||||||
/* protect accesses to context_map */
|
/* protect accesses to context_map */
|
||||||
struct mutex context_map_lock;
|
struct mutex context_map_lock;
|
||||||
|
|
||||||
/* component to use next */
|
|
||||||
int component_idx;
|
|
||||||
struct vchiq_mmal_component component[VCHIQ_MMAL_MAX_COMPONENTS];
|
struct vchiq_mmal_component component[VCHIQ_MMAL_MAX_COMPONENTS];
|
||||||
|
|
||||||
/* ordered workqueue to process all bulk operations */
|
/* ordered workqueue to process all bulk operations */
|
||||||
|
@ -1626,18 +1627,24 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
int idx; /* port index */
|
int idx; /* port index */
|
||||||
struct vchiq_mmal_component *component;
|
struct vchiq_mmal_component *component = NULL;
|
||||||
|
|
||||||
if (mutex_lock_interruptible(&instance->vchiq_mutex))
|
if (mutex_lock_interruptible(&instance->vchiq_mutex))
|
||||||
return -EINTR;
|
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? */
|
ret = -EINVAL; /* todo is this correct error? */
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
component = &instance->component[instance->component_idx];
|
|
||||||
|
|
||||||
ret = create_component(instance, component, name);
|
ret = create_component(instance, component, name);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("%s: failed to create component %d (Not enough GPU mem?)\n",
|
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;
|
goto release_component;
|
||||||
}
|
}
|
||||||
|
|
||||||
instance->component_idx++;
|
|
||||||
|
|
||||||
*component_out = component;
|
*component_out = component;
|
||||||
|
|
||||||
mutex_unlock(&instance->vchiq_mutex);
|
mutex_unlock(&instance->vchiq_mutex);
|
||||||
|
@ -1699,6 +1704,8 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
|
||||||
release_component:
|
release_component:
|
||||||
destroy_component(instance, component);
|
destroy_component(instance, component);
|
||||||
unlock:
|
unlock:
|
||||||
|
if (component)
|
||||||
|
component->in_use = 0;
|
||||||
mutex_unlock(&instance->vchiq_mutex);
|
mutex_unlock(&instance->vchiq_mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1721,6 +1728,8 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
|
||||||
|
|
||||||
ret = destroy_component(instance, component);
|
ret = destroy_component(instance, component);
|
||||||
|
|
||||||
|
component->in_use = 0;
|
||||||
|
|
||||||
mutex_unlock(&instance->vchiq_mutex);
|
mutex_unlock(&instance->vchiq_mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -82,6 +82,7 @@ struct vchiq_mmal_port {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct vchiq_mmal_component {
|
struct vchiq_mmal_component {
|
||||||
|
u32 in_use:1;
|
||||||
u32 enabled:1;
|
u32 enabled:1;
|
||||||
u32 handle; /* VideoCore handle for component */
|
u32 handle; /* VideoCore handle for component */
|
||||||
u32 inputs; /* Number of input ports */
|
u32 inputs; /* Number of input ports */
|
||||||
|
|
Loading…
Reference in a new issue