Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 15:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] media: davinci: vpif_display: return -ENODATA for *dv_timings calls

Browse Source 
this patch adds suppport to return -ENODATA for *dv_timings calls
if the current output does not support it.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar 2014-05-16 10:33:27 -03:00 committed by Mauro Carvalho Chehab
parent ba1902e32b
commit 1093c5905d
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/media/platform/davinci/vpif_display.c
View File

@ -898,10 +898,21 @@ static int
vpif_enum_dv_timings(struct file *file, void *priv,
struct v4l2_enum_dv_timings *timings)
{
struct vpif_display_config *config = vpif_dev->platform_data;
struct video_device *vdev = video_devdata(file);
struct channel_obj *ch = video_get_drvdata(vdev);
struct vpif_display_chan_config *chan_cfg;
struct v4l2_output output;
int ret;
if (config->chan_config[ch->channel_id].outputs == NULL)
return -ENODATA;
chan_cfg = &config->chan_config[ch->channel_id];
output = chan_cfg->outputs[ch->output_idx].output;
if (output.capabilities != V4L2_OUT_CAP_DV_TIMINGS)
return -ENODATA;
ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
if (ret == -ENOIOCTLCMD || ret == -ENODEV)
return -EINVAL;
@ -917,14 +928,29 @@ vpif_enum_dv_timings(struct file *file, void *priv,
static int vpif_s_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings)
{
struct vpif_display_config *config = vpif_dev->platform_data;
struct video_device *vdev = video_devdata(file);
struct channel_obj *ch = video_get_drvdata(vdev);
struct vpif_params *vpifparams = &ch->vpifparams;
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
struct vpif_channel_config_params *std_info = &vpifparams->std_info;
struct video_obj *vid_ch = &ch->video;
struct v4l2_bt_timings *bt = &vid_ch->dv_timings.bt;
struct vpif_display_chan_config *chan_cfg;
struct v4l2_output output;
int ret;
if (config->chan_config[ch->channel_id].outputs == NULL)
return -ENODATA;
chan_cfg = &config->chan_config[ch->channel_id];
output = chan_cfg->outputs[ch->output_idx].output;
if (output.capabilities != V4L2_OUT_CAP_DV_TIMINGS)
return -ENODATA;
if (vb2_is_busy(&common->buffer_queue))
return -EBUSY;
if (timings->type != V4L2_DV_BT_656_1120) {
vpif_dbg(2, debug, "Timing type not defined\n");
return -EINVAL;
@ -1006,13 +1032,27 @@ static int vpif_s_dv_timings(struct file *file, void *priv,
static int vpif_g_dv_timings(struct file *file, void *priv,
struct v4l2_dv_timings *timings)
{
struct vpif_display_config *config = vpif_dev->platform_data;
struct video_device *vdev = video_devdata(file);
struct channel_obj *ch = video_get_drvdata(vdev);
struct vpif_display_chan_config *chan_cfg;
struct video_obj *vid_ch = &ch->video;
struct v4l2_output output;
if (config->chan_config[ch->channel_id].outputs == NULL)
goto error;
chan_cfg = &config->chan_config[ch->channel_id];
output = chan_cfg->outputs[ch->output_idx].output;
if (output.capabilities != V4L2_OUT_CAP_DV_TIMINGS)
goto error;
*timings = vid_ch->dv_timings;
return 0;
error:
return -ENODATA;
}
/*