cron job: media_tree daily build: ERRORS
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: Sun Apr 30 05:00:18 CEST 2017 media-tree git hash:3622d3e77ecef090b5111e3c5423313f11711dfa media_build git hash: 1af19680bde3e227d64d99ff5fdc43eb343a3b28 v4l-utils git hash: 847bf8d62cd6b11defc1e4c3b30b68d3c66876e0 gcc version:i686-linux-gcc (GCC) 6.2.0 sparse version: v0.5.0-3553-g78b2ea6 smatch version: v0.5.0-3553-g78b2ea6 host hardware: x86_64 host os:4.9.0-164 linux-git-arm-at91: OK linux-git-arm-davinci: OK linux-git-arm-multi: OK linux-git-arm-pxa: OK linux-git-blackfin-bf561: 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.36.4-i686: ERRORS linux-2.6.37.6-i686: ERRORS linux-2.6.38.8-i686: ERRORS linux-2.6.39.4-i686: ERRORS linux-3.0.60-i686: ERRORS linux-3.1.10-i686: ERRORS 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: OK linux-3.9.2-i686: OK linux-3.10.1-i686: WARNINGS linux-3.11.1-i686: ERRORS linux-3.12.67-i686: ERRORS linux-3.13.11-i686: ERRORS linux-3.14.9-i686: WARNINGS linux-3.15.2-i686: WARNINGS linux-3.16.7-i686: WARNINGS linux-3.17.8-i686: WARNINGS linux-3.18.7-i686: WARNINGS linux-3.19-i686: WARNINGS linux-4.0.9-i686: WARNINGS linux-4.1.33-i686: WARNINGS linux-4.2.8-i686: WARNINGS linux-4.3.6-i686: WARNINGS linux-4.4.22-i686: WARNINGS linux-4.5.7-i686: WARNINGS linux-4.6.7-i686: WARNINGS linux-4.7.5-i686: WARNINGS linux-4.8-i686: OK linux-4.9-i686: OK linux-4.10.1-i686: OK linux-4.11-rc1-i686: OK linux-2.6.36.4-x86_64: ERRORS linux-2.6.37.6-x86_64: ERRORS linux-2.6.38.8-x86_64: ERRORS linux-2.6.39.4-x86_64: ERRORS linux-3.0.60-x86_64: ERRORS linux-3.1.10-x86_64: ERRORS 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: OK linux-3.9.2-x86_64: OK linux-3.10.1-x86_64: WARNINGS linux-3.11.1-x86_64: ERRORS linux-3.12.67-x86_64: ERRORS linux-3.13.11-x86_64: ERRORS linux-3.14.9-x86_64: WARNINGS linux-3.15.2-x86_64: WARNINGS linux-3.16.7-x86_64: WARNINGS linux-3.17.8-x86_64: WARNINGS linux-3.18.7-x86_64: WARNINGS linux-3.19-x86_64: WARNINGS linux-4.0.9-x86_64: WARNINGS linux-4.1.33-x86_64: WARNINGS linux-4.2.8-x86_64: WARNINGS linux-4.3.6-x86_64: WARNINGS linux-4.4.22-x86_64: WARNINGS linux-4.5.7-x86_64: WARNINGS linux-4.6.7-x86_64: WARNINGS linux-4.7.5-x86_64: WARNINGS linux-4.8-x86_64: WARNINGS linux-4.9-x86_64: WARNINGS linux-4.10.1-x86_64: WARNINGS linux-4.11-rc1-x86_64: OK apps: WARNINGS spec-git: OK sparse: WARNINGS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Sunday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Sunday.tar.bz2 The Media Infrastructure API from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/index.html
Re: [PATCH 3/3] [media] intel-ipu3: cio2: Add new MIPI-CSI2 driver
Hi Yong,
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on next-20170428]
[cannot apply to v4.11-rc8]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system]
url:
https://github.com/0day-ci/linux/commits/Yong-Zhi/add-IPU3-CIO2-CSI2-driver/20170430-074207
base: git://linuxtv.org/media_tree.git master
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
>> drivers/media/pci/ipu3/ipu3-cio2.c:36:31: fatal error: media/v4l2-fwnode.h:
>> No such file or directory
#include
^
compilation terminated.
vim +36 drivers/media/pci/ipu3/ipu3-cio2.c
30 #include
31 #include
32 #include
33 #include
34 #include
35 #include
> 36 #include
37 #include "ipu3-cio2.h"
38
39 MODULE_AUTHOR("Tianshu Qiu ");
---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
.config.gz
Description: application/gzip
[PATCH 1/3] [media] videodev2.h, v4l2-ioctl: add IPU3 raw10 color format
Add IPU3 specific formats:
V4L2_PIX_FMT_IPU3_SBGGR10
V4L2_PIX_FMT_IPU3_SGBRG10
V4L2_PIX_FMT_IPU3_SGRBG10
V4L2_PIX_FMT_IPU3_SRGGB10
Signed-off-by: Yong Zhi
---
drivers/media/v4l2-core/v4l2-ioctl.c | 4
include/uapi/linux/videodev2.h | 4
2 files changed, 8 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c
b/drivers/media/v4l2-core/v4l2-ioctl.c
index e5a2187..fb1387f 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1202,6 +1202,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG10P: descr = "10-bit Bayer GBGB/RGRG
Packed"; break;
case V4L2_PIX_FMT_SGRBG10P: descr = "10-bit Bayer GRGR/BGBG
Packed"; break;
case V4L2_PIX_FMT_SRGGB10P: descr = "10-bit Bayer RGRG/GBGB
Packed"; break;
+ case V4L2_PIX_FMT_IPU3_SBGGR10: descr = "10-bit bayer BGGR IPU3
Packed"; break;
+ case V4L2_PIX_FMT_IPU3_SGBRG10: descr = "10-bit bayer GBRG IPU3
Packed"; break;
+ case V4L2_PIX_FMT_IPU3_SGRBG10: descr = "10-bit bayer GRBG IPU3
Packed"; break;
+ case V4L2_PIX_FMT_IPU3_SRGGB10: descr = "10-bit bayer RGGB IPU3
Packed"; break;
case V4L2_PIX_FMT_SBGGR10ALAW8: descr = "8-bit Bayer BGBG/GRGR
(A-law)"; break;
case V4L2_PIX_FMT_SGBRG10ALAW8: descr = "8-bit Bayer GBGB/RGRG
(A-law)"; break;
case V4L2_PIX_FMT_SGRBG10ALAW8: descr = "8-bit Bayer GRGR/BGBG
(A-law)"; break;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 2b8feb8..7dddbc9 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -662,6 +662,10 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data
16-bit */
#define V4L2_PIX_FMT_MT21Cv4l2_fourcc('M', 'T', '2', '1') /* Mediatek
compressed block mode */
#define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar
Greyscale 10-bit and Depth 16-bit */
+#define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3
packed 10-bit BGGR bayer */
+#define V4L2_PIX_FMT_IPU3_SGBRG10 v4l2_fourcc('i', 'p', '3', 'g') /* IPU3
packed 10-bit GBRG bayer */
+#define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G') /* IPU3
packed 10-bit GRBG bayer */
+#define V4L2_PIX_FMT_IPU3_SRGGB10 v4l2_fourcc('i', 'p', '3', 'r') /* IPU3
packed 10-bit RGGB bayer */
/* SDR formats - used only for Software Defined Radio devices */
#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
--
2.7.4
[PATCH 3/3] [media] intel-ipu3: cio2: Add new MIPI-CSI2 driver
This patch adds CIO2 CSI-2 device driver for
Intel's IPU3 camera sub-system support.
The V4L2 fwnode matching depends on the following work:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi>
Signed-off-by: Yong Zhi
---
drivers/media/pci/Kconfig |2 +
drivers/media/pci/Makefile |3 +-
drivers/media/pci/ipu3/Kconfig | 17 +
drivers/media/pci/ipu3/Makefile|1 +
drivers/media/pci/ipu3/ipu3-cio2.c | 1813
drivers/media/pci/ipu3/ipu3-cio2.h | 425 +
6 files changed, 2260 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/pci/ipu3/Kconfig
create mode 100644 drivers/media/pci/ipu3/Makefile
create mode 100644 drivers/media/pci/ipu3/ipu3-cio2.c
create mode 100644 drivers/media/pci/ipu3/ipu3-cio2.h
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index da28e68..63ece75 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -54,5 +54,7 @@ source "drivers/media/pci/smipcie/Kconfig"
source "drivers/media/pci/netup_unidvb/Kconfig"
endif
+source "drivers/media/pci/ipu3/Kconfig"
+
endif #MEDIA_PCI_SUPPORT
endif #PCI
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index a7e8af0..8d5e8db 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -13,7 +13,8 @@ obj-y+= ttpci/ \
ddbridge/ \
saa7146/\
smipcie/\
- netup_unidvb/
+ netup_unidvb/ \
+ ipu3/
obj-$(CONFIG_VIDEO_IVTV) += ivtv/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
diff --git a/drivers/media/pci/ipu3/Kconfig b/drivers/media/pci/ipu3/Kconfig
new file mode 100644
index 000..2a895d6
--- /dev/null
+++ b/drivers/media/pci/ipu3/Kconfig
@@ -0,0 +1,17 @@
+config VIDEO_IPU3_CIO2
+ tristate "Intel ipu3-cio2 driver"
+ depends on VIDEO_V4L2 && PCI
+ depends on MEDIA_CONTROLLER
+ depends on HAS_DMA
+ depends on ACPI
+ select V4L2_FWNODE
+ select VIDEOBUF2_DMA_SG
+
+ ---help---
+ This is the Intel IPU3 CIO2 CSI-2 receiver unit, found in Intel
+ Skylake and Kaby Lake SoCs and used for capturing images and
+ video from a camera sensor.
+
+ Say Y or M here if you have a Skylake/Kaby Lake SoC with MIPI CSI-2
+ connected camera.
+ The module will be called ipu3-cio2.
diff --git a/drivers/media/pci/ipu3/Makefile b/drivers/media/pci/ipu3/Makefile
new file mode 100644
index 000..20186e3
--- /dev/null
+++ b/drivers/media/pci/ipu3/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_IPU3_CIO2) += ipu3-cio2.o
diff --git a/drivers/media/pci/ipu3/ipu3-cio2.c
b/drivers/media/pci/ipu3/ipu3-cio2.c
new file mode 100644
index 000..2b641ad
--- /dev/null
+++ b/drivers/media/pci/ipu3/ipu3-cio2.c
@@ -0,0 +1,1813 @@
+/*
+ * Copyright (c) 2017 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * Based partially on Intel IPU4 driver written by
+ * Sakari Ailus
+ * Samu Onkalo
+ * Jouni Högander
+ * Jouni Ukkonen
+ * Antti Laakso
+ * et al.
+ *
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "ipu3-cio2.h"
+
+MODULE_AUTHOR("Tianshu Qiu ");
+MODULE_AUTHOR("Jian Xu Zheng ");
+MODULE_AUTHOR("Yuning Pu ");
+MODULE_AUTHOR("Tuukka Toivonen ");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("IPU3 CIO2 driver");
+
+/*
+ * These are raw formats used in Intel's third generation of
+ * Image Processing Unit known as IPU3.
+ * 10bit raw bayer packed, 32 bytes for every 25 pixels, last 6 bits unused
+ */
+static const u32 cio2_csi2_fmts[] = {
+ V4L2_PIX_FMT_IPU3_SRGGB10,
+ V4L2_PIX_FMT_IPU3_SGBRG10,
+ V4L2_PIX_FMT_IPU3_SGRBG10,
+ V4L2_PIX_FMT_IPU3_SBGGR10,
+};
+
+static inline u32 cio2_bytesperline(const unsigned int width)
+{
+ /* 64 bytes for every 50 pixels */
+ return DIV_ROUND_UP(width, 50) * 64;
+}
+
+/ FBPT operations /
+
+static void cio2_fbpt_exit_dummy(struct cio2_device *cio2)
+{
+ if (cio2->dummy_lop) {
+ dma_free_noncoherent(&cio2->pci_dev->dev, PAGE_SIZE,
+ cio2->dummy_lop, cio2->dummy_lop_bus_addr);
+ cio2->dummy_lop = NULL;
+ }
+ if (cio2->dummy_page) {
+ dma_free_noncoherent(&cio2->pci_dev->dev, PAGE_SIZE,
+ cio2->dummy_page, cio2->dummy_page_bus_addr);
+
[PATCH 0/3] [media] add IPU3 CIO2 CSI2 driver
This patch adds the driver for the CIO2 device found in some the Skylake and Kaby Kake SoCs. The CIO2 consists of four D-PHY receivers. The CIO2 driver exposes V4L2, V4L2 sub-device and Media controller interfaces to the user space. It depends on Sakari's V4L2 fwnode patchset here: https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi> Yong Zhi (3): [media] videodev2.h, v4l2-ioctl: add IPU3 raw10 color format [media] doc-rst: add IPU3 raw10 bayer pixel format definitions [media] intel-ipu3: cio2: Add new MIPI-CSI2 driver Documentation/media/uapi/v4l/pixfmt-rgb.rst|1 + .../media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 61 + drivers/media/pci/Kconfig |2 + drivers/media/pci/Makefile |3 +- drivers/media/pci/ipu3/Kconfig | 17 + drivers/media/pci/ipu3/Makefile|1 + drivers/media/pci/ipu3/ipu3-cio2.c | 1813 drivers/media/pci/ipu3/ipu3-cio2.h | 425 + drivers/media/v4l2-core/v4l2-ioctl.c |4 + include/uapi/linux/videodev2.h |4 + 10 files changed, 2330 insertions(+), 1 deletion(-) create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst create mode 100644 drivers/media/pci/ipu3/Kconfig create mode 100644 drivers/media/pci/ipu3/Makefile create mode 100644 drivers/media/pci/ipu3/ipu3-cio2.c create mode 100644 drivers/media/pci/ipu3/ipu3-cio2.h -- 2.7.4
[PATCH 2/3] [media] doc-rst: add IPU3 raw10 bayer pixel format definitions
The formats added by this patch are:
V4L2_PIX_FMT_IPU3_SBGGR10
V4L2_PIX_FMT_IPU3_SGBRG10
V4L2_PIX_FMT_IPU3_SGRBG10
V4L2_PIX_FMT_IPU3_SRGGB10
Signed-off-by: Yong Zhi
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst| 1 +
.../media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 61 ++
2 files changed, 62 insertions(+)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index b0f3513..6900d5c 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -16,5 +16,6 @@ RGB Formats
pixfmt-srggb10p
pixfmt-srggb10alaw8
pixfmt-srggb10dpcm8
+pixfmt-srggb10-ipu3
pixfmt-srggb12
pixfmt-srggb16
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
b/Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
new file mode 100644
index 000..8a82f30
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
@@ -0,0 +1,61 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2_PIX_FMT_IPU3_SBGGR10:
+.. _V4L2_PIX_FMT_IPU3_SGBRG10:
+.. _V4L2_PIX_FMT_IPU3_SGRBG10:
+.. _V4L2_PIX_FMT_IPU3_SRGGB10:
+
+**
+V4L2_PIX_FMT_IPU3_SBGGR10 ('ip3b'), V4L2_PIX_FMT_IPU3_SGBRG10 ('ip3g'),
V4L2_PIX_FMT_IPU3_SGRBG10 ('ip3G'), V4L2_PIX_FMT_IPU3_SRGGB10 ('ip3r')
+**
+
+10-bit Bayer formats
+
+Description
+===
+
+These four pixel formats are raw sRGB / Bayer formats with 10 bits per
+sample with every 25 pixels packed to 32 bytes leaving 6 most significant
+bits padding in the last byte. The format is little endian.
+
+In other respects this format is similar to :ref:`V4L2-PIX-FMT-SRGGB10`.
+
+**Byte Order.**
+Each cell is one byte.
+
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns:: |p{1.3cm}|p{1.0cm}|p{10.9cm}|p{10.9cm}|p{10.9cm}|p{1.0cm}|
+
+.. flat-table::
+
+* - start + 0:
+ - B\ :sub:`00low`
+ - G\ :sub:`01low` \ (bits 7--2) B\ :sub:`00high`\ (bits 1--0)
+ - B\ :sub:`02low` \ (bits 7--4) G\ :sub:`01high`\ (bits 3--0)
+ - G\ :sub:`03low` \ (bits 7--6) B\ :sub:`02high`\ (bits 5--0)
+ - G\ :sub:`03high`
+* - start + 5:
+ - G\ :sub:`10low`
+ - R\ :sub:`11low` \ (bits 7--2) G\ :sub:`10high`\ (bits 1--0)
+ - G\ :sub:`12low` \ (bits 7--4) R\ :sub:`11high`\ (bits 3--0)
+ - R\ :sub:`13low` \ (bits 7--6) G\ :sub:`12high`\ (bits 5--0)
+ - R\ :sub:`13high`
+* - start + 10:
+ - B\ :sub:`20low`
+ - G\ :sub:`21low` \ (bits 7--2) B\ :sub:`20high`\ (bits 1--0)
+ - B\ :sub:`22low` \ (bits 7--4) G\ :sub:`21high`\ (bits 3--0)
+ - G\ :sub:`23low` \ (bits 7--6) B\ :sub:`22high`\ (bits 5--0)
+ - G\ :sub:`23high`
+* - start + 15:
+ - G\ :sub:`30low`
+ - R\ :sub:`31low` \ (bits 7--2) G\ :sub:`30high`\ (bits 1--0)
+ - G\ :sub:`32low` \ (bits 7--4) R\ :sub:`31high`\ (bits 3--0)
+ - R\ :sub:`33low` \ (bits 7--6) G\ :sub:`32high`\ (bits 5--0)
+ - R\ :sub:`33high`
+
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
--
2.7.4
Re: [PATCH v8 05/10] media: venus: adding core part and helper functions
Hi, Stan!!
On Fri, Apr 28, 2017 at 12:13:52PM +0300, Stanimir Varbanov wrote:
...
> +int helper_get_bufreq(struct venus_inst *inst, u32 type,
> + struct hfi_buffer_requirements *req)
> +{
> + u32 ptype = HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS;
> + union hfi_get_property hprop;
> + int ret, i;
unsigned int i ? It's an array index...
> +
> + if (req)
> + memset(req, 0, sizeof(*req));
> +
> + ret = hfi_session_get_property(inst, ptype, &hprop);
> + if (ret)
> + return ret;
> +
> + ret = -EINVAL;
> +
> + for (i = 0; i < HFI_BUFFER_TYPE_MAX; i++) {
> + if (hprop.bufreq[i].type != type)
> + continue;
> +
> + if (req)
> + memcpy(req, &hprop.bufreq[i], sizeof(*req));
> + ret = 0;
> + break;
> + }
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(helper_get_bufreq);
As these are global symbols but still specific to a single driver, it'd be
good to have them prefixed with a common prefix. How about "venus"? You
actually already have that in a macro in the header. :-)
> +
> +int helper_set_input_resolution(struct venus_inst *inst, unsigned int width,
> + unsigned int height)
> +{
> + u32 ptype = HFI_PROPERTY_PARAM_FRAME_SIZE;
> + struct hfi_framesize fs;
> +
> + fs.buffer_type = HFI_BUFFER_INPUT;
> + fs.width = width;
> + fs.height = height;
> +
> + return hfi_session_set_property(inst, ptype, &fs);
> +}
> +EXPORT_SYMBOL_GPL(helper_set_input_resolution);
> +
> +int helper_set_output_resolution(struct venus_inst *inst, unsigned int width,
> + unsigned int height)
> +{
> + u32 ptype = HFI_PROPERTY_PARAM_FRAME_SIZE;
> + struct hfi_framesize fs;
> +
> + fs.buffer_type = HFI_BUFFER_OUTPUT;
> + fs.width = width;
> + fs.height = height;
> +
> + return hfi_session_set_property(inst, ptype, &fs);
> +}
> +EXPORT_SYMBOL_GPL(helper_set_output_resolution);
> +
> +int helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs,
> + unsigned int output_bufs)
> +{
> + u32 ptype = HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL;
> + struct hfi_buffer_count_actual buf_count;
> + int ret;
> +
> + buf_count.type = HFI_BUFFER_INPUT;
> + buf_count.count_actual = input_bufs;
> +
> + ret = hfi_session_set_property(inst, ptype, &buf_count);
> + if (ret)
> + return ret;
> +
> + buf_count.type = HFI_BUFFER_OUTPUT;
> + buf_count.count_actual = output_bufs;
> +
> + return hfi_session_set_property(inst, ptype, &buf_count);
> +}
> +EXPORT_SYMBOL_GPL(helper_set_num_bufs);
> +
> +int helper_set_color_format(struct venus_inst *inst, u32 pixfmt)
> +{
> + struct hfi_uncompressed_format_select fmt;
> + u32 ptype = HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT;
> + int ret;
> +
> + if (inst->session_type == VIDC_SESSION_TYPE_DEC)
> + fmt.buffer_type = HFI_BUFFER_OUTPUT;
> + else if (inst->session_type == VIDC_SESSION_TYPE_ENC)
> + fmt.buffer_type = HFI_BUFFER_INPUT;
> + else
> + return -EINVAL;
> +
> + switch (pixfmt) {
> + case V4L2_PIX_FMT_NV12:
> + fmt.format = HFI_COLOR_FORMAT_NV12;
> + break;
> + case V4L2_PIX_FMT_NV21:
> + fmt.format = HFI_COLOR_FORMAT_NV21;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + ret = hfi_session_set_property(inst, ptype, &fmt);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(helper_set_color_format);
> +
> +static void delayed_process_buf_func(struct work_struct *work)
> +{
> + struct venus_buffer *buf, *n;
> + struct venus_inst *inst;
> + int ret;
> +
> + inst = container_of(work, struct venus_inst, delayed_process_work);
> +
> + mutex_lock(&inst->lock);
> +
> + if (!(inst->streamon_out & inst->streamon_cap))
> + goto unlock;
> +
> + list_for_each_entry_safe(buf, n, &inst->delayed_process, ref_list) {
> + if (buf->flags & HFI_BUFFERFLAG_READONLY)
> + continue;
> +
> + ret = session_process_buf(inst, &buf->vb);
> + if (ret)
> + return_buf_error(inst, &buf->vb);
> +
> + list_del_init(&buf->ref_list);
> + }
> +unlock:
> + mutex_unlock(&inst->lock);
> +}
> +
> +void helper_release_buf_ref(struct venus_inst *inst, unsigned int idx)
> +{
> + struct venus_buffer *buf;
> +
> + list_for_each_entry(buf, &inst->registeredbufs, reg_list) {
> + if (buf->vb.vb2_buf.index == idx) {
> + buf->flags &= ~HFI_BUFFERFLAG_READONLY;
> + schedule_work(&inst->delayed_process_work);
> + break;
> + }
> + }
> +}
> +EXPORT_SYMBOL_GPL(helper_release_buf_ref);
> +
> +void helper_acquir
Re: [PATCH 2/2] [media] platform: add video-multiplexer subdevice driver
On 2017-04-29 23:29, Peter Rosin wrote:
> On 2017-04-28 16:13, Philipp Zabel wrote:
>> This driver can handle SoC internal and external video bus multiplexers,
>> controlled by mux controllers provided by the mux controller framework,
>> such as MMIO register bitfields or GPIOs. The subdevice passes through
>> the mbus configuration of the active input to the output side.
>>
>> Signed-off-by: Sascha Hauer
>> Signed-off-by: Philipp Zabel
>> Signed-off-by: Steve Longerbeam
>> ---
>> This has been last sent as part of the i.MX media series.
>>
>> Changes since https://patchwork.kernel.org/patch/9647869/:
>> - Split out the actual mux operation to be provided by the mux controller
>>framework [1]. GPIO and MMIO control can be provided by individual mux
>>controller drivers [2][3].
>>[1] https://patchwork.kernel.org/patch/9695837/
>>[2] https://patchwork.kernel.org/patch/9695839/
>>[3] https://patchwork.kernel.org/patch/9704509/
>> - Shortened 'video-multiplexer' to 'video-mux', replaced all instances of
>>vidsw with video_mux.
>> - Made the mux inactive by default, only activated by user interaction.
>> - Added CONFIG_OF and CONFIG_MULTIPLEXER dependencies.
>> - Reuse subdev.entity.num_pads instead of keeping our own count.
>> - Removed implicit link disabling. Instead, trying to enable a second
>>sink pad link yields -EBUSY.
>> - Merged _async_init into _probe.
>> - Removed superfluous pad index check from _set_format.
>> - Added is_source_pad helper to tell source and sink pads apart.
>> - Removed test for status property in endpoint nodes. Disable the remote
>>device or sever the endpoint link to disable a sink pad.
>> ---
>> drivers/media/platform/Kconfig | 6 +
>> drivers/media/platform/Makefile| 2 +
>> drivers/media/platform/video-mux.c | 341
>> +
>> 3 files changed, 349 insertions(+)
>> create mode 100644 drivers/media/platform/video-mux.c
>>
>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
>> index c9106e105baba..b046a6d39fee5 100644
>> --- a/drivers/media/platform/Kconfig
>> +++ b/drivers/media/platform/Kconfig
>> @@ -74,6 +74,12 @@ config VIDEO_M32R_AR_M64278
>>To compile this driver as a module, choose M here: the
>>module will be called arv.
>>
>> +config VIDEO_MUX
>> +tristate "Video Multiplexer"
>> +depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER &&
>> MULTIPLEXER
>> +help
>> + This driver provides support for N:1 video bus multiplexers.
>> +
>> config VIDEO_OMAP3
>> tristate "OMAP 3 Camera support"
>> depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
>> diff --git a/drivers/media/platform/Makefile
>> b/drivers/media/platform/Makefile
>> index 349ddf6a69da2..fd2735ca3ff75 100644
>> --- a/drivers/media/platform/Makefile
>> +++ b/drivers/media/platform/Makefile
>> @@ -27,6 +27,8 @@ obj-$(CONFIG_VIDEO_SH_VEU) += sh_veu.o
>>
>> obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
>>
>> +obj-$(CONFIG_VIDEO_MUX) += video-mux.o
>> +
>> obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/
>> obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
>> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)+= s5p-jpeg/
>> diff --git a/drivers/media/platform/video-mux.c
>> b/drivers/media/platform/video-mux.c
>> new file mode 100644
>> index 0..419541729f67e
>> --- /dev/null
>> +++ b/drivers/media/platform/video-mux.c
>> @@ -0,0 +1,341 @@
>> +/*
>> + * video stream multiplexer controlled via mux control
>> + *
>> + * Copyright (C) 2013 Pengutronix, Sascha Hauer
>> + * Copyright (C) 2016 Pengutronix, Philipp Zabel
>
> 2017?
>
>> + *
>> + * 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.
>> + */
>> +
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +#include
>> +
>> +struct video_mux {
>> +struct v4l2_subdev subdev;
>> +struct media_pad *pads;
>> +struct v4l2_mbus_framefmt *format_mbus;
>> +struct v4l2_of_endpoint *endpoint;
>> +struct mux_control *mux;
>> +int active;
>> +};
>> +
>> +static inline struct video_mux *v4l2_subdev_to_video_mux(struct v4l2_subdev
>> *sd)
>> +{
>> +return container_of(sd, struct video_mux, subdev);
>> +}
>> +
>> +static inline bool is_source_pad(struct video_mux *vmux, unsigned int pad)
>> +{
>> +return pad == vmux->subdev.entity.num_pads -
Re: [PATCH 2/2] [media] platform: add video-multiplexer subdevice driver
On 2017-04-28 16:13, Philipp Zabel wrote:
> This driver can handle SoC internal and external video bus multiplexers,
> controlled by mux controllers provided by the mux controller framework,
> such as MMIO register bitfields or GPIOs. The subdevice passes through
> the mbus configuration of the active input to the output side.
>
> Signed-off-by: Sascha Hauer
> Signed-off-by: Philipp Zabel
> Signed-off-by: Steve Longerbeam
> ---
> This has been last sent as part of the i.MX media series.
>
> Changes since https://patchwork.kernel.org/patch/9647869/:
> - Split out the actual mux operation to be provided by the mux controller
>framework [1]. GPIO and MMIO control can be provided by individual mux
>controller drivers [2][3].
>[1] https://patchwork.kernel.org/patch/9695837/
>[2] https://patchwork.kernel.org/patch/9695839/
>[3] https://patchwork.kernel.org/patch/9704509/
> - Shortened 'video-multiplexer' to 'video-mux', replaced all instances of
>vidsw with video_mux.
> - Made the mux inactive by default, only activated by user interaction.
> - Added CONFIG_OF and CONFIG_MULTIPLEXER dependencies.
> - Reuse subdev.entity.num_pads instead of keeping our own count.
> - Removed implicit link disabling. Instead, trying to enable a second
>sink pad link yields -EBUSY.
> - Merged _async_init into _probe.
> - Removed superfluous pad index check from _set_format.
> - Added is_source_pad helper to tell source and sink pads apart.
> - Removed test for status property in endpoint nodes. Disable the remote
>device or sever the endpoint link to disable a sink pad.
> ---
> drivers/media/platform/Kconfig | 6 +
> drivers/media/platform/Makefile| 2 +
> drivers/media/platform/video-mux.c | 341
> +
> 3 files changed, 349 insertions(+)
> create mode 100644 drivers/media/platform/video-mux.c
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index c9106e105baba..b046a6d39fee5 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -74,6 +74,12 @@ config VIDEO_M32R_AR_M64278
> To compile this driver as a module, choose M here: the
> module will be called arv.
>
> +config VIDEO_MUX
> + tristate "Video Multiplexer"
> + depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER &&
> MULTIPLEXER
> + help
> + This driver provides support for N:1 video bus multiplexers.
> +
> config VIDEO_OMAP3
> tristate "OMAP 3 Camera support"
> depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 349ddf6a69da2..fd2735ca3ff75 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -27,6 +27,8 @@ obj-$(CONFIG_VIDEO_SH_VEU) += sh_veu.o
>
> obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
>
> +obj-$(CONFIG_VIDEO_MUX) += video-mux.o
> +
> obj-$(CONFIG_VIDEO_S3C_CAMIF)+= s3c-camif/
> obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
> obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/
> diff --git a/drivers/media/platform/video-mux.c
> b/drivers/media/platform/video-mux.c
> new file mode 100644
> index 0..419541729f67e
> --- /dev/null
> +++ b/drivers/media/platform/video-mux.c
> @@ -0,0 +1,341 @@
> +/*
> + * video stream multiplexer controlled via mux control
> + *
> + * Copyright (C) 2013 Pengutronix, Sascha Hauer
> + * Copyright (C) 2016 Pengutronix, Philipp Zabel
2017?
> + *
> + * 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.
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +struct video_mux {
> + struct v4l2_subdev subdev;
> + struct media_pad *pads;
> + struct v4l2_mbus_framefmt *format_mbus;
> + struct v4l2_of_endpoint *endpoint;
> + struct mux_control *mux;
> + int active;
> +};
> +
> +static inline struct video_mux *v4l2_subdev_to_video_mux(struct v4l2_subdev
> *sd)
> +{
> + return container_of(sd, struct video_mux, subdev);
> +}
> +
> +static inline bool is_source_pad(struct video_mux *vmux, unsigned int pad)
> +{
> + return pad == vmux->subdev.entity.num_pads - 1;
> +}
> +
> +static int video_mux_link_setup(struct media_entity *entity,
> + const struct media_pad *local,
> +
[PATCH] ir-lirc-codec: let lirc_dev handle the lirc_buffer (v2)
ir_lirc_register() currently creates its own lirc_buffer before
passing the lirc_driver to lirc_register_driver().
When a module is later unloaded, ir_lirc_unregister() gets called
which performs a call to lirc_unregister_driver() and then free():s
the lirc_buffer.
The problem is that:
a) there can still be a userspace app holding an open lirc fd
when lirc_unregister_driver() returns; and
b) the lirc_buffer contains "wait_queue_head_t wait_poll" which
is potentially used as long as any userspace app is still around.
The result is an oops which can be triggered quite easily by a
userspace app monitoring its lirc fd using epoll() and not closing
the fd promptly on device removal.
The minimalistic fix is to let lirc_dev create the lirc_buffer since
lirc_dev will then also free the buffer once it believes it is safe to
do so.
Version 2: make sure that the allocated buffer is communicated back to
ir-lirc-codec so that ir_lirc_decode() can use it.
CC: sta...@vger.kernel.org
Signed-off-by: David Härdeman
---
drivers/media/rc/ir-lirc-codec.c | 23 +--
drivers/media/rc/lirc_dev.c | 13 -
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index de85f1d7ce43..7b961357d333 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -354,7 +354,6 @@ static const struct file_operations lirc_fops = {
static int ir_lirc_register(struct rc_dev *dev)
{
struct lirc_driver *drv;
- struct lirc_buffer *rbuf;
int rc = -ENOMEM;
unsigned long features = 0;
@@ -362,19 +361,12 @@ static int ir_lirc_register(struct rc_dev *dev)
if (!drv)
return rc;
- rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
- if (!rbuf)
- goto rbuf_alloc_failed;
-
- rc = lirc_buffer_init(rbuf, sizeof(int), LIRCBUF_SIZE);
- if (rc)
- goto rbuf_init_failed;
-
if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
features |= LIRC_CAN_REC_MODE2;
if (dev->rx_resolution)
features |= LIRC_CAN_GET_REC_RESOLUTION;
}
+
if (dev->tx_ir) {
features |= LIRC_CAN_SEND_PULSE;
if (dev->s_tx_mask)
@@ -403,7 +395,7 @@ static int ir_lirc_register(struct rc_dev *dev)
drv->minor = -1;
drv->features = features;
drv->data = &dev->raw->lirc;
- drv->rbuf = rbuf;
+ drv->rbuf = NULL;
drv->set_use_inc = &ir_lirc_open;
drv->set_use_dec = &ir_lirc_close;
drv->code_length = sizeof(struct ir_raw_event) * 8;
@@ -415,19 +407,15 @@ static int ir_lirc_register(struct rc_dev *dev)
drv->minor = lirc_register_driver(drv);
if (drv->minor < 0) {
rc = -ENODEV;
- goto lirc_register_failed;
+ goto out;
}
dev->raw->lirc.drv = drv;
dev->raw->lirc.dev = dev;
return 0;
-lirc_register_failed:
-rbuf_init_failed:
- kfree(rbuf);
-rbuf_alloc_failed:
+out:
kfree(drv);
-
return rc;
}
@@ -436,9 +424,8 @@ static int ir_lirc_unregister(struct rc_dev *dev)
struct lirc_codec *lirc = &dev->raw->lirc;
lirc_unregister_driver(lirc->drv->minor);
- lirc_buffer_free(lirc->drv->rbuf);
- kfree(lirc->drv->rbuf);
kfree(lirc->drv);
+ lirc->drv = NULL;
return 0;
}
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 8d60c9f00df9..42704552b005 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -52,6 +52,7 @@ struct irctl {
struct mutex irctl_lock;
struct lirc_buffer *buf;
+ bool buf_internal;
unsigned int chunk_size;
struct device dev;
@@ -83,7 +84,7 @@ static void lirc_release(struct device *ld)
put_device(ir->dev.parent);
- if (ir->buf != ir->d.rbuf) {
+ if (ir->buf_internal) {
lirc_buffer_free(ir->buf);
kfree(ir->buf);
}
@@ -198,6 +199,7 @@ static int lirc_allocate_buffer(struct irctl *ir)
if (d->rbuf) {
ir->buf = d->rbuf;
+ ir->buf_internal = false;
} else {
ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
if (!ir->buf) {
@@ -208,8 +210,11 @@ static int lirc_allocate_buffer(struct irctl *ir)
err = lirc_buffer_init(ir->buf, chunk_size, buffer_size);
if (err) {
kfree(ir->buf);
+ ir->buf = NULL;
goto out;
}
+
+ ir->buf_internal = true;
}
ir->chunk_size = ir->buf->chunk_size;
@@ -362,6 +367,12 @@ int lirc_register_driver(struct lirc_driver *d)
err = lirc_allocate_buffer(irctls[minor]);
if (err)
Re: [PATCH v8 05/10] media: venus: adding core part and helper functions
On Fri 28 Apr 15:02 PDT 2017, Jordan Crouse wrote:
> On Fri, Apr 28, 2017 at 12:13:52PM +0300, Stanimir Varbanov wrote:
> > +int venus_boot(struct device *parent, struct device *fw_dev)
> > +{
> > + const struct firmware *mdt;
> > + phys_addr_t mem_phys;
> > + ssize_t fw_size;
> > + size_t mem_size;
> > + void *mem_va;
> > + int ret;
> > +
> > + if (!qcom_scm_is_available())
> > + return -EPROBE_DEFER;
> > +
> > + fw_dev->parent = parent;
> > + fw_dev->release = device_release_dummy;
> > +
> > + ret = dev_set_name(fw_dev, "%s:%s", dev_name(parent), "firmware");
> > + if (ret)
> > + return ret;
> > +
> > + ret = device_register(fw_dev);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = of_reserved_mem_device_init_by_idx(fw_dev, parent->of_node, 0);
> > + if (ret)
> > + goto err_unreg_device;
> > +
> > + mem_size = VENUS_FW_MEM_SIZE;
> > +
> > + mem_va = dmam_alloc_coherent(fw_dev, mem_size, &mem_phys, GFP_KERNEL);
> > + if (!mem_va) {
> > + ret = -ENOMEM;
> > + goto err_unreg_device;
> > + }
> > +
> > + ret = request_firmware(&mdt, VENUS_FIRMWARE_NAME, fw_dev);
> > + if (ret < 0)
> > + goto err_unreg_device;
> > +
> > + fw_size = qcom_mdt_get_size(mdt);
> > + if (fw_size < 0) {
> > + ret = fw_size;
> > + release_firmware(mdt);
> > + goto err_unreg_device;
> > + }
> > +
> > + ret = qcom_mdt_load(fw_dev, mdt, VENUS_FIRMWARE_NAME, VENUS_PAS_ID,
> > + mem_va, mem_phys, mem_size);
> > +
> > + release_firmware(mdt);
> > +
> > + if (ret)
> > + goto err_unreg_device;
> > +
> > + ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID);
> > + if (ret)
> > + goto err_unreg_device;
> > +
> > + return 0;
> > +
> > +err_unreg_device:
> > + device_unregister(fw_dev);
> > + return ret;
> > +}
>
> Hey, this looks familiar - almost line for line identical to what we'll need
> to
> do for GPU.
>
> Bjorn - Is this enough to qualify for generic status in the mdt_loader code?
> I know its just two consumers, but it would save 50 or 60 lines of code
> between
> the two drivers and be easier to maintain.
>
I think the code setting up the struct device for memory allocation
should be done during probe of the parent, so that I don't think should
be shared.
The part that allocates memory from a device, loads the mdt into that
memory and calls auth_and_reset() sounds like a useful thing to move to
the mdt_loader.c
Regards,
Bjorn
Re: [PATCH 1/8] arm: omap4: enable CEC pin for Pandaboard A4 and ES
* Tony Lindgren [170428 11:57]: > The pull seems to be enabled in the Android kernel too: > > # rwmem -s16 0x4a10009a > 0x4a10009a = 0x0118 > > So needs to be tested, what's the simplest test to check the CEC? So on droid 4, with the internal pull enabled cec-ctl -m does not show anything. With the internal pull disabled, cec-ctl -m produces the following with a lapdock: Initial Event: State Change: PA: 1.0.0.0, LA mask: 0x4000 Event: State Change: PA: f.f.f.f, LA mask: 0x Event: State Change: PA: 1.0.0.0, LA mask: 0x Transmitted by Specific to Specific (14 to 14): CEC_MSG_POLL Tx, Not Acknowledged (4), Max Retries Event: State Change: PA: 1.0.0.0, LA mask: 0x4000 Transmitted by Specific to all (14 to 15): CEC_MSG_REPORT_FEATURES (0xa6): cec-version: version-2-0 (0x06) all-device-types: switch (0x04) rc-profile: tv-profile-none (0x00) dev-features: 0 (0x00) Transmitted by Specific to all (14 to 15): CEC_MSG_REPORT_PHYSICAL_ADDR (0x84): phys-addr: 1.0.0.0 prim-devtype: processor (0x07) And looking at the ifixit.com board picture, there seems to be a IP4791CZ12 chip on droid 4. And it's docs seem to hint it has a pull in the IP4791CZ12. So yeah my guess is the cec internal pull should be disabled on all omap4 devices with HDMI. I'll send a follow-up patch for that. > Hmm I wonder if disabling the internal pull also allows removing > the "regulator-always-on" hack for hdmi_regulator there? Without > regulator-always-on I noticed that HDMI panel resolutions are not > detected. This I can test easily.. The regulator-fixed is still needed, I think this GPIO regulator powers the IP4791CZ12 which has no control channel. Not sure if we should still have encoder-ip4791cz12.c driver for it just to manage the regulator? Regards, Tony
Re: [PATCH] ir-lirc-codec: let lirc_dev handle the lirc_buffer
On Fri, Apr 28, 2017 at 07:04:09PM +0200, David Härdeman wrote: >ir_lirc_register() currently creates its own lirc_buffer before >passing the lirc_driver to lirc_register_driver(). > >When a module is later unloaded, ir_lirc_unregister() gets called >which performs a call to lirc_unregister_driver() and then free():s >the lirc_buffer. > >The problem is that: > >a) there can still be a userspace app holding an open lirc fd > when lirc_unregister_driver() returns; and > >b) the lirc_buffer contains "wait_queue_head_t wait_poll" which > is potentially used as long as any userspace app is still around. > >The result is an oops which can be triggered quite easily by a >userspace app monitoring its lirc fd using epoll() and not closing >the fd promptly on device removal. > >The minimalistic fix is to let lirc_dev create the lirc_buffer since >lirc_dev will then also free the buffer once it believes it is safe to >do so. Ignore this patch. I missed that ir_lirc_decode() checks dev->raw->lirc.drv->rbuf, so this needs to be reworked. -- David Härdeman
[PATCH V2] staging: atomisp: Add __printf validation and fix fallout
__printf validation adds format and argument validation.
Fix the various broken format/argument mismatches.
Signed-off-by: Joe Perches
---
v2: bah, now without unrelated changes to other staging files...
I'm not at all sure all the modifications are appropriate.
Some maybe should use the original format types like
%x instead of %p with *pointer instead of just pointer
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 +++---
.../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +-
.../css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 2 +-
.../css2400/runtime/debug/interface/ia_css_debug.h| 1 +
.../atomisp2/css2400/runtime/debug/src/ia_css_debug.c | 6 +++---
.../media/atomisp/pci/atomisp2/css2400/sh_css.c | 19 ++-
.../media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +-
.../atomisp/pci/atomisp2/css2400/sh_css_params.c | 10 +-
8 files changed, 25 insertions(+), 23 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
index 0dde8425c67d..4c77e1463aaa 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
@@ -265,9 +265,9 @@ ia_css_translate_dvs_statistics(
assert(isp_stats->hor_proj != NULL);
assert(isp_stats->ver_proj != NULL);
- IA_CSS_ENTER("hproj=%p, vproj=%p, haddr=%x, vaddr=%x",
- host_stats->hor_proj, host_stats->ver_proj,
- isp_stats->hor_proj, isp_stats->ver_proj);
+ IA_CSS_ENTER("hproj=%p, vproj=%p, haddr=%p, vaddr=%p",
+host_stats->hor_proj, host_stats->ver_proj,
+isp_stats->hor_proj, isp_stats->ver_proj);
hor_num_isp = host_stats->grid.aligned_height;
ver_num_isp = host_stats->grid.aligned_width;
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
index 930061d48df7..5ac81f87bfa3 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
@@ -213,7 +213,7 @@ ia_css_translate_dvs2_statistics(
"hor_coefs.even_real=%p, hor_coefs.even_imag=%p, "
"ver_coefs.odd_real=%p, ver_coefs.odd_imag=%p, "
"ver_coefs.even_real=%p, ver_coefs.even_imag=%p, "
-"haddr=%x, vaddr=%x",
+"haddr=%p, vaddr=%p",
host_stats->hor_prod.odd_real, host_stats->hor_prod.odd_imag,
host_stats->hor_prod.even_real, host_stats->hor_prod.even_imag,
host_stats->ver_prod.odd_real, host_stats->ver_prod.odd_imag,
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
index 804c19ab4485..222a7bd7f176 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
@@ -55,7 +55,7 @@ ia_css_tnr_dump(
"tnr_coef", tnr->coef);
ia_css_debug_dtrace(level, "\t%-32s = %d\n",
"tnr_threshold_Y", tnr->threshold_Y);
- ia_css_debug_dtrace(level, "\t%-32s = %d\n"
+ ia_css_debug_dtrace(level, "\t%-32s = %d\n",
"tnr_threshold_C", tnr->threshold_C);
}
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
index be7df3a30c21..91c105cc6204 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
@@ -137,6 +137,7 @@ ia_css_debug_vdtrace(unsigned int level, const char *fmt,
va_list args)
sh_css_vprint(fmt, args);
}
+__printf(2, 3)
extern void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...);
/*! @brief Dump sp thread's stack contents
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
index 030810bd0878..bcc0d464084f 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c
+++
b/drivers/staging/media/atomisp/pci/atomis
[PATCH] staging: atomisp: Add __printf validation and fix fallout
__printf validation adds format and argument validation.
Fix the various broken format/argument mismatches.
Signed-off-by: Joe Perches
---
I'm not at all sure all the modifications are appropriate.
Some maybe should use the original format types like
%x instead of %p with *pointer instead of just pointer
drivers/staging/ks7010/ks_wlan.h | 13 +++--
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 +++---
.../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +-
.../css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 2 +-
.../css2400/runtime/debug/interface/ia_css_debug.h| 1 +
.../atomisp2/css2400/runtime/debug/src/ia_css_debug.c | 6 +++---
.../media/atomisp/pci/atomisp2/css2400/sh_css.c | 19 ++-
.../media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +-
.../atomisp/pci/atomisp2/css2400/sh_css_params.c | 10 +-
9 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
index eb15db90733b..7df01703d861 100644
--- a/drivers/staging/ks7010/ks_wlan.h
+++ b/drivers/staging/ks7010/ks_wlan.h
@@ -35,13 +35,14 @@
#include "ks7010_sdio.h"
#ifdef KS_WLAN_DEBUG
-#define DPRINTK(n, fmt, args...) \
- do { \
- if (KS_WLAN_DEBUG > (n)) \
- pr_notice("%s: "fmt, __func__, ## args); \
- } while (0)
+#define DPRINTK(n, fmt, ...)\
+do {\
+ if (KS_WLAN_DEBUG > (n)) \
+ pr_notice("%s: "fmt, __func__, ##__VA_ARGS__); \
+} while (0)
#else
-#define DPRINTK(n, fmt, args...)
+#define DPRINTK(n, fmt, ...) \
+ no_printk(fmt, ##__VA_ARGS__)
#endif
struct ks_wlan_parameter {
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
index 0dde8425c67d..4c77e1463aaa 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
@@ -265,9 +265,9 @@ ia_css_translate_dvs_statistics(
assert(isp_stats->hor_proj != NULL);
assert(isp_stats->ver_proj != NULL);
- IA_CSS_ENTER("hproj=%p, vproj=%p, haddr=%x, vaddr=%x",
- host_stats->hor_proj, host_stats->ver_proj,
- isp_stats->hor_proj, isp_stats->ver_proj);
+ IA_CSS_ENTER("hproj=%p, vproj=%p, haddr=%p, vaddr=%p",
+host_stats->hor_proj, host_stats->ver_proj,
+isp_stats->hor_proj, isp_stats->ver_proj);
hor_num_isp = host_stats->grid.aligned_height;
ver_num_isp = host_stats->grid.aligned_width;
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
index 930061d48df7..5ac81f87bfa3 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
@@ -213,7 +213,7 @@ ia_css_translate_dvs2_statistics(
"hor_coefs.even_real=%p, hor_coefs.even_imag=%p, "
"ver_coefs.odd_real=%p, ver_coefs.odd_imag=%p, "
"ver_coefs.even_real=%p, ver_coefs.even_imag=%p, "
-"haddr=%x, vaddr=%x",
+"haddr=%p, vaddr=%p",
host_stats->hor_prod.odd_real, host_stats->hor_prod.odd_imag,
host_stats->hor_prod.even_real, host_stats->hor_prod.even_imag,
host_stats->ver_prod.odd_real, host_stats->ver_prod.odd_imag,
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
index 804c19ab4485..222a7bd7f176 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
@@ -55,7 +55,7 @@ ia_css_tnr_dump(
"tnr_coef", tnr->coef);
ia_css_debug_dtrace(level, "\t%-32s = %d\n",
"tnr_threshold_Y", tnr->threshold_Y);
- ia_css_debug_dtrace(level, "\t%-32s = %d\n"
+ ia_css_debug_dtrace(level, "\t%-32s = %d\n",
"tnr_threshold_C", tnr->threshold_C);
}
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h
b/drivers/staging/media/atomisp/pci/atomisp2/c
[PATCH 1/1] [media] mceusb: coding style & comments update for -EPIPE error patches
Cosmetic updates to recent code revisions for better compliance with
https://www.kernel.org/doc/html/latest/process/coding-style.html
This patch depends on an earlier (marked accepted) patch:
[PATCH v2] [media] mceusb: TX -EPIPE (urb status = -32) lockup fix
Signed-off-by: A Sun
---
drivers/media/rc/mceusb.c | 39 ---
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index af46860..66d0be5 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -457,8 +457,11 @@ struct mceusb_dev {
u8 txports_cabled; /* bitmask of transmitters with cable */
u8 rxports_active; /* bitmask of active receive sensors */
- /* async error handler mceusb_deferred_kevent() support
-* via workqueue kworker (previously keventd) threads */
+ /*
+* support for async error handler mceusb_deferred_kevent()
+* where usb_clear_halt(), usb_reset_configuration(),
+* usb_reset_device(), etc. must be done in process context
+*/
struct work_struct kevent;
unsigned long kevent_flags;
# define EVENT_TX_HALT0
@@ -705,11 +708,10 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir,
char *buf,
static void mceusb_defer_kevent(struct mceusb_dev *ir, int kevent)
{
set_bit(kevent, &ir->kevent_flags);
- if (!schedule_work(&ir->kevent)) {
+ if (!schedule_work(&ir->kevent))
dev_err(ir->dev, "kevent %d may have been dropped", kevent);
- } else {
+ else
dev_dbg(ir->dev, "kevent %d scheduled", kevent);
- }
}
static void mce_async_callback(struct urb *urb)
@@ -775,14 +777,13 @@ static void mce_request_packet(struct mceusb_dev *ir,
unsigned char *data,
}
/* outbound data */
- if (usb_endpoint_xfer_int(ir->usb_ep_out)) {
+ if (usb_endpoint_xfer_int(ir->usb_ep_out))
usb_fill_int_urb(async_urb, ir->usbdev, ir->pipe_out,
async_buf, size, mce_async_callback, ir,
ir->usb_ep_out->bInterval);
- } else {
+ else
usb_fill_bulk_urb(async_urb, ir->usbdev, ir->pipe_out,
async_buf, size, mce_async_callback, ir);
- }
memcpy(async_buf, data, size);
dev_dbg(dev, "send request called (size=%#x)", size);
@@ -1225,13 +1226,12 @@ static void mceusb_deferred_kevent(struct work_struct
*work)
}
clear_bit(EVENT_RX_HALT, &ir->kevent_flags);
status = usb_submit_urb(ir->urb_in, GFP_KERNEL);
- if (status < 0) {
+ if (status < 0)
dev_err(ir->dev, "rx unhalt submit urb error %d",
status);
- goto done_rx_halt;
- }
}
done_rx_halt:
+
if (test_bit(EVENT_TX_HALT, &ir->kevent_flags)) {
status = usb_clear_halt(ir->usbdev, ir->pipe_out);
if (status < 0) {
@@ -1242,6 +1242,7 @@ static void mceusb_deferred_kevent(struct work_struct
*work)
clear_bit(EVENT_TX_HALT, &ir->kevent_flags);
}
done_tx_halt:
+
return;
}
@@ -1397,13 +1398,12 @@ static int mceusb_dev_probe(struct usb_interface *intf,
/* Saving usb interface data for use by the transmitter routine */
ir->usb_ep_out = ep_out;
- if (usb_endpoint_xfer_int(ir->usb_ep_out)) {
+ if (usb_endpoint_xfer_int(ir->usb_ep_out))
ir->pipe_out = usb_sndintpipe(ir->usbdev,
ir->usb_ep_out->bEndpointAddress);
- } else {
+ else
ir->pipe_out = usb_sndbulkpipe(ir->usbdev,
ir->usb_ep_out->bEndpointAddress);
- }
if (dev->descriptor.iManufacturer
&& usb_string(dev, dev->descriptor.iManufacturer,
@@ -1415,8 +1415,10 @@ static int mceusb_dev_probe(struct usb_interface *intf,
snprintf(name + strlen(name), sizeof(name) - strlen(name),
" %s", buf);
- /* initialize async USB error handler before registering
-* or activating any mceusb RX and TX functions */
+ /*
+* async USB error handler must initialize before registering
+* or activating any mceusb RX or TX functions
+*/
INIT_WORK(&ir->kevent, mceusb_deferred_kevent);
ir->rc = mceusb_init_rc_dev(ir);
@@ -1424,13 +1426,12 @@ static int mceusb_dev_probe(struct usb_interface *intf,
goto rc_dev_fail;
/* wire up inbound data handler */
- if (usb_endpoint_xfer_int(ep_in)) {
+ if (usb_endpoint_xfer_int(ep_in))
usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in, maxp,
mceusb_dev_recv, ir, ep_in->bInterval)
[PATCH 0/1] [media] mceusb: coding style & comments update, for -EPIPE error patches
Hi Sean,
Thanks for the comments for:
[PATCH v2] [media] mceusb: TX -EPIPE (urb status = -32) lockup fix
I received another email indicating the patch in accepted state, so I'm
following up with a subsequent patch for cosmetic (coding style and comment)
changes to incorporate your review comments.
On 4/27/2017 4:54 PM, Sean Young wrote:
> On Thu, Apr 13, 2017 at 04:06:47AM -0400, A Sun wrote:
>> @@ -1220,16 +1221,28 @@ static void mceusb_deferred_kevent(struct
>> work_struct *work)
>> if (status < 0) {
>> dev_err(ir->dev, "rx clear halt error %d",
>> status);
>> -return;
>> +goto done_rx_halt;
>
> This function can easily be re-written without gotos and it will be
> much more readible.
>
>> }
I've left this goto for now (framework to abort error handling in deeply nested
if statements), since I'm testing the following possible future enhancement:
@@ -1222,7 +1222,15 @@ static void mceusb_deferred_kevent(struc
if (status < 0) {
dev_err(ir->dev, "rx clear halt error %d",
status);
- goto done_rx_halt;
+
+ /* usb_reset_configuration() also resets tx */
+ status = usb_reset_configuration(ir->usbdev);
+ if (status < 0) {
+ dev_err(ir->dev, "rx usb reset configuration
error %d",
+ status);
+ goto done_rx_halt;
+ }
+ clear_bit(EVENT_TX_HALT, &ir->kevent_flags);
}
clear_bit(EVENT_RX_HALT, &ir->kevent_flags);
status = usb_submit_urb(ir->urb_in, GFP_KERNEL);
I have since discovered and observed usb clear halt can fail too during normal
usage while running the non-debug mceusb driver.
Apr 18 00:07:43 raspberrypi kernel: [ 11.627760] Bluetooth: BNEP socket layer
initialized
Apr 18 19:49:22 raspberrypi kernel: [70890.799375] mceusb 1-1.2:1.0: Error: urb
status = -32 (RX HALT)
Apr 18 19:49:22 raspberrypi kernel: [70890.800789] mceusb 1-1.2:1.0: rx clear
halt error -32
This is the only time I saw this over several weeks. I don't know the cause or
condition for replication. So whether 2nd stage error recovery with
usb_reset_configuration() is effective is not yet known.
Thanks, ..A Sun
[PATCH] [RFC] rc-core: report protocol information to userspace
Whether we decide to go for any new keytable ioctl():s or not in rc-core, we
should provide the protocol information of keypresses to userspace.
Note that this means that the RC_TYPE_* definitions become part of the
userspace <-> kernel API/ABI (meaning a full patch should maybe move those
defines under include/uapi).
This would also need to be ack:ed by the input maintainers.
---
drivers/media/rc/rc-main.c |1 +
include/uapi/linux/input-event-codes.h |1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index e0f9b322ab02..a38c1f3569ee 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -773,6 +773,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_type
protocol,
if (new_event && dev->keypressed)
ir_do_keyup(dev, false);
+ input_event(dev->input_dev, EV_MSC, MSC_PROTOCOL, protocol);
input_event(dev->input_dev, EV_MSC, MSC_SCAN, scancode);
if (new_event && keycode != KEY_RESERVED) {
diff --git a/include/uapi/linux/input-event-codes.h
b/include/uapi/linux/input-event-codes.h
index 3af60ee69053..1a8c3554cbcb 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -794,6 +794,7 @@
#define MSC_RAW0x03
#define MSC_SCAN 0x04
#define MSC_TIMESTAMP 0x05
+#define MSC_PROTOCOL 0x06
#define MSC_MAX0x07
#define MSC_CNT(MSC_MAX+1)
[PATCH] rc-core: export the hardware type to sysfs
Exporting the hardware type makes it possible for userspace applications
to know what to expect from the hardware.
This makes it possible to write more user-friendly userspace apps.
Note that the size of sysfs_groups[] in struct rc_dev is not changed
by this patch because it was already large enough for one more group.
Signed-off-by: David Härdeman
---
drivers/media/rc/rc-main.c | 43 +++
1 file changed, 43 insertions(+)
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 85f95441b85b..e0f9b322ab02 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1294,6 +1294,38 @@ static ssize_t store_protocols(struct device *device,
}
/**
+ * show_hwtype() - shows the hardware type in sysfs
+ * @device:the &struct device descriptor
+ * @attr: the &struct device_attribute
+ * @buf: a pointer to the output buffer
+ *
+ * This callback function is used to get the hardware type of an rc device.
+ * It is triggered by reading /sys/class/rc/rc?/hwtype.
+ *
+ * Return: the number of bytes read or a negative error code.
+ */
+static ssize_t show_hwtype(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct rc_dev *dev = to_rc_dev(device);
+
+ switch (dev->driver_type) {
+ case RC_DRIVER_SCANCODE:
+ return sprintf(buf, "scancode\n");
+ case RC_DRIVER_IR_RAW_TX:
+ return sprintf(buf, "ir-tx\n");
+ case RC_DRIVER_IR_RAW:
+ if (dev->tx_ir)
+ return sprintf(buf, "ir-tx-rx\n");
+ else
+ return sprintf(buf, "ir-rx\n");
+ default:
+ return sprintf(buf, "\n");
+ }
+}
+
+/**
* show_filter() - shows the current scancode filter value or mask
* @device:the device descriptor
* @attr: the device attribute struct
@@ -1613,6 +1645,7 @@ static int rc_dev_uevent(struct device *device, struct
kobj_uevent_env *env)
* Static device attribute struct with the sysfs attributes for IR's
*/
static DEVICE_ATTR(protocols, 0644, show_protocols, store_protocols);
+static DEVICE_ATTR(hwtype, 0444, show_hwtype, NULL);
static DEVICE_ATTR(wakeup_protocols, 0644, show_wakeup_protocols,
store_wakeup_protocols);
static RC_FILTER_ATTR(filter, S_IRUGO|S_IWUSR,
@@ -1633,6 +1666,15 @@ static struct attribute_group rc_dev_protocol_attr_grp =
{
.attrs = rc_dev_protocol_attrs,
};
+static struct attribute *rc_dev_hwtype_attrs[] = {
+ &dev_attr_hwtype.attr,
+ NULL,
+};
+
+static struct attribute_group rc_dev_hwtype_attr_grp = {
+ .attrs = rc_dev_hwtype_attrs,
+};
+
static struct attribute *rc_dev_filter_attrs[] = {
&dev_attr_filter.attr.attr,
&dev_attr_filter_mask.attr.attr,
@@ -1863,6 +1905,7 @@ int rc_register_device(struct rc_dev *dev)
dev->sysfs_groups[attr++] = &rc_dev_filter_attr_grp;
if (dev->s_wakeup_filter)
dev->sysfs_groups[attr++] = &rc_dev_wakeup_filter_attr_grp;
+ dev->sysfs_groups[attr++] = &rc_dev_hwtype_attr_grp;
dev->sysfs_groups[attr++] = NULL;
if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
Re: [patch] propagating controls in libv4l2 was Re: support autofocus / autogain in libv4l2
Hi!
> > + devices[index].subdev_fds[0] = SYS_OPEN("/dev/video_sensor", O_RDWR, 0);
> > + devices[index].subdev_fds[1] = SYS_OPEN("/dev/video_focus", O_RDWR, 0);
> > + devices[index].subdev_fds[2] = -1;
>
> Hardcoding names here is not a good idea. Ideally, it should open
> the MC, using the newgen API, and parse the media graph.
>
> The problem is that, even with newgen API, without the properties API
> you likely won't be able to write a generic parser. So, we need a
> plugin specific for OMAP3 (or at least some database that would teach
> a generic plugin about OMAP3 specifics).
>
> I guess that the approach that Jacek was taken were very close to what
> a generic plugin would need:
> https://lwn.net/Articles/619449/
>
> The last version of his patch set is here:
> https://patchwork.linuxtv.org/patch/37496/
>
> I didn't review his patchset, but from what I saw, Sakari is the one
> that found some issues on v7.1 patchset.
>
> Sakari,
>
> Could you shed us a light about why this patchset was not merged?
>
> Are there anything really bad at the code, or just minor issues that
> could be fixed later?
>
> If it is the last case, perhaps we could merge the code, if this
> would make easier for Pavel to work on a N9 solution using the
> same approach.
It would be nice to get some solution here. Camera without libv4l
support is pretty much useless :-(.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
signature.asc
Description: Digital signature
Re: [PATCH 6/6] rc-core: add protocol to EVIOC[GS]KEYCODE_V2 ioctl
On Fri, Apr 28, 2017 at 08:42:13PM +0100, Sean Young wrote: >On Fri, Apr 28, 2017 at 06:59:11PM +0200, David Härdeman wrote: >> On Fri, Apr 28, 2017 at 08:31:33AM -0300, Mauro Carvalho Chehab wrote: >> >Em Thu, 27 Apr 2017 22:34:23 +0200 >> >David Härdeman escreveu: >> ... >> >> This patch changes how the "input_keymap_entry" struct is interpreted >> >> by rc-core by casting it to "rc_keymap_entry": >> >> >> ... >> > >> >Nack. >> >> That's not a very constructive approach. If you have a better approach >> in mind I'm all ears. Because you're surely not suggesting that we stay >> with the current protocol-less approach forever? > >Well, what problem are we trying to solve actually? I'm not sure what the confusion is? Last time around we discussed this there seemed to be general agreement that protocol information is useful? >Looking at the keymaps we have already, there are many scancodes which >overlap and only a few of them use a different protocol. So having this >feature will not suddenly make it possible to load all our keymaps, it >will just make it possible to simultaneously load a few more. That's not really the point, overlaps in scancode && protocol cannot be distinguished. But overlaps in scancode can be. I have remotes which overlap in scancode even though they have different protocols. >> >> That's a gross oversimplification. > >This can be implemented without breaking userspace. How? -- David Härdeman
