return ret;
 }
 
+static int tegra_channel_g_edid(struct file *file, void *fh,
+                               struct v4l2_edid *edid)
+{
+       struct tegra_vi_channel *chan = video_drvdata(file);
+       struct v4l2_subdev *subdev;
+
+       subdev = tegra_channel_get_remote_source_subdev(chan);
+       if (!v4l2_subdev_has_op(subdev, pad, get_edid))
+               return -ENOTTY;
+
+       return v4l2_subdev_call(subdev, pad, get_edid, edid);
+}
+
+static int tegra_channel_s_edid(struct file *file, void *fh,
+                               struct v4l2_edid *edid)
+{
+       struct tegra_vi_channel *chan = video_drvdata(file);
+       struct v4l2_subdev *subdev;
+
+       subdev = tegra_channel_get_remote_source_subdev(chan);
+       if (!v4l2_subdev_has_op(subdev, pad, set_edid))
+               return -ENOTTY;
+
+       return v4l2_subdev_call(subdev, pad, set_edid, edid);
+}
+
 static int tegra_channel_g_dv_timings(struct file *file, void *fh,
                                      struct v4l2_dv_timings *timings)
 {
        .vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
        .vidioc_g_selection             = tegra_channel_g_selection,
        .vidioc_s_selection             = tegra_channel_s_selection,
+       .vidioc_g_edid                  = tegra_channel_g_edid,
+       .vidioc_s_edid                  = tegra_channel_s_edid,
        .vidioc_g_dv_timings            = tegra_channel_g_dv_timings,
        .vidioc_s_dv_timings            = tegra_channel_s_dv_timings,
        .vidioc_query_dv_timings        = tegra_channel_query_dv_timings,