AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-03 13:16:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] rcar-vin: fix how pads are handled for v4l2 subdevice operations

Browse Source 
The rcar-vin driver only uses one pad, pad number 0.

- All v4l2 operations that did not check that the requested operation
  was for pad 0 have been updated with a check to enforce this.

- All v4l2 operations that stored (and later restored) the requested pad
  before substituting it for the subdevice pad number have been updated
  to not store the incoming pad and simply restore it to 0 after the
  subdevice operation is complete.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Niklas Söderlund 2017-05-23 21:15:26 -03:00 committed by Mauro Carvalho Chehab
parent b655741f21
commit 831081626f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/platform/rcar-vin/rcar-v4l2.c
View File

@ -550,14 +550,16 @@ static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
{
struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin);
int pad, ret;
int ret;
if (timings->pad)
return -EINVAL;
pad = timings->pad;
timings->pad = vin->sink_pad_idx;
ret = v4l2_subdev_call(sd, pad, enum_dv_timings, timings);
timings->pad = pad;
timings->pad = 0;
return ret;
}
@ -600,14 +602,16 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
{
struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin);
int pad, ret;
int ret;
if (cap->pad)
return -EINVAL;
pad = cap->pad;
cap->pad = vin->sink_pad_idx;
ret = v4l2_subdev_call(sd, pad, dv_timings_cap, cap);
cap->pad = pad;
cap->pad = 0;
return ret;
}
@ -616,17 +620,16 @@ static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
{
struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin);
int input, ret;
int ret;
if (edid->pad)
return -EINVAL;
input = edid->pad;
edid->pad = vin->sink_pad_idx;
ret = v4l2_subdev_call(sd, pad, get_edid, edid);
edid->pad = input;
edid->pad = 0;
return ret;
}
@ -635,17 +638,16 @@ static int rvin_s_edid(struct file *file, void *fh, struct v4l2_edid *edid)
{
struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin);
int input, ret;
int ret;
if (edid->pad)
return -EINVAL;
input = edid->pad;
edid->pad = vin->sink_pad_idx;
ret = v4l2_subdev_call(sd, pad, set_edid, edid);
edid->pad = input;
edid->pad = 0;
return ret;
}