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

Commit 670390c2 authored by Andrey Utkin's avatar Andrey Utkin Committed by Mauro Carvalho Chehab
Browse files

[media] solo6x10: bind start & stop of encoded frames processing thread to device (de)init 



Before, it was called from individual encoder (de)init procedures, which
lead to spare threads running (which were actually lost, leaked).
The current fix uses trivial approach, and the downside is that the
processing thread is working always, even when there's no consumer.

Signed-off-by: default avatarAndrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 0cb2df38

drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c

+4 −7
Original line number Diff line number Diff line
@@ -770,12 +770,8 @@ static void solo_ring_stop(struct solo_dev *solo_dev) 
static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)

{

	struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);

	int ret;



	ret = solo_enc_on(solo_enc);

	if (ret)

		return ret;

	return solo_ring_start(solo_enc->solo_dev);

	return solo_enc_on(solo_enc);

}



static void solo_enc_stop_streaming(struct vb2_queue *q)
@@ -794,7 +790,6 @@ static void solo_enc_stop_streaming(struct vb2_queue *q) 
		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);

	}

	spin_unlock_irqrestore(&solo_enc->av_lock, flags);

	solo_ring_stop(solo_enc->solo_dev);

}



static struct vb2_ops solo_enc_video_qops = {
@@ -1432,13 +1427,15 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr) 
		 solo_dev->v4l2_enc[0]->vfd->num,

		 solo_dev->v4l2_enc[solo_dev->nr_chans - 1]->vfd->num);



	return 0;

	return solo_ring_start(solo_dev);

}



void solo_enc_v4l2_exit(struct solo_dev *solo_dev)

{

	int i;



	solo_ring_stop(solo_dev);



	for (i = 0; i < solo_dev->nr_chans; i++)

		solo_enc_free(solo_dev->v4l2_enc[i]);