Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cddc7e9 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: allow more than four instances on CODA7541 



With the new firmware, there are not anymore four register sets,
but a single register set, which the driver has to conserve across
context switches. This allows to handle more than four instances
at the same time.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 2ad5389b

drivers/media/platform/coda.c

+10 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define CODA_NAME		"coda"



#define CODA_MAX_INSTANCES	4

#define CODADX6_MAX_INSTANCES	4



#define CODA_FMO_BUF_SIZE	32

#define CODADX6_WORK_BUF_SIZE	(288 * 1024 + CODA_FMO_BUF_SIZE * 8 * 1024)
@@ -2371,7 +2371,13 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq, 


static int coda_next_free_instance(struct coda_dev *dev)

{

	return ffz(dev->instance_mask);

	int idx = ffz(dev->instance_mask);



	if ((idx < 0) ||

	    (dev->devtype->product == CODA_DX6 && idx > CODADX6_MAX_INSTANCES))

		return -EBUSY;



	return idx;

}



static int coda_open(struct file *file)
@@ -2386,8 +2392,8 @@ static int coda_open(struct file *file) 
		return -ENOMEM;



	idx = coda_next_free_instance(dev);

	if (idx >= CODA_MAX_INSTANCES) {

		ret = -EBUSY;

	if (idx < 0) {

		ret = idx;

		goto err_coda_max;

	}

	set_bit(idx, &dev->instance_mask);