Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5e8c43 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] Fix 64-bit division fall-out from 64-bit control ranges 



Commit 0ba2aeb6 increased the internal control ranges
to 64 bit, but that caused problems in drivers that use the minimum/maximum/step/default_value
control values in a division or modulus operations since not all architectures support
those natively.

Luckily, in almost all cases it is possible to just cast to 32 bits (the control value
is known to be 32 bits, so it is safe to cast). Only in v4l2-ctrls.c was it necessary to
use do_div in one function.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 028e2b4f

drivers/media/i2c/soc_camera/mt9m001.c

+3 −3
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl) 
		if (ctrl->val <= ctrl->default_value) {

			/* Pack it into 0..1 step 0.125, register values 0..8 */

			unsigned long range = ctrl->default_value - ctrl->minimum;

			data = ((ctrl->val - ctrl->minimum) * 8 + range / 2) / range;

			data = ((ctrl->val - (s32)ctrl->minimum) * 8 + range / 2) / range;



			dev_dbg(&client->dev, "Setting gain %d\n", data);

			data = reg_write(client, MT9M001_GLOBAL_GAIN, data);
@@ -413,7 +413,7 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl) 
			/* Pack it into 1.125..15 variable step, register values 9..67 */

			/* We assume qctrl->maximum - qctrl->default_value - 1 > 0 */

			unsigned long range = ctrl->maximum - ctrl->default_value - 1;

			unsigned long gain = ((ctrl->val - ctrl->default_value - 1) *

			unsigned long gain = ((ctrl->val - (s32)ctrl->default_value - 1) *

					       111 + range / 2) / range + 9;



			if (gain <= 32)
@@ -434,7 +434,7 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_EXPOSURE_AUTO:

		if (ctrl->val == V4L2_EXPOSURE_MANUAL) {

			unsigned long range = exp->maximum - exp->minimum;

			unsigned long shutter = ((exp->val - exp->minimum) * 1048 +

			unsigned long shutter = ((exp->val - (s32)exp->minimum) * 1048 +

						 range / 2) / range + 1;



			dev_dbg(&client->dev,

drivers/media/i2c/soc_camera/mt9t031.c

+3 −3
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int mt9t031_s_ctrl(struct v4l2_ctrl *ctrl) 
		if (ctrl->val <= ctrl->default_value) {

			/* Pack it into 0..1 step 0.125, register values 0..8 */

			unsigned long range = ctrl->default_value - ctrl->minimum;

			data = ((ctrl->val - ctrl->minimum) * 8 + range / 2) / range;

			data = ((ctrl->val - (s32)ctrl->minimum) * 8 + range / 2) / range;



			dev_dbg(&client->dev, "Setting gain %d\n", data);

			data = reg_write(client, MT9T031_GLOBAL_GAIN, data);
@@ -485,7 +485,7 @@ static int mt9t031_s_ctrl(struct v4l2_ctrl *ctrl) 
			/* We assume qctrl->maximum - qctrl->default_value - 1 > 0 */

			unsigned long range = ctrl->maximum - ctrl->default_value - 1;

			/* calculated gain: map 65..127 to 9..1024 step 0.125 */

			unsigned long gain = ((ctrl->val - ctrl->default_value - 1) *

			unsigned long gain = ((ctrl->val - (s32)ctrl->default_value - 1) *

					       1015 + range / 2) / range + 9;



			if (gain <= 32)		/* calculated gain 9..32 -> 9..32 */
@@ -507,7 +507,7 @@ static int mt9t031_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_EXPOSURE_AUTO:

		if (ctrl->val == V4L2_EXPOSURE_MANUAL) {

			unsigned int range = exp->maximum - exp->minimum;

			unsigned int shutter = ((exp->val - exp->minimum) * 1048 +

			unsigned int shutter = ((exp->val - (s32)exp->minimum) * 1048 +

						 range / 2) / range + 1;

			u32 old;

drivers/media/i2c/soc_camera/mt9v022.c

+2 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int mt9v022_s_ctrl(struct v4l2_ctrl *ctrl) 
			/* mt9v022 has minimum == default */

			unsigned long range = gain->maximum - gain->minimum;

			/* Valid values 16 to 64, 32 to 64 must be even. */

			unsigned long gain_val = ((gain->val - gain->minimum) *

			unsigned long gain_val = ((gain->val - (s32)gain->minimum) *

					      48 + range / 2) / range + 16;



			if (gain_val >= 32)
@@ -608,7 +608,7 @@ static int mt9v022_s_ctrl(struct v4l2_ctrl *ctrl) 
		} else {

			struct v4l2_ctrl *exp = mt9v022->exposure;

			unsigned long range = exp->maximum - exp->minimum;

			unsigned long shutter = ((exp->val - exp->minimum) *

			unsigned long shutter = ((exp->val - (s32)exp->minimum) *

					479 + range / 2) / range + 1;



			/*

drivers/media/radio/radio-keene.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int keene_s_ctrl(struct v4l2_ctrl *ctrl) 
		return keene_cmd_set(radio);



	case V4L2_CID_AUDIO_COMPRESSION_GAIN:

		radio->tx = db2tx[(ctrl->val - ctrl->minimum) / ctrl->step];

		radio->tx = db2tx[(ctrl->val - (s32)ctrl->minimum) / (s32)ctrl->step];

		return keene_cmd_set(radio);

	}

	return -EINVAL;

drivers/media/usb/gspca/autogain_functions.c

+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ int gspca_coarse_grained_expo_autogain( 
	orig_gain = gain = v4l2_ctrl_g_ctrl(gspca_dev->gain);

	orig_exposure = exposure = v4l2_ctrl_g_ctrl(gspca_dev->exposure);



	gain_low  = (gspca_dev->gain->maximum - gspca_dev->gain->minimum) /

	gain_low  = (s32)(gspca_dev->gain->maximum - gspca_dev->gain->minimum) /

		    5 * 2 + gspca_dev->gain->minimum;

	gain_high = (gspca_dev->gain->maximum - gspca_dev->gain->minimum) /

	gain_high = (s32)(gspca_dev->gain->maximum - gspca_dev->gain->minimum) /

		    5 * 4 + gspca_dev->gain->minimum;



	/* If we are of a multiple of deadzone, do multiple steps to reach the