* [PATCH v6 0/4] Lager/Koelsch board HDMI input support
@ 2016-07-22 9:09 Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 1/4] media: adv7604: automatic "default-input" selection Ulrich Hecht
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Ulrich Hecht @ 2016-07-22 9:09 UTC (permalink / raw)
To: hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert, Ulrich Hecht
Hi!
This revision implements the pad translation between rcar-vin and subdevices
as suggested by Niklas. It also moves around the i2c devices, following the
introduction of i2c multiplexing in the Gen2 device trees.
Based on renesas-drivers-2016-07-19-v4.7-rc7.
CU
Uli
Changes since v5:
- implement vin/subdev pad translation
- move i2c devices
Changes since v4:
- drop merged patches
- adv7604: always fall back to input 0 if nothing else is specified
- rcar-vin: implement G_EDID, S_EDID in place of hard-coded EDID blob
Changes since v3:
- rvin_enum_dv_timings(): use vin->src_pad_idx
- rvin_dv_timings_cap(): likewise
- rvin_s_dv_timings(): update vin->format
- add Koelsch support
Changes since v2:
- rebased on top of rcar-vin driver v4
- removed "adv7604: fix SPA register location for ADV7612" (picked up)
- changed prefix of dts patch to "ARM: dts: lager: "
Hans Verkuil (1):
ARM: dts: koelsch: add HDMI input
Ulrich Hecht (2):
media: adv7604: automatic "default-input" selection
rcar-vin: implement EDID control ioctls
William Towle (1):
ARM: dts: lager: Add entries for VIN HDMI input support
arch/arm/boot/dts/r8a7790-lager.dts | 39 +++++++++++++++++++++++++++
arch/arm/boot/dts/r8a7791-koelsch.dts | 41 +++++++++++++++++++++++++++++
drivers/media/i2c/adv7604.c | 5 +++-
drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++
4 files changed, 117 insertions(+), 1 deletion(-)
--
2.7.4
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v6 1/4] media: adv7604: automatic "default-input" selection
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
@ 2016-07-22 9:09 ` Ulrich Hecht
2016-07-22 19:50 ` Sergei Shtylyov
2016-07-22 9:09 ` [PATCH v6 2/4] ARM: dts: lager: Add entries for VIN HDMI input support Ulrich Hecht
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Ulrich Hecht @ 2016-07-22 9:09 UTC (permalink / raw)
To: hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert, Ulrich Hecht
Fall back to input 0 if "default-input" property is not present.
Additionally, documentation in commit bf9c82278c34 ("[media]
media: adv7604: ability to read default input port from DT") states
that the "default-input" property should reside directly in the node
for adv7612. Hence, also adjust the parsing to make the implementation
consistent with this.
Based on patch by William Towle <william.towle@codethink.co.uk>.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
drivers/media/i2c/adv7604.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 4003831..055c9df 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3077,10 +3077,13 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
if (!of_property_read_u32(endpoint, "default-input", &v))
state->pdata.default_input = v;
else
- state->pdata.default_input = -1;
+ state->pdata.default_input = 0;
of_node_put(endpoint);
+ if (!of_property_read_u32(np, "default-input", &v))
+ state->pdata.default_input = v;
+
flags = bus_cfg.bus.parallel.flags;
if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 2/4] ARM: dts: lager: Add entries for VIN HDMI input support
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 1/4] media: adv7604: automatic "default-input" selection Ulrich Hecht
@ 2016-07-22 9:09 ` Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 3/4] ARM: dts: koelsch: add HDMI input Ulrich Hecht
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Ulrich Hecht @ 2016-07-22 9:09 UTC (permalink / raw)
To: hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert, Rob Taylor, Ulrich Hecht
From: William Towle <william.towle@codethink.co.uk>
Add DT entries for vin0, vin0_pins, and adv7612.
Sets the 'default-input' property for ADV7612, enabling image and video
capture without the need to have userspace specifying routing.
Signed-off-by: William Towle <william.towle@codethink.co.uk>
Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
[uli: added interrupt, renamed endpoint, merged default-input]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 39 +++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index ffc2f4e..16e86d0 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -374,6 +374,21 @@
};
};
};
+
+ hdmi-in@4c {
+ compatible = "adi,adv7612";
+ reg = <0x4c>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+ remote = <&vin0>;
+ default-input = <0>;
+
+ port {
+ adv7612: endpoint {
+ remote-endpoint = <&vin0ep0>;
+ };
+ };
+ };
};
/*
@@ -587,6 +602,11 @@
function = "usb2";
};
+ vin0_pins: vin0 {
+ groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";
+ function = "vin0";
+ };
+
vin1_pins: vin1 {
groups = "vin1_data8", "vin1_clk";
function = "vin1";
@@ -818,6 +838,25 @@
status = "okay";
};
+/* HDMI video input */
+&vin0 {
+ pinctrl-0 = <&vin0_pins>;
+ pinctrl-names = "default";
+
+ status = "ok";
+
+ port {
+ vin0ep0: endpoint {
+ remote-endpoint = <&adv7612>;
+ bus-width = <24>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ pclk-sample = <1>;
+ data-active = <1>;
+ };
+ };
+};
+
/* composite video input */
&vin1 {
pinctrl-0 = <&vin1_pins>;
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 3/4] ARM: dts: koelsch: add HDMI input
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 1/4] media: adv7604: automatic "default-input" selection Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 2/4] ARM: dts: lager: Add entries for VIN HDMI input support Ulrich Hecht
@ 2016-07-22 9:09 ` Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 4/4] rcar-vin: implement EDID control ioctls Ulrich Hecht
2016-07-22 9:37 ` [PATCH v6 0/4] Lager/Koelsch board HDMI input support Hans Verkuil
4 siblings, 0 replies; 11+ messages in thread
From: Ulrich Hecht @ 2016-07-22 9:09 UTC (permalink / raw)
To: hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert, Hans Verkuil, Ulrich Hecht
From: Hans Verkuil <hverkuil@xs4all.nl>
Add support in the dts for the HDMI input. Based on the Lager dts
patch from Ulrich Hecht.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
[uli: removed "renesas," prefixes from pfc nodes]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 41 +++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 980f41b..28ec3a8 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -400,6 +400,21 @@
};
};
+ hdmi-in@4c {
+ compatible = "adi,adv7612";
+ reg = <0x4c>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+ remote = <&vin0>;
+ default-input = <0>;
+
+ port {
+ adv7612: endpoint {
+ remote-endpoint = <&vin0ep>;
+ };
+ };
+ };
+
eeprom@50 {
compatible = "renesas,24c02";
reg = <0x50>;
@@ -534,6 +549,11 @@
function = "usb1";
};
+ vin0_pins: vin0 {
+ groups = "vin0_data24", "vin0_sync", "vin0_clkenb", "vin0_clk";
+ function = "vin0";
+ };
+
vin1_pins: vin1 {
groups = "vin1_data8", "vin1_clk";
function = "vin1";
@@ -765,6 +785,27 @@
cpu0-supply = <&vdd_dvfs>;
};
+/* HDMI video input */
+&vin0 {
+ status = "okay";
+ pinctrl-0 = <&vin0_pins>;
+ pinctrl-names = "default";
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ vin0ep: endpoint {
+ remote-endpoint = <&adv7612>;
+ bus-width = <24>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ pclk-sample = <1>;
+ data-active = <1>;
+ };
+ };
+};
+
/* composite video input */
&vin1 {
status = "okay";
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v6 4/4] rcar-vin: implement EDID control ioctls
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
` (2 preceding siblings ...)
2016-07-22 9:09 ` [PATCH v6 3/4] ARM: dts: koelsch: add HDMI input Ulrich Hecht
@ 2016-07-22 9:09 ` Ulrich Hecht
2016-08-13 13:30 ` Hans Verkuil
2016-07-22 9:37 ` [PATCH v6 0/4] Lager/Koelsch board HDMI input support Hans Verkuil
4 siblings, 1 reply; 11+ messages in thread
From: Ulrich Hecht @ 2016-07-22 9:09 UTC (permalink / raw)
To: hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert, Ulrich Hecht
Adds G_EDID and S_EDID.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 396eabc..57e040c 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -661,6 +661,36 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
return ret;
}
+static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
+{
+ struct rvin_dev *vin = video_drvdata(file);
+ int input, ret;
+
+ input = edid->pad;
+ edid->pad = vin->inputs[input].sink_idx;
+
+ ret = rvin_subdev_call(vin, pad, get_edid, edid);
+
+ edid->pad = input;
+
+ return ret;
+}
+
+static int rvin_s_edid(struct file *file, void *fh, struct v4l2_edid *edid)
+{
+ struct rvin_dev *vin = video_drvdata(file);
+ int input, ret;
+
+ input = edid->pad;
+ edid->pad = vin->inputs[input].sink_idx;
+
+ ret = rvin_subdev_call(vin, pad, set_edid, edid);
+
+ edid->pad = input;
+
+ return ret;
+}
+
static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
.vidioc_querycap = rvin_querycap,
.vidioc_try_fmt_vid_cap = rvin_try_fmt_vid_cap,
@@ -683,6 +713,9 @@ static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
.vidioc_s_dv_timings = rvin_s_dv_timings,
.vidioc_query_dv_timings = rvin_query_dv_timings,
+ .vidioc_g_edid = rvin_g_edid,
+ .vidioc_s_edid = rvin_s_edid,
+
.vidioc_querystd = rvin_querystd,
.vidioc_g_std = rvin_g_std,
.vidioc_s_std = rvin_s_std,
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v6 0/4] Lager/Koelsch board HDMI input support
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
` (3 preceding siblings ...)
2016-07-22 9:09 ` [PATCH v6 4/4] rcar-vin: implement EDID control ioctls Ulrich Hecht
@ 2016-07-22 9:37 ` Hans Verkuil
4 siblings, 0 replies; 11+ messages in thread
From: Hans Verkuil @ 2016-07-22 9:37 UTC (permalink / raw)
To: Ulrich Hecht, hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert
Looks good to me. I plan to queue this for 4.9.
Regards,
Hans
On 07/22/2016 11:09 AM, Ulrich Hecht wrote:
> Hi!
>
> This revision implements the pad translation between rcar-vin and subdevices
> as suggested by Niklas. It also moves around the i2c devices, following the
> introduction of i2c multiplexing in the Gen2 device trees.
>
> Based on renesas-drivers-2016-07-19-v4.7-rc7.
>
> CU
> Uli
>
>
> Changes since v5:
> - implement vin/subdev pad translation
> - move i2c devices
>
> Changes since v4:
> - drop merged patches
> - adv7604: always fall back to input 0 if nothing else is specified
> - rcar-vin: implement G_EDID, S_EDID in place of hard-coded EDID blob
>
> Changes since v3:
> - rvin_enum_dv_timings(): use vin->src_pad_idx
> - rvin_dv_timings_cap(): likewise
> - rvin_s_dv_timings(): update vin->format
> - add Koelsch support
>
> Changes since v2:
> - rebased on top of rcar-vin driver v4
> - removed "adv7604: fix SPA register location for ADV7612" (picked up)
> - changed prefix of dts patch to "ARM: dts: lager: "
>
>
> Hans Verkuil (1):
> ARM: dts: koelsch: add HDMI input
>
> Ulrich Hecht (2):
> media: adv7604: automatic "default-input" selection
> rcar-vin: implement EDID control ioctls
>
> William Towle (1):
> ARM: dts: lager: Add entries for VIN HDMI input support
>
> arch/arm/boot/dts/r8a7790-lager.dts | 39 +++++++++++++++++++++++++++
> arch/arm/boot/dts/r8a7791-koelsch.dts | 41 +++++++++++++++++++++++++++++
> drivers/media/i2c/adv7604.c | 5 +++-
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++
> 4 files changed, 117 insertions(+), 1 deletion(-)
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 1/4] media: adv7604: automatic "default-input" selection
2016-07-22 9:09 ` [PATCH v6 1/4] media: adv7604: automatic "default-input" selection Ulrich Hecht
@ 2016-07-22 19:50 ` Sergei Shtylyov
0 siblings, 0 replies; 11+ messages in thread
From: Sergei Shtylyov @ 2016-07-22 19:50 UTC (permalink / raw)
To: Ulrich Hecht, hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert
On 07/22/2016 12:09 PM, Ulrich Hecht wrote:
> Fall back to input 0 if "default-input" property is not present.
>
> Additionally, documentation in commit bf9c82278c34 ("[media]
> media: adv7604: ability to read default input port from DT") states
> that the "default-input" property should reside directly in the node
> for adv7612. Hence, also adjust the parsing to make the implementation
> consistent with this.
>
> Based on patch by William Towle <william.towle@codethink.co.uk>.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
> drivers/media/i2c/adv7604.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
> index 4003831..055c9df 100644
> --- a/drivers/media/i2c/adv7604.c
> +++ b/drivers/media/i2c/adv7604.c
> @@ -3077,10 +3077,13 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
> if (!of_property_read_u32(endpoint, "default-input", &v))
> state->pdata.default_input = v;
> else
> - state->pdata.default_input = -1;
> + state->pdata.default_input = 0;
>
> of_node_put(endpoint);
>
> + if (!of_property_read_u32(np, "default-input", &v))
> + state->pdata.default_input = v;
of_property_read_u32(np, "default-input",
&state->pdata.default_input));
should be equivalent...
MBR, Sergei
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 4/4] rcar-vin: implement EDID control ioctls
2016-07-22 9:09 ` [PATCH v6 4/4] rcar-vin: implement EDID control ioctls Ulrich Hecht
@ 2016-08-13 13:30 ` Hans Verkuil
2016-08-15 8:37 ` Ulrich Hecht
0 siblings, 1 reply; 11+ messages in thread
From: Hans Verkuil @ 2016-08-13 13:30 UTC (permalink / raw)
To: Ulrich Hecht, hans.verkuil, niklas.soderlund
Cc: linux-media, linux-renesas-soc, magnus.damm, laurent.pinchart,
william.towle, geert
On 07/22/2016 11:09 AM, Ulrich Hecht wrote:
> Adds G_EDID and S_EDID.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> index 396eabc..57e040c 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -661,6 +661,36 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
> return ret;
> }
>
> +static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + int input, ret;
> +
> + input = edid->pad;
> + edid->pad = vin->inputs[input].sink_idx;
There is no vin->inputs array. Are there some other patches that need to be merged
first?
Anyway, it would be good if you can post a rebased v7, I had to manually update
one or two other patches from this series as well to make them apply so a new patch
series would be helpful.
Regards,
Hans
> +
> + ret = rvin_subdev_call(vin, pad, get_edid, edid);
> +
> + edid->pad = input;
> +
> + return ret;
> +}
> +
> +static int rvin_s_edid(struct file *file, void *fh, struct v4l2_edid *edid)
> +{
> + struct rvin_dev *vin = video_drvdata(file);
> + int input, ret;
> +
> + input = edid->pad;
> + edid->pad = vin->inputs[input].sink_idx;
> +
> + ret = rvin_subdev_call(vin, pad, set_edid, edid);
> +
> + edid->pad = input;
> +
> + return ret;
> +}
> +
> static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
> .vidioc_querycap = rvin_querycap,
> .vidioc_try_fmt_vid_cap = rvin_try_fmt_vid_cap,
> @@ -683,6 +713,9 @@ static const struct v4l2_ioctl_ops rvin_ioctl_ops = {
> .vidioc_s_dv_timings = rvin_s_dv_timings,
> .vidioc_query_dv_timings = rvin_query_dv_timings,
>
> + .vidioc_g_edid = rvin_g_edid,
> + .vidioc_s_edid = rvin_s_edid,
> +
> .vidioc_querystd = rvin_querystd,
> .vidioc_g_std = rvin_g_std,
> .vidioc_s_std = rvin_s_std,
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 4/4] rcar-vin: implement EDID control ioctls
2016-08-13 13:30 ` Hans Verkuil
@ 2016-08-15 8:37 ` Ulrich Hecht
2016-08-15 8:48 ` Hans Verkuil
0 siblings, 1 reply; 11+ messages in thread
From: Ulrich Hecht @ 2016-08-15 8:37 UTC (permalink / raw)
To: Hans Verkuil
Cc: hans.verkuil, Niklas Söderlund, Linux Media Mailing List,
Linux-Renesas, Magnus Damm, Laurent, William Towle,
Geert Uytterhoeven
On Sat, Aug 13, 2016 at 3:30 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> On 07/22/2016 11:09 AM, Ulrich Hecht wrote:
>> Adds G_EDID and S_EDID.
>>
>> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>> ---
>> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++++++++
>> 1 file changed, 33 insertions(+)
>>
>> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>> index 396eabc..57e040c 100644
>> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
>> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>> @@ -661,6 +661,36 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
>> return ret;
>> }
>>
>> +static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
>> +{
>> + struct rvin_dev *vin = video_drvdata(file);
>> + int input, ret;
>> +
>> + input = edid->pad;
>> + edid->pad = vin->inputs[input].sink_idx;
>
> There is no vin->inputs array. Are there some other patches that need to be merged
> first?
It depends on "[PATCHv2 12/16] [media] rcar-vin: allow subdevices to
be bound late" from "[PATCHv2 00/16] rcar-vin: Enable Gen3 support".
Does that series have a chance of getting merged any time soon?
CU
Uli
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 4/4] rcar-vin: implement EDID control ioctls
2016-08-15 8:37 ` Ulrich Hecht
@ 2016-08-15 8:48 ` Hans Verkuil
2016-08-15 9:16 ` Ulrich Hecht
0 siblings, 1 reply; 11+ messages in thread
From: Hans Verkuil @ 2016-08-15 8:48 UTC (permalink / raw)
To: Ulrich Hecht
Cc: hans.verkuil, Niklas Söderlund, Linux Media Mailing List,
Linux-Renesas, Magnus Damm, Laurent, William Towle,
Geert Uytterhoeven
On 08/15/2016 10:37 AM, Ulrich Hecht wrote:
> On Sat, Aug 13, 2016 at 3:30 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>> On 07/22/2016 11:09 AM, Ulrich Hecht wrote:
>>> Adds G_EDID and S_EDID.
>>>
>>> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>>> ---
>>> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++++++++
>>> 1 file changed, 33 insertions(+)
>>>
>>> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>> index 396eabc..57e040c 100644
>>> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>> @@ -661,6 +661,36 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
>>> return ret;
>>> }
>>>
>>> +static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
>>> +{
>>> + struct rvin_dev *vin = video_drvdata(file);
>>> + int input, ret;
>>> +
>>> + input = edid->pad;
>>> + edid->pad = vin->inputs[input].sink_idx;
>>
>> There is no vin->inputs array. Are there some other patches that need to be merged
>> first?
>
> It depends on "[PATCHv2 12/16] [media] rcar-vin: allow subdevices to
> be bound late" from "[PATCHv2 00/16] rcar-vin: Enable Gen3 support".
> Does that series have a chance of getting merged any time soon?
I hope to review it today or Friday.
Can you repost anyway: the dts patches don't apply cleanly anymore, and
I prefer that you fix that. I want to avoid making a mistake when I fix them up.
Regards,
Hans
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 4/4] rcar-vin: implement EDID control ioctls
2016-08-15 8:48 ` Hans Verkuil
@ 2016-08-15 9:16 ` Ulrich Hecht
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Hecht @ 2016-08-15 9:16 UTC (permalink / raw)
To: Hans Verkuil
Cc: hans.verkuil, Niklas Söderlund, Linux Media Mailing List,
Linux-Renesas, Magnus Damm, Laurent, William Towle,
Geert Uytterhoeven
On Mon, Aug 15, 2016 at 10:48 AM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> On 08/15/2016 10:37 AM, Ulrich Hecht wrote:
>> On Sat, Aug 13, 2016 at 3:30 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>>> On 07/22/2016 11:09 AM, Ulrich Hecht wrote:
>>>> Adds G_EDID and S_EDID.
>>>>
>>>> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>>>> ---
>>>> drivers/media/platform/rcar-vin/rcar-v4l2.c | 33 +++++++++++++++++++++++++++++
>>>> 1 file changed, 33 insertions(+)
>>>>
>>>> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>>> index 396eabc..57e040c 100644
>>>> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>>> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
>>>> @@ -661,6 +661,36 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
>>>> return ret;
>>>> }
>>>>
>>>> +static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
>>>> +{
>>>> + struct rvin_dev *vin = video_drvdata(file);
>>>> + int input, ret;
>>>> +
>>>> + input = edid->pad;
>>>> + edid->pad = vin->inputs[input].sink_idx;
>>>
>>> There is no vin->inputs array. Are there some other patches that need to be merged
>>> first?
>>
>> It depends on "[PATCHv2 12/16] [media] rcar-vin: allow subdevices to
>> be bound late" from "[PATCHv2 00/16] rcar-vin: Enable Gen3 support".
>> Does that series have a chance of getting merged any time soon?
>
> I hope to review it today or Friday.
>
> Can you repost anyway: the dts patches don't apply cleanly anymore, and
> I prefer that you fix that. I want to avoid making a mistake when I fix them up.
The patches are current, but they depend on changes in the
renesas-drivers tree not upstream yet.
Should we perhaps split this series into code and DT?
CU
Uli
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-08-15 9:16 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-22 9:09 [PATCH v6 0/4] Lager/Koelsch board HDMI input support Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 1/4] media: adv7604: automatic "default-input" selection Ulrich Hecht
2016-07-22 19:50 ` Sergei Shtylyov
2016-07-22 9:09 ` [PATCH v6 2/4] ARM: dts: lager: Add entries for VIN HDMI input support Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 3/4] ARM: dts: koelsch: add HDMI input Ulrich Hecht
2016-07-22 9:09 ` [PATCH v6 4/4] rcar-vin: implement EDID control ioctls Ulrich Hecht
2016-08-13 13:30 ` Hans Verkuil
2016-08-15 8:37 ` Ulrich Hecht
2016-08-15 8:48 ` Hans Verkuil
2016-08-15 9:16 ` Ulrich Hecht
2016-07-22 9:37 ` [PATCH v6 0/4] Lager/Koelsch board HDMI input support Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).