Commit 7821a603 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

media: atomisp: Remove crop_needs_override from atomisp_set_fmt()

Remove the crop_needs_override local helper variable from
atomisp_set_fmt(), as it always is true now.

Link: https://lore.kernel.org/r/20230221145906.8113-5-hdegoede@redhat.comSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 9fd4b208
...@@ -4629,13 +4629,13 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) ...@@ -4629,13 +4629,13 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
struct v4l2_pix_format backup_fmt, s_fmt; struct v4l2_pix_format backup_fmt, s_fmt;
unsigned int dvs_env_w = 0, dvs_env_h = 0; unsigned int dvs_env_w = 0, dvs_env_h = 0;
unsigned int padding_w = pad_w, padding_h = pad_h; unsigned int padding_w = pad_w, padding_h = pad_h;
bool res_overflow = false, crop_needs_override = false;
struct v4l2_mbus_framefmt isp_source_fmt = {0}; struct v4l2_mbus_framefmt isp_source_fmt = {0};
struct v4l2_subdev_format vformat = { struct v4l2_subdev_format vformat = {
.which = V4L2_SUBDEV_FORMAT_ACTIVE, .which = V4L2_SUBDEV_FORMAT_ACTIVE,
}; };
struct v4l2_rect isp_sink_crop; struct v4l2_rect isp_sink_crop;
u16 source_pad = atomisp_subdev_source_pad(vdev); u16 source_pad = atomisp_subdev_source_pad(vdev);
bool res_overflow = false;
struct v4l2_subdev_fh fh; struct v4l2_subdev_fh fh;
int ret; int ret;
...@@ -4845,7 +4845,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) ...@@ -4845,7 +4845,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
} }
atomisp_csi_lane_config(isp); atomisp_csi_lane_config(isp);
crop_needs_override = true;
atomisp_check_copy_mode(asd, source_pad, &backup_fmt); atomisp_check_copy_mode(asd, source_pad, &backup_fmt);
asd->yuvpp_mode = false; /* Reset variable */ asd->yuvpp_mode = false; /* Reset variable */
...@@ -4907,30 +4906,27 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) ...@@ -4907,30 +4906,27 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
* which appears to be related by a hardware * which appears to be related by a hardware
* performance limitation. It's unclear why this * performance limitation. It's unclear why this
* particular code triggers the issue. */ * particular code triggers the issue. */
if (crop_needs_override) { if (isp_sink_crop.width * main_compose.height >
if (isp_sink_crop.width * main_compose.height > isp_sink_crop.height * main_compose.width) {
isp_sink_crop.height * main_compose.width) { sink_crop.height = isp_sink_crop.height;
sink_crop.height = isp_sink_crop.height; sink_crop.width =
sink_crop.width = DIV_NEAREST_STEP( DIV_NEAREST_STEP(sink_crop.height * f->fmt.pix.width,
sink_crop.height * f->fmt.pix.height,
f->fmt.pix.width, ATOM_ISP_STEP_WIDTH);
f->fmt.pix.height, } else {
ATOM_ISP_STEP_WIDTH); sink_crop.width = isp_sink_crop.width;
} else { sink_crop.height =
sink_crop.width = isp_sink_crop.width; DIV_NEAREST_STEP(sink_crop.width * f->fmt.pix.height,
sink_crop.height = DIV_NEAREST_STEP( f->fmt.pix.width,
sink_crop.width * ATOM_ISP_STEP_HEIGHT);
f->fmt.pix.height,
f->fmt.pix.width,
ATOM_ISP_STEP_HEIGHT);
}
atomisp_subdev_set_selection(&asd->subdev, fh.state,
V4L2_SUBDEV_FORMAT_ACTIVE,
ATOMISP_SUBDEV_PAD_SINK,
V4L2_SEL_TGT_CROP,
V4L2_SEL_FLAG_KEEP_CONFIG,
&sink_crop);
} }
atomisp_subdev_set_selection(&asd->subdev, fh.state,
V4L2_SUBDEV_FORMAT_ACTIVE,
ATOMISP_SUBDEV_PAD_SINK,
V4L2_SEL_TGT_CROP,
V4L2_SEL_FLAG_KEEP_CONFIG,
&sink_crop);
atomisp_subdev_set_selection(&asd->subdev, fh.state, atomisp_subdev_set_selection(&asd->subdev, fh.state,
V4L2_SUBDEV_FORMAT_ACTIVE, V4L2_SUBDEV_FORMAT_ACTIVE,
source_pad, source_pad,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment