Commit 57a44415 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (44 commits)
  V4L/DVB (5571): V4l1-compat:  Make VIDIOCSPICT return errors in a useful way
  V4L/DVB (5624): Radio-maestro.c cleanup
  V4L/DVB (5623): Dsbr100.c Replace usb_dsbr100_do_ioctl to use video_ioctl2
  V4L/DVB (5622): Radio-zoltrix.c cleanup
  V4L/DVB (5621): Radio-cadet.c Replace cadet_do_ioctl to use video_ioctl2
  V4L/DVB (5619): Dvb-usb: fix typo
  V4L/DVB (5618): Cx88: Drop the generic i2c client from cx88-vp3054-i2c
  V4L/DVB (5617): V4L2: videodev, allow debugging
  V4L/DVB (5614): M920x: Disable second adapter on LifeView TV Walker Twin
  V4L/DVB (5613): M920x: loosen up 80-col limit
  V4L/DVB (5612): M920x: rename function prefixes from m9206_foo to m920x_foo
  V4L/DVB (5611): M920x: replace deb_rc with deb
  V4L/DVB (5610): M920x: remove duplicated code
  V4L/DVB (5609): M920x: group like functions together
  V4L/DVB (5608): M920x: various whitespace cleanups
  V4L/DVB (5607): M920x: Initial support for devices likely manufactured by Dposh
  V4L/DVB (5606): M920x: add "c-basic-offset: 8" to help emacs to enforce tabbing
  V4L/DVB (5605): M920x: Add support for LifeView TV Walker Twin
  V4L/DVB (5603): V4L: Prevent queueing queued buffers.
  V4L/DVB (5602): Enable DiSEqC in Starbox II (vp7021a)
  ...
parents 2a383c63 bbe2486f

Documentation/video4linux/CARDLIST.saa7134

+4 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
 51 -> ProVideo PV952                           [1540:9524]

 52 -> AverMedia AverTV/305                     [1461:2108]

 53 -> ASUS TV-FM 7135                          [1043:4845]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,5168:5214,1489:0214,5168:0304]

 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306]

 56 -> Avermedia AVerTV 307                     [1461:a70a]

 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
@@ -111,3 +111,6 @@ 
110 -> Avermedia M102                           [1461:f31e]

111 -> ASUS P7131 4871                          [1043:4871]

112 -> ASUSTeK P7131 Hybrid                     [1043:4876]

113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6]

114 -> KWorld DVB-T 210                         [17de:7250]

115 -> Sabrent PCMCIA TV-PCB05                  [0919:2003]

Documentation/video4linux/sn9c102.txt

+10 −8
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ devices assembling the SN9C1xx PC camera controllers: 


Vendor ID  Product ID

---------  ----------

0x0458     0x7025

0x045e     0x00f5

0x045e     0x00f7

0x0471     0x0327

0x0471     0x0328

0x0c45     0x6001
@@ -432,7 +435,7 @@ Image sensor / SN9C1xx bridge | SN9C10[12] SN9C103 SN9C105 SN9C120 
HV7131D    Hynix Semiconductor     | Yes         No       No       No

HV7131R    Hynix Semiconductor     | No          Yes      Yes      Yes

MI-0343    Micron Technology       | Yes         No       No       No

MI-0360    Micron Technology       | No          Yes      No       No

MI-0360    Micron Technology       | No          Yes      Yes      Yes

OV7630     OmniVision Technologies | Yes         Yes      No       No

OV7660     OmniVision Technologies | No          No       Yes      Yes

PAS106B    PixArt Imaging          | Yes         No       No       No
@@ -478,13 +481,12 @@ scaling factor is restored to 1. 
This driver supports two different video formats: the first one is the "8-bit

Sequential Bayer" format and can be used to obtain uncompressed video data

from the device through the current I/O method, while the second one provides

"raw" compressed video data (without frame headers not related to the

compressed data). The compression quality may vary from 0 to 1 and can be

selected or queried thanks to the VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP V4L2

ioctl's. For maximum flexibility, both the default active video format and the

default compression quality depend on how the image sensor being used is

initialized (as described in the documentation of the API for the image sensors

supplied by this driver).

either "raw" compressed video data (without frame headers not related to the

compressed data) or standard JPEG (with frame headers). The compression quality

may vary from 0 to 1 and can be selected or queried thanks to the

VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP V4L2 ioctl's. For maximum flexibility,

both the default active video format and the default compression quality

depend on how the image sensor being used is initialized.





11. Video frame formats [1]

drivers/media/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -87,6 +87,14 @@ config VIDEO_TVEEPROM 
	tristate

	depends on I2C



config DAB

	boolean "DAB adapters"

	default y

	---help---

	  Allow selecting support for for Digital Audio Broadcasting (DAB)

	  Receiver adapters.



if DAB

config USB_DABUSB

	tristate "DABUSB driver"

	depends on USB
@@ -100,5 +108,6 @@ config USB_DABUSB 


	  To compile this driver as a module, choose M here: the

	  module will be called dabusb.

endif # DAB



endmenu

drivers/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
obj-y := common/

obj-$(CONFIG_VIDEO_DEV) += video/

obj-$(CONFIG_VIDEO_DEV) += radio/

obj-$(CONFIG_DVB)       += dvb/
 
obj-$(CONFIG_DVB_CORE)  += dvb/

drivers/media/common/saa7146_core.c

+35 −19
Original line number Diff line number Diff line
@@ -136,28 +136,45 @@ char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa 
	char *mem = vmalloc_32(length);

	int slen = 0;



	if (NULL == mem) {

		return NULL;

	}

	if (NULL == mem)

		goto err_null;



	if (!(pt->slist = vmalloc_to_sg(mem, pages))) {

		vfree(mem);

		return NULL;

	}

	if (!(pt->slist = vmalloc_to_sg(mem, pages)))

		goto err_free_mem;



	if (saa7146_pgtable_alloc(pci, pt))

		goto err_free_slist;



	pt->nents = pages;

	slen = pci_map_sg(pci,pt->slist,pt->nents,PCI_DMA_FROMDEVICE);

	if (0 == slen)

		goto err_free_pgtable;



	if (0 != saa7146_pgtable_build_single(pci, pt, pt->slist, slen))

		goto err_unmap_sg;



	return mem;



	if (saa7146_pgtable_alloc(pci, pt)) {

err_unmap_sg:

	pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);

err_free_pgtable:

	saa7146_pgtable_free(pci, pt);

err_free_slist:

	kfree(pt->slist);

	pt->slist = NULL;

err_free_mem:

	vfree(mem);

err_null:

	return NULL;

}



	slen = pci_map_sg(pci,pt->slist,pages,PCI_DMA_FROMDEVICE);

	if (0 != saa7146_pgtable_build_single(pci, pt, pt->slist, slen)) {

		return NULL;

	}



	return mem;

void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt)

{

	pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);

	saa7146_pgtable_free(pci, pt);

	kfree(pt->slist);

	pt->slist = NULL;

	vfree(mem);

}



void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
@@ -166,8 +183,6 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt) 
		return;

	pci_free_consistent(pci, pt->size, pt->cpu, pt->dma);

	pt->cpu = NULL;

	kfree(pt->slist);

	pt->slist = NULL;

}



int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
@@ -528,6 +543,7 @@ EXPORT_SYMBOL_GPL(saa7146_pgtable_alloc); 
EXPORT_SYMBOL_GPL(saa7146_pgtable_free);

EXPORT_SYMBOL_GPL(saa7146_pgtable_build_single);

EXPORT_SYMBOL_GPL(saa7146_vmalloc_build_pgtable);

EXPORT_SYMBOL_GPL(saa7146_vfree_destroy_pgtable);

EXPORT_SYMBOL_GPL(saa7146_wait_for_debi_done);



EXPORT_SYMBOL_GPL(saa7146_setgpio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE