On Mon, Aug 15, 2016 at 10:48 AM, Hans Verkuil <hverkuil@xxxxxxxxx> wrote: > On 08/15/2016 10:37 AM, Ulrich Hecht wrote: >> On Sat, Aug 13, 2016 at 3:30 PM, Hans Verkuil <hverkuil@xxxxxxxxx> 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@xxxxxxxxx> >>>> --- >>>> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html