Re: [PATCH] dw2102: switch ts2022 to ts2020 driver
Just tested this and it seems to work fine with the TT S2-4600.
Reviewed-by: Olli Salonen
On 30 March 2015 at 01:35, Antti Palosaari wrote:
> Change ts2022 driver to ts2020 driver. ts2020 driver supports
> both tuner chip models.
>
> That affects TechnoTrend TT-connect S2-4600 DVB-S/S2 device, which
> Olli just added.
>
> Cc: Olli Salonen
> Signed-off-by: Antti Palosaari
> ---
> drivers/media/usb/dvb-usb/Kconfig | 1 -
> drivers/media/usb/dvb-usb/dw2102.c | 14 ++
> 2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb/Kconfig
> b/drivers/media/usb/dvb-usb/Kconfig
> index def1e06..128eee6 100644
> --- a/drivers/media/usb/dvb-usb/Kconfig
> +++ b/drivers/media/usb/dvb-usb/Kconfig
> @@ -279,7 +279,6 @@ config DVB_USB_DW2102
> select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
> select DVB_M88RS2000 if MEDIA_SUBDRV_AUTOSELECT
> select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
> - select MEDIA_TUNER_TS2022 if MEDIA_SUBDRV_AUTOSELECT
> help
> Say Y here to support the DvbWorld, TeVii, Prof, TechnoTrend
> DVB-S/S2 USB2.0 receivers.
> diff --git a/drivers/media/usb/dvb-usb/dw2102.c
> b/drivers/media/usb/dvb-usb/dw2102.c
> index 9dc3619..f1f357f 100644
> --- a/drivers/media/usb/dvb-usb/dw2102.c
> +++ b/drivers/media/usb/dvb-usb/dw2102.c
> @@ -33,7 +33,7 @@
> #include "tda18271.h"
> #include "cxd2820r.h"
> #include "m88ds3103.h"
> -#include "m88ts2022.h"
> +#include "ts2020.h"
>
> /* Max transfer size done by I2C transfer functions */
> #define MAX_XFER_SIZE 64
> @@ -1487,9 +1487,7 @@ static int tt_s2_4600_frontend_attach(struct
> dvb_usb_adapter *adap)
> struct i2c_adapter *i2c_adapter;
> struct i2c_client *client;
> struct i2c_board_info info;
> - struct m88ts2022_config m88ts2022_config = {
> - .clock = 2700,
> - };
> + struct ts2020_config ts2020_config = {};
>
> if (dvb_usb_generic_rw(d, obuf, 3, ibuf, 1, 0) < 0)
> err("command 0x0e transfer failed.");
> @@ -1531,11 +1529,11 @@ static int tt_s2_4600_frontend_attach(struct
> dvb_usb_adapter *adap)
> return -ENODEV;
>
> /* attach tuner */
> - m88ts2022_config.fe = adap->fe_adap[0].fe;
> - strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
> + ts2020_config.fe = adap->fe_adap[0].fe;
> + strlcpy(info.type, "ts2022", I2C_NAME_SIZE);
> info.addr = 0x60;
> - info.platform_data = &m88ts2022_config;
> - request_module("m88ts2022");
> + info.platform_data = &ts2020_config;
> + request_module("ts2020");
> client = i2c_new_device(i2c_adapter, &info);
>
> if (client == NULL || client->dev.driver == NULL) {
> --
> http://palosaari.fi/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
cron job: media_tree daily build: WARNINGS
This message is generated daily by a cron job that builds media_tree for the kernels and architectures in the list below. Results of the daily build of media_tree: date: Mon Mar 30 04:00:15 CEST 2015 git branch: test git hash: 8a56b6b5fd6ff92b7e27d870b803b11b751660c2 gcc version:i686-linux-gcc (GCC) 4.9.1 sparse version: v0.5.0-44-g40791b9 smatch version: 0.4.1-3153-g7d56ab3 host hardware: x86_64 host os:3.19.0-1.slh.1-amd64 linux-git-arm-at91: OK linux-git-arm-davinci: OK linux-git-arm-exynos: OK linux-git-arm-mx: OK linux-git-arm-omap: OK linux-git-arm-omap1: OK linux-git-arm-pxa: OK linux-git-blackfin: OK linux-git-i686: OK linux-git-m32r: OK linux-git-mips: OK linux-git-powerpc64: OK linux-git-sh: OK linux-git-x86_64: OK linux-2.6.32.27-i686: OK linux-2.6.33.7-i686: OK linux-2.6.34.7-i686: OK linux-2.6.35.9-i686: OK linux-2.6.36.4-i686: OK linux-2.6.37.6-i686: OK linux-2.6.38.8-i686: OK linux-2.6.39.4-i686: OK linux-3.0.60-i686: OK linux-3.1.10-i686: OK linux-3.2.37-i686: OK linux-3.3.8-i686: OK linux-3.4.27-i686: OK linux-3.5.7-i686: OK linux-3.6.11-i686: OK linux-3.7.4-i686: OK linux-3.8-i686: WARNINGS linux-3.9.2-i686: WARNINGS linux-3.10.1-i686: OK linux-3.11.1-i686: OK linux-3.12.23-i686: OK linux-3.13.11-i686: OK linux-3.14.9-i686: OK linux-3.15.2-i686: OK linux-3.16.7-i686: OK linux-3.17.8-i686: OK linux-3.18.7-i686: OK linux-3.19-i686: OK linux-4.0-rc1-i686: OK linux-2.6.32.27-x86_64: OK linux-2.6.33.7-x86_64: OK linux-2.6.34.7-x86_64: OK linux-2.6.35.9-x86_64: OK linux-2.6.36.4-x86_64: OK linux-2.6.37.6-x86_64: OK linux-2.6.38.8-x86_64: OK linux-2.6.39.4-x86_64: OK linux-3.0.60-x86_64: OK linux-3.1.10-x86_64: OK linux-3.2.37-x86_64: OK linux-3.3.8-x86_64: OK linux-3.4.27-x86_64: OK linux-3.5.7-x86_64: OK linux-3.6.11-x86_64: OK linux-3.7.4-x86_64: OK linux-3.8-x86_64: WARNINGS linux-3.9.2-x86_64: WARNINGS linux-3.10.1-x86_64: OK linux-3.11.1-x86_64: OK linux-3.12.23-x86_64: OK linux-3.13.11-x86_64: OK linux-3.14.9-x86_64: OK linux-3.15.2-x86_64: OK linux-3.16.7-x86_64: OK linux-3.17.8-x86_64: OK linux-3.18.7-x86_64: OK linux-3.19-x86_64: OK linux-4.0-rc1-x86_64: OK apps: OK spec-git: OK sparse: WARNINGS smatch: ERRORS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Monday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Monday.tar.bz2 The Media Infrastructure API from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/media.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL 4.1] TS2020 / TS2022
PULL request update. Added pending patches which causes conflict otherwise. regards Antti On 03/28/2015 01:50 AM, Antti Palosaari wrote: Add TS2022 support to TS2020 driver. Relative small changes were needed. Add I2C binding to TS2020. Switch TS2022 users to TS2020 and finally drop obsolete TS2022. The following changes since commit 8a56b6b5fd6ff92b7e27d870b803b11b751660c2: [media] v4l2-subdev: remove enum_framesizes/intervals (2015-03-23 12:02:41 -0700) are available in the git repository at: git://linuxtv.org/anttip/media_tree.git ts2020_pull for you to fetch changes up to e958e05617a8d5819608b3821a3263653852a761: ts2020: do not use i2c_transfer() on sleep() (2015-03-30 01:37:24 +0300) Antti Palosaari (9): ts2020: add support for TS2022 ts2020: implement I2C client bindings em28xx: switch PCTV 461e to ts2020 driver cx23885: switch ts2022 to ts2020 driver smipcie: switch ts2022 to ts2020 driver dvbsky: switch ts2022 to ts2020 driver dw2102: switch ts2022 to ts2020 driver m88ts2022: remove obsolete driver ts2020: do not use i2c_transfer() on sleep() David Howells (1): m88ts2022: Nested loops shouldn't use the same index variable Olli Salonen (3): dw2102: combine su3000_state and s6x0_state into dw2102_state dw2102: store i2c client for tuner into dw2102_state dw2102: TechnoTrend TT-connect S2-4600 DVB-S/S2 tuner MAINTAINERS | 10 --- drivers/media/dvb-core/dvb-usb-ids.h| 1 + drivers/media/dvb-frontends/ts2020.c| 302 +++ drivers/media/dvb-frontends/ts2020.h| 25 +- drivers/media/pci/cx23885/Kconfig | 1 - drivers/media/pci/cx23885/cx23885-dvb.c | 30 drivers/media/pci/smipcie/Kconfig | 2 +- drivers/media/pci/smipcie/smipcie.c | 12 ++- drivers/media/tuners/Kconfig| 8 -- drivers/media/tuners/m88ts2022.c| 579 - drivers/media/tuners/m88ts2022.h| 54 - drivers/media/tuners/m88ts2022_priv.h | 35 - drivers/media/usb/dvb-usb-v2/Kconfig| 2 +- drivers/media/usb/dvb-usb-v2/dvbsky.c | 26 +++ drivers/media/usb/dvb-usb/Kconfig | 5 +- drivers/media/usb/dvb-usb/dw2102.c | 192 ++ drivers/media/usb/em28xx/Kconfig| 2 +- drivers/media/usb/em28xx/em28xx-dvb.c | 13 ++-- 18 files changed, 514 insertions(+), 785 deletions(-) delete mode 100644 drivers/media/tuners/m88ts2022.c delete mode 100644 drivers/media/tuners/m88ts2022.h delete mode 100644 drivers/media/tuners/m88ts2022_priv.h -- http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] dw2102: switch ts2022 to ts2020 driver
Change ts2022 driver to ts2020 driver. ts2020 driver supports
both tuner chip models.
That affects TechnoTrend TT-connect S2-4600 DVB-S/S2 device, which
Olli just added.
Cc: Olli Salonen
Signed-off-by: Antti Palosaari
---
drivers/media/usb/dvb-usb/Kconfig | 1 -
drivers/media/usb/dvb-usb/dw2102.c | 14 ++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/Kconfig
b/drivers/media/usb/dvb-usb/Kconfig
index def1e06..128eee6 100644
--- a/drivers/media/usb/dvb-usb/Kconfig
+++ b/drivers/media/usb/dvb-usb/Kconfig
@@ -279,7 +279,6 @@ config DVB_USB_DW2102
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
select DVB_M88RS2000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
- select MEDIA_TUNER_TS2022 if MEDIA_SUBDRV_AUTOSELECT
help
Say Y here to support the DvbWorld, TeVii, Prof, TechnoTrend
DVB-S/S2 USB2.0 receivers.
diff --git a/drivers/media/usb/dvb-usb/dw2102.c
b/drivers/media/usb/dvb-usb/dw2102.c
index 9dc3619..f1f357f 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -33,7 +33,7 @@
#include "tda18271.h"
#include "cxd2820r.h"
#include "m88ds3103.h"
-#include "m88ts2022.h"
+#include "ts2020.h"
/* Max transfer size done by I2C transfer functions */
#define MAX_XFER_SIZE 64
@@ -1487,9 +1487,7 @@ static int tt_s2_4600_frontend_attach(struct
dvb_usb_adapter *adap)
struct i2c_adapter *i2c_adapter;
struct i2c_client *client;
struct i2c_board_info info;
- struct m88ts2022_config m88ts2022_config = {
- .clock = 2700,
- };
+ struct ts2020_config ts2020_config = {};
if (dvb_usb_generic_rw(d, obuf, 3, ibuf, 1, 0) < 0)
err("command 0x0e transfer failed.");
@@ -1531,11 +1529,11 @@ static int tt_s2_4600_frontend_attach(struct
dvb_usb_adapter *adap)
return -ENODEV;
/* attach tuner */
- m88ts2022_config.fe = adap->fe_adap[0].fe;
- strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
+ ts2020_config.fe = adap->fe_adap[0].fe;
+ strlcpy(info.type, "ts2022", I2C_NAME_SIZE);
info.addr = 0x60;
- info.platform_data = &m88ts2022_config;
- request_module("m88ts2022");
+ info.platform_data = &ts2020_config;
+ request_module("ts2020");
client = i2c_new_device(i2c_adapter, &info);
if (client == NULL || client->dev.driver == NULL) {
--
http://palosaari.fi/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: (bisected) Logitech C920 (uvcvideo) stutters since 3.9
On 8/12/2014 10:23 am, Grazvydas Ignotas wrote: Hi, On Sun, Dec 7, 2014 at 9:23 PM, Laurent Pinchart wrote: Hi Grazvydas, (CC'ing Paulo Assis) On Saturday 06 December 2014 02:25:25 Grazvydas Ignotas wrote: On Fri, Dec 5, 2014 at 1:46 PM, Laurent Pinchart wrote: On Thursday 06 November 2014 00:29:53 Grazvydas Ignotas wrote: On Wed, Nov 5, 2014 at 4:05 PM, Laurent Pinchart wrote: Would you be able to capture images from the C920 using yavta, with the uvcvideo trace parameter set to 4096, and send me both the yavta log and the kernel log ? Let's start with a capture sequence of 50 to 100 images. I've done 2 captures, if that helps: http://notaz.gp2x.de/tmp/c920_yavta/ The second one was done using low exposure setting, which allows camera to achieve higher frame rate. Thank you for the log, they were very helpful. They revealed that the USB SOF (Start Of Frame) counter values on the device and host side are not in sync. The counters get incremented are very different rates. What USB controller are you using ? 00:1d.7 USB controller: Intel Corporation NM10/ICH7 Family USB2 EHCI Controller (rev 01) (prog-if 20 [EHCI]) Subsystem: Micro-Star International Co., Ltd. [MSI] Device 7592 Flags: bus master, medium devsel, latency 0, IRQ 23 Memory at fe9fbc00 (32-bit, non-prefetchable) [size=1K] Capabilities: [50] Power Management version 2 Capabilities: [58] Debug port: BAR=1 offset=00a0 Kernel driver in use: ehci-pci If it helps, I could try on an ARM board, currently don't have any other x86 hardware around. Actually the frequencies I've computed from the log are correct on the host side but quite off on the device side. I'm puzzled. The following patch allows accessing the contents of the clock data buffer through debugfs. Would you be able to apply it and execute the following steps ? 1. Load the uvcvideo module with the clock trace flag (0x1000) set. 2. Start capturing clock data. while true; do cat /sys/kernel/debug/usb/uvcvideo/2-6/clocks ; done > ~/samples.log 3. Capture 100 frames. yavta -c100 > yavta.log 4. Stop the "while true" with ctrl-C. 5. Capture the uvcvideo stats. cat /sys/kernel/debug/usb/uvcvideo/2-6/stats > stats.log 6. Capture the kernel log. dmesg > dmesg.log 7. Send me all the log files. Done: http://notaz.gp2x.de/tmp/c920_yavta/3/ -- Gražvydas Hello, I've reproduced this issue on a Logitech C920 in the following environments: 1. x86_64 Linux 3.19.3 (Gentoo, custom kernel) 2. x86_64 Linux 3.13.0-46-generic (Ubuntu) 3. armv7a Linux 3.19.3 (Arch Linux, custom kernel) I can confirm that the issue is not present in Linux 3.8.y. I'm not sure if there have been any developments in regards to this in recent months, but I'm happy to help out in any way possible. If someone is in need of new debug logs, I can follow the steps above and provide them. -- Milos -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 82/86] media/fintek: drop pci_ids dependency
Em Sun, 29 Mar 2015 15:43:23 +0200 "Michael S. Tsirkin" escreveu: > This driver does not use any PCI IDs, don't include > the pci_ids.h header. Please merge the media patches into one. No reason to have this rename broken into lots of patches. Thanks, Mauro > > Signed-off-by: Michael S. Tsirkin > --- > drivers/media/rc/fintek-cir.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c > index 4ef500f..9ca168a 100644 > --- a/drivers/media/rc/fintek-cir.c > +++ b/drivers/media/rc/fintek-cir.c > @@ -33,7 +33,6 @@ > #include > #include > #include > -#include > > #include "fintek-cir.h" > -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 44/86] media/ddbridge: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/pci/ddbridge/ddbridge-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index 9e3492e..1c5b132 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 45/86] media/ngene: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/pci/ngene/ngene-cards.c | 2 +- drivers/media/pci/ngene/ngene-i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c index 039bed3..f381bab 100644 --- a/drivers/media/pci/ngene/ngene-cards.c +++ b/drivers/media/pci/ngene/ngene-cards.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "ngene.h" diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c index d28554f..06846d3 100644 --- a/drivers/media/pci/ngene/ngene-i2c.c +++ b/drivers/media/pci/ngene/ngene-i2c.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 46/86] media/fintek: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/rc/fintek-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c index b516757..4ef500f 100644 --- a/drivers/media/rc/fintek-cir.c +++ b/drivers/media/rc/fintek-cir.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "fintek-cir.h" -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 47/86] media/ite: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/rc/ite-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c index 56abf91..51750d6 100644 --- a/drivers/media/rc/ite-cir.c +++ b/drivers/media/rc/ite-cir.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "ite-cir.h" -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 49/86] media/winbond: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/rc/winbond-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index d839f73..76375a8 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 48/86] media/nuvoton: use uapi/linux/pci_ids.h directly
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- drivers/media/rc/nuvoton-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index 9c2c863..3f2ac81 100644 --- a/drivers/media/rc/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "nuvoton-cir.h" -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 82/86] media/fintek: drop pci_ids dependency
This driver does not use any PCI IDs, don't include the pci_ids.h header. Signed-off-by: Michael S. Tsirkin --- drivers/media/rc/fintek-cir.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c index 4ef500f..9ca168a 100644 --- a/drivers/media/rc/fintek-cir.c +++ b/drivers/media/rc/fintek-cir.c @@ -33,7 +33,6 @@ #include #include #include -#include #include "fintek-cir.h" -- MST -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND 2 PATCH 1/1] vb2: Fix dma_dir setting for dma-contig mem type
From: Sakari Ailus
(This time with correct stable address.)
The last argument of vb2_dc_get_user_pages() is of type enum
dma_data_direction, but the caller, vb2_dc_get_userptr() passes a value
which is the result of comparison dma_dir == DMA_FROM_DEVICE. This results
in the write parameter to get_user_pages() being zero in all cases, i.e.
that the caller has no intent to write there.
This was broken by patch "vb2: replace 'write' by 'dma_dir'".
Signed-off-by: Sakari Ailus
Cc: sta...@vger.kernel.org
Acked-by: Hans Verkuil
Fixes: cd474037c4a9 ("[media] vb2: replace 'write' by 'dma_dir'")
---
Hi,
This fixes videobuf2 dma-contig memory type USERPTR support for v3.19. The
pull req for the patch was submitted some time ago:
http://www.spinics.net/lists/linux-media/msg86425.html>
Mauro, let us know if you have objections.
Thanks.
drivers/media/v4l2-core/videobuf2-dma-contig.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index b481d20..69e0483 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -632,8 +632,7 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned
long vaddr,
}
/* extract page list from userspace mapping */
- ret = vb2_dc_get_user_pages(start, pages, n_pages, vma,
- dma_dir == DMA_FROM_DEVICE);
+ ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, dma_dir);
if (ret) {
unsigned long pfn;
if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[RESEND PATCH 1/1] vb2: Fix dma_dir setting for dma-contig mem type
From: Sakari Ailus
The last argument of vb2_dc_get_user_pages() is of type enum
dma_data_direction, but the caller, vb2_dc_get_userptr() passes a value
which is the result of comparison dma_dir == DMA_FROM_DEVICE. This results
in the write parameter to get_user_pages() being zero in all cases, i.e.
that the caller has no intent to write there.
This was broken by patch "vb2: replace 'write' by 'dma_dir'".
Signed-off-by: Sakari Ailus
Cc: sta...@vger.kernel.org # for v3.19
Acked-by: Hans Verkuil
Fixes: cd474037c4a9 ("[media] vb2: replace 'write' by 'dma_dir'")
---
Hi,
This fixes videobuf2 dma-contig memory type USERPTR support for v3.19. The
pull req for the patch was submitted some time ago:
http://www.spinics.net/lists/linux-media/msg86425.html>
Mauro, let us know if you have objections.
Thanks.
drivers/media/v4l2-core/videobuf2-dma-contig.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index b481d20..69e0483 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -632,8 +632,7 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned
long vaddr,
}
/* extract page list from userspace mapping */
- ret = vb2_dc_get_user_pages(start, pages, n_pages, vma,
- dma_dir == DMA_FROM_DEVICE);
+ ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, dma_dir);
if (ret) {
unsigned long pfn;
if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] v4l: vsp1: Fix Suspend-to-RAM
Hi Laurent,
I'm wondering if you could find a moment to look over this patch.
Regards,
Kaneko
2015-03-15 23:33 GMT+09:00 Yoshihiro Kaneko :
> From: Sei Fumizono
>
> Fix Suspend-to-RAM
> so that VSP1 driver continues to work after resuming.
>
> In detail,
> - Fix the judgment of ref count in resuming.
> - Add stopping VSP1 during suspend.
>
> Signed-off-by: Sei Fumizono
> Signed-off-by: Yoshifumi Hosoya
> Signed-off-by: Yoshihiro Kaneko
> ---
>
> This patch is based on the master branch of linuxtv.org/media_tree.git.
>
> drivers/media/platform/vsp1/vsp1_drv.c | 39
>
> drivers/media/platform/vsp1/vsp1_video.c | 31 -
> drivers/media/platform/vsp1/vsp1_video.h | 5 +++-
> 3 files changed, 69 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c
> b/drivers/media/platform/vsp1/vsp1_drv.c
> index 913485a..b6e9cbc 100644
> --- a/drivers/media/platform/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/vsp1/vsp1_drv.c
> @@ -1,7 +1,7 @@
> /*
> * vsp1_drv.c -- R-Car VSP1 Driver
> *
> - * Copyright (C) 2013-2014 Renesas Electronics Corporation
> + * Copyright (C) 2013-2015 Renesas Electronics Corporation
> *
> * Contact: Laurent Pinchart (laurent.pinch...@ideasonboard.com)
> *
> @@ -397,26 +397,57 @@ void vsp1_device_put(struct vsp1_device *vsp1)
> static int vsp1_pm_suspend(struct device *dev)
> {
> struct vsp1_device *vsp1 = dev_get_drvdata(dev);
> + unsigned int i = 0;
> + int ret = 0;
>
> WARN_ON(mutex_is_locked(&vsp1->lock));
>
> if (vsp1->ref_count == 0)
> return 0;
>
> + /* Suspend pipeline */
> + for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
> + struct vsp1_rwpf *wpf = vsp1->wpf[i];
> + struct vsp1_pipeline *pipe;
> +
> + if (wpf == NULL)
> + continue;
> +
> + pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
> + ret = vsp1_pipeline_suspend(pipe);
> + if (ret < 0)
> + break;
> + }
> +
> clk_disable_unprepare(vsp1->clock);
> - return 0;
> + return ret;
> }
>
> static int vsp1_pm_resume(struct device *dev)
> {
> struct vsp1_device *vsp1 = dev_get_drvdata(dev);
> + unsigned int i = 0;
>
> WARN_ON(mutex_is_locked(&vsp1->lock));
>
> - if (vsp1->ref_count)
> + if (vsp1->ref_count == 0)
> return 0;
>
> - return clk_prepare_enable(vsp1->clock);
> + clk_prepare_enable(vsp1->clock);
> +
> + /* Resume pipeline */
> + for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
> + struct vsp1_rwpf *wpf = vsp1->wpf[i];
> + struct vsp1_pipeline *pipe;
> +
> + if (wpf == NULL)
> + continue;
> +
> + pipe = to_vsp1_pipeline(&wpf->entity.subdev.entity);
> + vsp1_pipeline_resume(pipe);
> + }
> +
> + return 0;
> }
> #endif
>
> diff --git a/drivers/media/platform/vsp1/vsp1_video.c
> b/drivers/media/platform/vsp1/vsp1_video.c
> index d91f19a..c744608 100644
> --- a/drivers/media/platform/vsp1/vsp1_video.c
> +++ b/drivers/media/platform/vsp1/vsp1_video.c
> @@ -1,7 +1,7 @@
> /*
> * vsp1_video.c -- R-Car VSP1 Video Node
> *
> - * Copyright (C) 2013-2014 Renesas Electronics Corporation
> + * Copyright (C) 2013-2015 Renesas Electronics Corporation
> *
> * Contact: Laurent Pinchart (laurent.pinch...@ideasonboard.com)
> *
> @@ -662,6 +662,35 @@ done:
> spin_unlock_irqrestore(&pipe->irqlock, flags);
> }
>
> +int vsp1_pipeline_suspend(struct vsp1_pipeline *pipe)
> +{
> + unsigned long flags;
> + int ret;
> +
> + if (pipe == NULL)
> + return 0;
> +
> + spin_lock_irqsave(&pipe->irqlock, flags);
> + if (pipe->state == VSP1_PIPELINE_RUNNING)
> + pipe->state = VSP1_PIPELINE_STOPPING;
> + spin_unlock_irqrestore(&pipe->irqlock, flags);
> +
> + ret = wait_event_timeout(pipe->wq, pipe->state ==
> VSP1_PIPELINE_STOPPED,
> +msecs_to_jiffies(500));
> + ret = ret == 0 ? -ETIMEDOUT : 0;
> +
> + return ret;
> +}
> +
> +void vsp1_pipeline_resume(struct vsp1_pipeline *pipe)
> +{
> + if (pipe == NULL)
> + return;
> +
> + if (vsp1_pipeline_ready(pipe))
> + vsp1_pipeline_run(pipe);
> +}
> +
> /*
> * Propagate the alpha value through the pipeline.
> *
> diff --git a/drivers/media/platform/vsp1/vsp1_video.h
> b/drivers/media/platform/vsp1/vsp1_video.h
> index fd2851a..958a166 100644
> --- a/drivers/media/platform/vsp1/vsp1_video.h
> +++ b/drivers/media/platform/vsp1/vsp1_video.h
> @@ -1,7 +1,7 @@
> /*
> * vsp1_video.h -- R-Car VSP1 Video Node
> *
> - * Copyright (C) 2013-2014 Renesas Electronics Corporation
> + * Copyright (C) 2013-2015 Renesas Electronics Corporation
> *
Re: [PATCH/RFC] v4l: vsp1: Change VSP1 LIF linebuffer FIFO
Hi Geert, Hi Laurent,
Thanks for your review. There do indeed seem to be some problems with
this patch.
I'm happy get some feedback from the BSP team if you think it is
worthwhile. Else I suggest we simply drop this issue for now.
Thanks,
Kaneko
2015-03-18 22:23 GMT+09:00 Laurent Pinchart :
> Hello,
>
> On Monday 16 March 2015 09:06:22 Geert Uytterhoeven wrote:
>> On Sun, Mar 15, 2015 at 3:33 PM, Yoshihiro Kaneko wrote:
>> > From: Yoshifumi Hosoya
>> >
>> > Change to VSPD hardware recommended value.
>> > Purpose is highest pixel clock without underruns.
>> > In the default R-Car Linux BSP config this value is
>> > wrong and therefore there are many underruns.
>> >
>> > Here are the original settings:
>> > HBTH = 1300 (VSPD stops when 1300 pixels are buffered)
>> > LBTH = 200 (VSPD resumes when buffer level has decreased
>> > below 200 pixels)
>> >
>> > The display underruns can be eliminated
>> > by applying the following settings:
>> > HBTH = 1504
>> > LBTH = 1248
>> >
>> > --- a/drivers/media/platform/vsp1/vsp1_lif.c
>> > +++ b/drivers/media/platform/vsp1/vsp1_lif.c
>> > @@ -44,9 +44,9 @@ static int lif_s_stream(struct v4l2_subdev *subdev, int
>> > enable)
>> > {
>> > const struct v4l2_mbus_framefmt *format;
>> > struct vsp1_lif *lif = to_lif(subdev);
>> > - unsigned int hbth = 1300;
>> > - unsigned int obth = 400;
>> > - unsigned int lbth = 200;
>> > + unsigned int hbth = 1536;
>> > + unsigned int obth = 128;
>> > + unsigned int lbth = 1520;
>>
>> These values don't match the patch description?
>
> Indeed. And where do these values come from ? A 16 bytes hysteresis is very
> small, the VSP1 will constantly start and stop. Isn't that bad from a power
> consumption point of view ?
>
>> BTW, what's the significance of changing obth?
>
> --
> Regards,
>
> Laurent Pinchart
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 repost] media: soc_camera: rcar_vin: Fix wait_for_completion
From: Koji Matsuoka
When stopping abnormally, a driver can't return from wait_for_completion.
This patch resolved this problem by changing wait_for_completion_timeout
from wait_for_completion.
Signed-off-by: Koji Matsuoka
Signed-off-by: Yoshihiro Kaneko
---
This patch is against master branch of linuxtv.org/media_tree.git.
v2 [Yoshihiro Kaneko]
* remove the original line that I forgot.
* fix an indent to make it easy to read.
drivers/media/platform/soc_camera/rcar_vin.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c
b/drivers/media/platform/soc_camera/rcar_vin.c
index 279ab9f..e55d7ba 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -135,6 +135,8 @@
#define VIN_MAX_WIDTH 2048
#define VIN_MAX_HEIGHT 2048
+#define TIMEOUT_MS 100
+
enum chip_id {
RCAR_GEN2,
RCAR_H1,
@@ -820,7 +822,10 @@ static void rcar_vin_wait_stop_streaming(struct
rcar_vin_priv *priv)
if (priv->state == STOPPING) {
priv->request_to_stop = true;
spin_unlock_irq(&priv->lock);
- wait_for_completion(&priv->capture_stop);
+ if (!wait_for_completion_timeout(
+ &priv->capture_stop,
+ msecs_to_jiffies(TIMEOUT_MS)))
+ priv->state = STOPPED;
spin_lock_irq(&priv->lock);
}
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Persoenliche E-mail
Guten Tag, Ich bin Herr Juan Sebastian Morato, der Auditor General von Unicaja Bank Madrid. Im Zuge meiner Abschlusspruefung, entdeckte ich eine schwimmende Fonds auf einem Konto, das 1990 bei der Cam Bank eroeffnet wurde, bevor der Besitz von Unicaja Gruppe gekauft wurde, ich bin der Abschlusspruefer der einem toten Auslaender Herr Kenny, der im Jahr 2004 starb, zugeteilt wurde. Jede Anstrengung, ein Mitglied seiner Familie oder einen naechsten Angehoerigen zu Ermitteln sind gescheitert. Bei meinen Ermittlungen habe ich festgestellt, dass Sie zu den naechsten Angehoerigen gehoeren, da Sie den gleichen Nachnamen tragen. Er verstarb ohne Nachkommen oder einen Testament. Meine Absicht ist es, diese Summe von 5,5 Mio. von den oben genannten Konto auf ein sicheres Konto zu ueberweisen. Ich schlage daher vor, dass ich Sie als stillen Teilhaber eintrage und Sie mir ein Konto zur Verfuegung stellen, oder ein neues Konto eroeffnen um dieses Geld dorthin zu ueberweisen. Fuer Ihre Unterstützung bei diesem Vorhaben, bin ich bereit, mit einem guten Prozentsatz des gesamten Fonds zu trennen. Beim durchsehen der Aufzeichnungen und Akten der verstorbenen Person, entdeckte ich dass (1) Niemand dieses Konto seit 2004 betrieben hat (2) Er starb ohne Erben, daher das Geld weiter floss. (3) Keine andere Person über dieses Konto bescheid weiss und auch kein Empfaenger eingetragen ist Wenn ich mich nicht schnellstens dieser Angelegenheit annehme, wird dieses Geld verfallen und anschliessend in Gesellschaftsmitteln fliessen, von denen nur die Regisseure meiner Firma profitieren werden. Ich kann Ihnen dieses Geld rechtlich zukommen lassen, wenn Sie einige notwendigen Genehmigungen, die auf Ihren Namen zugelassen sind ausfuellen, wobei ich Ihnen selbstverstaendlich behilflich sein werde. Bitte geben Sie mir eine Antwort auf meine private E-Mail juan.mora...@1email.eu oder Fax 00 34 917 692 656, so dass ich Ihnen detaillierte Informationen ueber die Modalitäten meines Vorschlages zu senden kann. Ich bitte Sie eingehend dieses Schreiben absolut vertraulich zu behandeln. Bitte senden Sie mir Ihre Telefonnummer auf der sie leicht zu erreichen sind. Ich freue mich auf Ihre baldige Antwort. Mit freundlichen Gruessen Herr Juan Sebastian Morato Fax 00 34 917 692 656 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
