target/linux/brcm2708/patches-3.10/0134-V4L2-Fix-ISO-controls.patch

   1 From e4dc7a4bf88ca8e70f604b5d26335911073e5238 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dsteve@broadcom.com>
   3 Date: Mon, 9 Dec 2013 15:30:48 +0000
   4 Subject: [PATCH 134/196] V4L2: Fix ISO controls.
   5
   6 Driver was passing the index to the GPU, and not the desired
   7 ISO value.
   8
   9 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  10 ---
  11  drivers/media/platform/bcm2835/controls.c | 21 ++++++++++++++++++++-
  12  1 file changed, 20 insertions(+), 1 deletion(-)
  13
  14 diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
  15 index c2e4c64..92863f7 100644
  16 --- a/drivers/media/platform/bcm2835/controls.c
  17 +++ b/drivers/media/platform/bcm2835/controls.c
  18 @@ -178,6 +178,25 @@ static int ctrl_set_value(struct bm2835_mmal_dev *dev,
  19                                              &u32_value, sizeof(u32_value));
  20  }
  21
  22 +static int ctrl_set_value_menu(struct bm2835_mmal_dev *dev,
  23 +                     struct v4l2_ctrl *ctrl,
  24 +                     const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
  25 +{
  26 +       u32 u32_value;
  27 +       struct vchiq_mmal_port *control;
  28 +
  29 +       if (ctrl->val > mmal_ctrl->max || ctrl->val < mmal_ctrl->min)
  30 +               return 1;
  31 +
  32 +       control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
  33 +
  34 +       u32_value = mmal_ctrl->imenu[ctrl->val];
  35 +
  36 +       return vchiq_mmal_port_parameter_set(dev->instance, control,
  37 +                                            mmal_ctrl->mmal_id,
  38 +                                            &u32_value, sizeof(u32_value));
  39 +}
  40 +
  41  static int ctrl_set_value_ev(struct bm2835_mmal_dev *dev,
  42                       struct v4l2_ctrl *ctrl,
  43                       const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
  44 @@ -601,7 +620,7 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
  45         {
  46                 V4L2_CID_ISO_SENSITIVITY, MMAL_CONTROL_TYPE_INT_MENU,
  47                 0, ARRAY_SIZE(iso_qmenu) - 1, 0, 1, iso_qmenu,
  48 -               MMAL_PARAMETER_ISO, &ctrl_set_value
  49 +               MMAL_PARAMETER_ISO, &ctrl_set_value_menu
  50         },
  51         {
  52                 V4L2_CID_IMAGE_STABILIZATION, MMAL_CONTROL_TYPE_STD,
  53 --
  54 1.9.1
  55