mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-26 19:36:41 +00:00
0b8e74c6f4
Pull media updates from Mauro Carvalho Chehab:
"The first part of the media updates for Kernel 3.7.
This series contain:
- A major tree renaming patch series: now, drivers are organized
internally by their used bus, instead of by V4L2 and/or DVB API,
providing a cleaner driver location for hybrid drivers that
implement both APIs, and allowing to cleanup the Kconfig items and
make them more intuitive for the end user;
- Media Kernel developers are typically very lazy with their duties
of keeping the MAINTAINERS entries for their drivers updated. As
now the tree is more organized, we're doing an effort to add/update
those entries for the drivers that aren't currently orphan;
- Several DVB USB drivers got moved to a new DVB USB v2 core; the new
core fixes several bugs (as the existing one that got bitroted).
Now, suspend/resume finally started to work fine (at least with
some devices - we should expect more work with regards to it);
- added multistream support for DVB-T2, and unified the API for
DVB-S2 and ISDB-S. Backward binary support is preserved;
- as usual, a few new drivers, some V4L2 core improvements and lots
of drivers improvements and fixes.
There are some points to notice on this series:
1) you should expect a trivial merge conflict on your tree, with the
removal of Documentation/feature-removal-schedule.txt: this series
would be adding two additional entries there. I opted to not
rebase it due to this recent change;
2) With regards to the PCTV 520e udev-related breakage, I opted to
fix it in a way that the patches can be backported to 3.5 even
without your firmware fix patch. This way, Greg doesn't need to
rush backporting your patch (as there are still the firmware cache
and firmware path customization issues to be addressed there).
I'll send later a patch (likely after the end of the merge window)
reverting the rest of the DRX-K async firmware request, fully
restoring its original behaviour to allow media drivers to
initialize everything serialized as before for 3.7 and upper.
3) I'm planning to work on this weekend to test the DMABUF patches
for V4L2. The patches are on my queue for several Kernel cycles,
but, up to now, there is/was no way to test the series locally.
I have some concerns about this particular changeset with regards
to security issues, and with regards to the replacement of the old
VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
GPU drivers change. The Overlay API allows direct PCI2PCI
transfers from a media capture card into the GPU framebuffer, but
its API is crappy. Also, the only existing X11 driver that
implements it requires a XV extension that is not available
anymore on modern drivers. The DMABUF can do the same thing, but
with it is promising to be a properly-designed API. If I can
successfully test this series and be happy with it, I should be
asking you to pull them next week."
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
em28xx: regression fix: use DRX-K sync firmware requests on em28xx
drxk: allow loading firmware synchrousnously
em28xx: Make all em28xx extensions to be initialized asynchronously
[media] tda18271: properly report read errors in tda18271_get_id
[media] tda18271: delay IR & RF calibration until init() if delay_cal is set
[media] MAINTAINERS: add Michael Krufky as tda827x maintainer
[media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
[media] MAINTAINERS: add Michael Krufky as cxusb maintainer
[media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
[media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
[media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
[media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
[media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
[media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
[media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
[media] exynos-gsc: Add missing static storage class specifiers
[media] exynos-gsc: Remove <linux/version.h> header file inclusion
[media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
[media] s5p-tv: Fix potential NULL pointer dereference error
[media] s5k6aa: Fix possible NULL pointer dereference
...
118 lines
3.7 KiB
C
118 lines
3.7 KiB
C
/*
|
|
Mantis PCI bridge driver
|
|
|
|
Copyright (C) Manu Abraham (abraham.manu@gmail.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, or
|
|
(at your option) any later version.
|
|
|
|
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., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/signal.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/interrupt.h>
|
|
#include <asm/io.h>
|
|
|
|
#include "dmxdev.h"
|
|
#include "dvbdev.h"
|
|
#include "dvb_demux.h"
|
|
#include "dvb_frontend.h"
|
|
#include "dvb_net.h"
|
|
|
|
#include "mantis_common.h"
|
|
#include "mantis_link.h"
|
|
#include "mantis_hif.h"
|
|
#include "mantis_reg.h"
|
|
|
|
static void mantis_hifevm_work(struct work_struct *work)
|
|
{
|
|
struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
|
|
struct mantis_pci *mantis = ca->ca_priv;
|
|
|
|
u32 gpif_stat;
|
|
|
|
gpif_stat = mmread(MANTIS_GPIF_STATUS);
|
|
|
|
if (gpif_stat & MANTIS_GPIF_DETSTAT) {
|
|
if (gpif_stat & MANTIS_CARD_PLUGIN) {
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Plugin", mantis->num);
|
|
mmwrite(0xdada0000, MANTIS_CARD_RESET);
|
|
mantis_event_cam_plugin(ca);
|
|
dvb_ca_en50221_camchange_irq(&ca->en50221,
|
|
0,
|
|
DVB_CA_EN50221_CAMCHANGE_INSERTED);
|
|
}
|
|
} else {
|
|
if (gpif_stat & MANTIS_CARD_PLUGOUT) {
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Unplug", mantis->num);
|
|
mmwrite(0xdada0000, MANTIS_CARD_RESET);
|
|
mantis_event_cam_unplug(ca);
|
|
dvb_ca_en50221_camchange_irq(&ca->en50221,
|
|
0,
|
|
DVB_CA_EN50221_CAMCHANGE_REMOVED);
|
|
}
|
|
}
|
|
|
|
if (mantis->gpif_status & MANTIS_GPIF_EXTIRQ)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Ext IRQ", mantis->num);
|
|
|
|
if (mantis->gpif_status & MANTIS_SBUF_WSTO)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Timeout", mantis->num);
|
|
|
|
if (mantis->gpif_status & MANTIS_GPIF_OTHERR)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Alignment Error", mantis->num);
|
|
|
|
if (gpif_stat & MANTIS_SBUF_OVFLW)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Overflow", mantis->num);
|
|
|
|
if (gpif_stat & MANTIS_GPIF_BRRDY)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Read Ready", mantis->num);
|
|
|
|
if (gpif_stat & MANTIS_GPIF_INTSTAT)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): GPIF IRQ", mantis->num);
|
|
|
|
if (gpif_stat & MANTIS_SBUF_EMPTY)
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer Empty", mantis->num);
|
|
|
|
if (gpif_stat & MANTIS_SBUF_OPDONE) {
|
|
dprintk(MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num);
|
|
ca->sbuf_status = MANTIS_SBUF_DATA_AVAIL;
|
|
ca->hif_event = MANTIS_SBUF_OPDONE;
|
|
wake_up(&ca->hif_opdone_wq);
|
|
}
|
|
}
|
|
|
|
int mantis_evmgr_init(struct mantis_ca *ca)
|
|
{
|
|
struct mantis_pci *mantis = ca->ca_priv;
|
|
|
|
dprintk(MANTIS_DEBUG, 1, "Initializing Mantis Host I/F Event manager");
|
|
INIT_WORK(&ca->hif_evm_work, mantis_hifevm_work);
|
|
mantis_pcmcia_init(ca);
|
|
schedule_work(&ca->hif_evm_work);
|
|
mantis_hif_init(ca);
|
|
return 0;
|
|
}
|
|
|
|
void mantis_evmgr_exit(struct mantis_ca *ca)
|
|
{
|
|
struct mantis_pci *mantis = ca->ca_priv;
|
|
|
|
dprintk(MANTIS_DEBUG, 1, "Mantis Host I/F Event manager exiting");
|
|
flush_work(&ca->hif_evm_work);
|
|
mantis_hif_exit(ca);
|
|
mantis_pcmcia_exit(ca);
|
|
}
|