mirror of
https://github.com/torvalds/linux
synced 2024-10-21 10:49:43 +00:00
[media] fsl-viu: convert to the control framework
Interestingly enough, the existing control handling code basically did nothing. At least the new code will inherit the controls from the saa7115 driver. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil
Mauro Carvalho Chehab
parent
df3cfa6d92
commit
1fea3d6069
|
|
@ -28,6 +28,7 @@
|
|||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/videobuf-dma-contig.h>
|
||||
|
||||
#define DRV_NAME "fsl_viu"
|
||||
|
|
@ -40,49 +41,6 @@
|
|||
/* I2C address of video decoder chip is 0x4A */
|
||||
#define VIU_VIDEO_DECODER_ADDR 0x25
|
||||
|
||||
/* supported controls */
|
||||
static struct v4l2_queryctrl viu_qctrl[] = {
|
||||
{
|
||||
.id = V4L2_CID_BRIGHTNESS,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "Brightness",
|
||||
.minimum = 0,
|
||||
.maximum = 255,
|
||||
.step = 1,
|
||||
.default_value = 127,
|
||||
.flags = 0,
|
||||
}, {
|
||||
.id = V4L2_CID_CONTRAST,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "Contrast",
|
||||
.minimum = 0,
|
||||
.maximum = 255,
|
||||
.step = 0x1,
|
||||
.default_value = 0x10,
|
||||
.flags = 0,
|
||||
}, {
|
||||
.id = V4L2_CID_SATURATION,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "Saturation",
|
||||
.minimum = 0,
|
||||
.maximum = 255,
|
||||
.step = 0x1,
|
||||
.default_value = 127,
|
||||
.flags = 0,
|
||||
}, {
|
||||
.id = V4L2_CID_HUE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "Hue",
|
||||
.minimum = -128,
|
||||
.maximum = 127,
|
||||
.step = 0x1,
|
||||
.default_value = 0,
|
||||
.flags = 0,
|
||||
}
|
||||
};
|
||||
|
||||
static int qctl_regs[ARRAY_SIZE(viu_qctrl)];
|
||||
|
||||
static int info_level;
|
||||
|
||||
#define dprintk(level, fmt, arg...) \
|
||||
|
|
@ -156,6 +114,7 @@ struct viu_reg {
|
|||
|
||||
struct viu_dev {
|
||||
struct v4l2_device v4l2_dev;
|
||||
struct v4l2_ctrl_handler hdl;
|
||||
struct mutex lock;
|
||||
spinlock_t slock;
|
||||
int users;
|
||||
|
|
@ -1009,51 +968,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Controls */
|
||||
static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
struct v4l2_queryctrl *qc)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
|
||||
if (qc->id && qc->id == viu_qctrl[i].id) {
|
||||
memcpy(qc, &(viu_qctrl[i]), sizeof(*qc));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
|
||||
if (ctrl->id == viu_qctrl[i].id) {
|
||||
ctrl->value = qctl_regs[i];
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++) {
|
||||
if (ctrl->id == viu_qctrl[i].id) {
|
||||
if (ctrl->value < viu_qctrl[i].minimum
|
||||
|| ctrl->value > viu_qctrl[i].maximum)
|
||||
return -ERANGE;
|
||||
qctl_regs[i] = ctrl->value;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
inline void viu_activate_next_buf(struct viu_dev *dev,
|
||||
struct viu_dmaqueue *viuq)
|
||||
{
|
||||
|
|
@ -1265,7 +1179,6 @@ static int viu_open(struct file *file)
|
|||
struct viu_reg *vr;
|
||||
int minor = vdev->minor;
|
||||
u32 status_cfg;
|
||||
int i;
|
||||
|
||||
dprintk(1, "viu: open (minor=%d)\n", minor);
|
||||
|
||||
|
|
@ -1303,10 +1216,6 @@ static int viu_open(struct file *file)
|
|||
dev->crop_current.width = fh->width;
|
||||
dev->crop_current.height = fh->height;
|
||||
|
||||
/* Put all controls at a sane state */
|
||||
for (i = 0; i < ARRAY_SIZE(viu_qctrl); i++)
|
||||
qctl_regs[i] = viu_qctrl[i].default_value;
|
||||
|
||||
dprintk(1, "Open: fh=0x%08lx, dev=0x%08lx, dev->vidq=0x%08lx\n",
|
||||
(unsigned long)fh, (unsigned long)dev,
|
||||
(unsigned long)&dev->vidq);
|
||||
|
|
@ -1463,9 +1372,6 @@ static const struct v4l2_ioctl_ops viu_ioctl_ops = {
|
|||
.vidioc_enum_input = vidioc_enum_input,
|
||||
.vidioc_g_input = vidioc_g_input,
|
||||
.vidioc_s_input = vidioc_s_input,
|
||||
.vidioc_queryctrl = vidioc_queryctrl,
|
||||
.vidioc_g_ctrl = vidioc_g_ctrl,
|
||||
.vidioc_s_ctrl = vidioc_s_ctrl,
|
||||
.vidioc_streamon = vidioc_streamon,
|
||||
.vidioc_streamoff = vidioc_streamoff,
|
||||
};
|
||||
|
|
@ -1543,6 +1449,16 @@ static int viu_of_probe(struct platform_device *op)
|
|||
}
|
||||
|
||||
ad = i2c_get_adapter(0);
|
||||
|
||||
v4l2_ctrl_handler_init(&viu_dev->hdl, 5);
|
||||
if (viu_dev->hdl.error) {
|
||||
ret = viu_dev->hdl.error;
|
||||
dev_err(&op->dev, "couldn't register control\n");
|
||||
goto err_vdev;
|
||||
}
|
||||
/* This control handler will inherit the control(s) from the
|
||||
sub-device(s). */
|
||||
viu_dev->v4l2_dev.ctrl_handler = &viu_dev->hdl;
|
||||
viu_dev->decoder = v4l2_i2c_new_subdev(&viu_dev->v4l2_dev, ad,
|
||||
"saa7113", VIU_VIDEO_DECODER_ADDR, NULL);
|
||||
|
||||
|
|
@ -1614,6 +1530,7 @@ static int viu_of_probe(struct platform_device *op)
|
|||
err_clk:
|
||||
video_unregister_device(viu_dev->vdev);
|
||||
err_vdev:
|
||||
v4l2_ctrl_handler_free(&viu_dev->hdl);
|
||||
mutex_unlock(&viu_dev->lock);
|
||||
i2c_put_adapter(ad);
|
||||
v4l2_device_unregister(&viu_dev->v4l2_dev);
|
||||
|
|
@ -1635,6 +1552,7 @@ static int viu_of_remove(struct platform_device *op)
|
|||
|
||||
clk_disable_unprepare(dev->clk);
|
||||
|
||||
v4l2_ctrl_handler_free(&dev->hdl);
|
||||
video_unregister_device(dev->vdev);
|
||||
i2c_put_adapter(client->adapter);
|
||||
v4l2_device_unregister(&dev->v4l2_dev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue