794b16072e
This change significantly rearranges pvr2_context level initialization and operation: 1. A new kernel thread is set up for management of the context. 2. Destruction of the pvr2_context instance is moved into the kernel thread. No other context is able to remove the instance; doing this simplifies lock handling. 3. The callback into pvrusb2-main, which is used to trigger initialization of each interface, is now issued from this kernel thread. Previously it had been indirectly issued out of the work queue thread in pvr2_hdw, which led to deadlock issues if the interface needed to change a control setting (which in turn requires dispatch of another work queue entry). 4. Callbacks into the interfaces (via the pvr2_channel structure) are now issued strictly from this thread. The net result of this is that such callback functions can now also safely operate driver controls without deadlocking the work queue. (At the moment this is not actually a problem, but I'm anticipating issues with this in the future). 5. There is no longer any need for anyone to enter / exit the pvr2_context structure. Implementation of the kernel thread here allows this all to be internal now, simplifying other logic. 6. A very very longstanding issue involving a mutex deadlock between the pvrusb2 driver and v4l should now be solved. The deadlock involved the pvr2_context mutex and a globals-protecting mutex in v4l. During initialization the driver would take the pvr2_context mutex first then the v4l2 interface would register with v4l and implicitly take the v4l mutex. Later when v4l would call back into the driver, the two mutexes could possibly be taken in the opposite order, a situation that can lead to deadlock. In practice this really wasn't an issue unless a v4l app tried to start VERY early after the driver appeared. However it still needed to be solved, and with the use of the kernel thread relieving need for pvr2_context mutex, the problem should be finally solved. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
88 lines
2.6 KiB
C
88 lines
2.6 KiB
C
/*
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
#ifndef __PVRUSB2_BASE_H
|
|
#define __PVRUSB2_BASE_H
|
|
|
|
#include <linux/mutex.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
struct pvr2_hdw; /* hardware interface - defined elsewhere */
|
|
struct pvr2_stream; /* stream interface - defined elsewhere */
|
|
|
|
struct pvr2_context; /* All central state */
|
|
struct pvr2_channel; /* One I/O pathway to a user */
|
|
struct pvr2_context_stream; /* Wrapper for a stream */
|
|
struct pvr2_ioread; /* Low level stream structure */
|
|
|
|
struct pvr2_context_stream {
|
|
struct pvr2_channel *user;
|
|
struct pvr2_stream *stream;
|
|
};
|
|
|
|
struct pvr2_context {
|
|
struct pvr2_channel *mc_first;
|
|
struct pvr2_channel *mc_last;
|
|
struct pvr2_hdw *hdw;
|
|
struct pvr2_context_stream video_stream;
|
|
struct mutex mutex;
|
|
int notify_flag;
|
|
int disconnect_flag;
|
|
|
|
wait_queue_head_t wait_data;
|
|
|
|
/* Called after pvr2_context initialization is complete */
|
|
void (*setup_func)(struct pvr2_context *);
|
|
|
|
};
|
|
|
|
struct pvr2_channel {
|
|
struct pvr2_context *mc_head;
|
|
struct pvr2_channel *mc_next;
|
|
struct pvr2_channel *mc_prev;
|
|
struct pvr2_context_stream *stream;
|
|
struct pvr2_hdw *hdw;
|
|
void (*check_func)(struct pvr2_channel *);
|
|
};
|
|
|
|
struct pvr2_context *pvr2_context_create(struct usb_interface *intf,
|
|
const struct usb_device_id *devid,
|
|
void (*setup_func)(struct pvr2_context *));
|
|
void pvr2_context_disconnect(struct pvr2_context *);
|
|
|
|
void pvr2_channel_init(struct pvr2_channel *,struct pvr2_context *);
|
|
void pvr2_channel_done(struct pvr2_channel *);
|
|
int pvr2_channel_claim_stream(struct pvr2_channel *,
|
|
struct pvr2_context_stream *);
|
|
struct pvr2_ioread *pvr2_channel_create_mpeg_stream(
|
|
struct pvr2_context_stream *);
|
|
|
|
|
|
#endif /* __PVRUSB2_CONTEXT_H */
|
|
/*
|
|
Stuff for Emacs to see, in order to encourage consistent editing style:
|
|
*** Local Variables: ***
|
|
*** mode: c ***
|
|
*** fill-column: 75 ***
|
|
*** tab-width: 8 ***
|
|
*** c-basic-offset: 8 ***
|
|
*** End: ***
|
|
*/
|