From: Marco Felsch <m.felsch@pengutronix.de>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
hans.verkuil@cisco.com, jacopo+renesas@jmondi.org,
robh+dt@kernel.org, laurent.pinchart@ideasonboard.com
Cc: devicetree@vger.kernel.org, kernel@pengutronix.de,
linux-media@vger.kernel.org
Subject: [PATCH v13 12/21] media: tvp5150: fix set_selection rectangle handling
Date: Thu, 12 Mar 2020 11:31:47 +0100 [thread overview]
Message-ID: <20200312103156.3178-13-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20200312103156.3178-1-m.felsch@pengutronix.de>
Currently a local copy of sel->r is made and adapted to the hardware
constraints. After the adaption the value is applied to the hardware but
the driver forgot to reflect the adapted value to the user space.
Drop the local copy and work directly on the requested rectangle
instead to fix this.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
v10:
- new patch
---
drivers/media/i2c/tvp5150.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 90d4fd47f80d..38f02c23e352 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1024,7 +1024,7 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd,
struct v4l2_subdev_selection *sel)
{
struct tvp5150 *decoder = to_tvp5150(sd);
- struct v4l2_rect rect = sel->r;
+ struct v4l2_rect *rect = &sel->r;
v4l2_std_id std;
int hmax;
@@ -1033,11 +1033,11 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd,
return -EINVAL;
dev_dbg_lvl(sd->dev, 1, debug, "%s left=%d, top=%d, width=%d, height=%d\n",
- __func__, rect.left, rect.top, rect.width, rect.height);
+ __func__, rect->left, rect->top, rect->width, rect->height);
/* tvp5150 has some special limits */
- rect.left = clamp(rect.left, 0, TVP5150_MAX_CROP_LEFT);
- rect.top = clamp(rect.top, 0, TVP5150_MAX_CROP_TOP);
+ rect->left = clamp(rect->left, 0, TVP5150_MAX_CROP_LEFT);
+ rect->top = clamp(rect->top, 0, TVP5150_MAX_CROP_TOP);
/* Calculate height based on current standard */
if (decoder->norm == V4L2_STD_ALL)
@@ -1055,26 +1055,26 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd,
* - width = 2 due to UYVY colorspace
* - height, image = no special alignment
*/
- v4l_bound_align_image(&rect.width,
- TVP5150_H_MAX - TVP5150_MAX_CROP_LEFT - rect.left,
- TVP5150_H_MAX - rect.left, 1, &rect.height,
- hmax - TVP5150_MAX_CROP_TOP - rect.top,
- hmax - rect.top, 0, 0);
+ v4l_bound_align_image(&rect->width,
+ TVP5150_H_MAX - TVP5150_MAX_CROP_LEFT - rect->left,
+ TVP5150_H_MAX - rect->left, 1, &rect->height,
+ hmax - TVP5150_MAX_CROP_TOP - rect->top,
+ hmax - rect->top, 0, 0);
- regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top);
+ regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect->top);
regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP,
- rect.top + rect.height - hmax);
+ rect->top + rect->height - hmax);
regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB,
- rect.left >> TVP5150_CROP_SHIFT);
+ rect->left >> TVP5150_CROP_SHIFT);
regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB,
- rect.left | (1 << TVP5150_CROP_SHIFT));
+ rect->left | (1 << TVP5150_CROP_SHIFT));
regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB,
- (rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >>
+ (rect->left + rect->width - TVP5150_MAX_CROP_LEFT) >>
TVP5150_CROP_SHIFT);
regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB,
- rect.left + rect.width - TVP5150_MAX_CROP_LEFT);
+ rect->left + rect->width - TVP5150_MAX_CROP_LEFT);
- decoder->rect = rect;
+ decoder->rect = *rect;
return 0;
}
--
2.20.1
next prev parent reply other threads:[~2020-03-12 10:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 10:31 [PATCH v13 00/19] TVP5150 Features and Fixes Marco Felsch
2020-03-12 10:31 ` [PATCH v13 01/21] dt-bindings: connector: analog: add sdtv standards property Marco Felsch
2020-03-12 10:31 ` [PATCH v13 02/21] dt-bindings: display: add sdtv-standards defines Marco Felsch
2020-03-12 10:31 ` [PATCH v13 03/21] media: v4l: link dt-bindings and uapi Marco Felsch
2020-03-12 10:31 ` [PATCH v13 04/21] media: v4l2-fwnode: fix v4l2_fwnode_parse_link handling Marco Felsch
2020-03-12 10:37 ` Sakari Ailus
2020-03-12 10:42 ` Sakari Ailus
2020-03-12 10:43 ` Sakari Ailus
2020-03-12 11:14 ` Marco Felsch
2020-03-12 10:31 ` [PATCH v13 05/21] media: v4l2-fwnode: simplify v4l2_fwnode_parse_link Marco Felsch
2020-03-12 10:31 ` [PATCH v13 06/21] media: v4l2-fwnode: add endpoint id field to v4l2_fwnode_link Marco Felsch
2020-03-12 10:31 ` [PATCH v13 07/21] media: v4l2-fwnode: add v4l2_fwnode_connector Marco Felsch
2020-03-12 10:31 ` [PATCH v13 08/21] media: v4l2-fwnode: add initial connector parsing support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 09/21] partial revert of "[media] tvp5150: add HW input connectors support" Marco Felsch
2020-03-12 10:31 ` [PATCH v13 10/21] media: tvp5150: add input source selection of_graph support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 11/21] media: dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2020-03-12 10:31 ` Marco Felsch [this message]
2020-03-12 10:31 ` [PATCH v13 13/21] media: tvp5150: add FORMAT_TRY support for get/set selection handlers Marco Felsch
2020-03-12 10:31 ` [PATCH v13 14/21] media: tvp5150: initialize subdev before parsing device tree Marco Felsch
2020-03-12 10:31 ` [PATCH v13 15/21] media: tvp5150: move irq en-/disable into runtime-pm ops Marco Felsch
2020-03-12 10:31 ` [PATCH v13 16/21] media: tvp5150: add v4l2-event support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 17/21] media: tvp5150: add subdev open/close callbacks Marco Felsch
2020-03-12 10:31 ` [PATCH v13 18/21] media: dt-bindings: tvp5150: cleanup bindings stlye Marco Felsch
2020-03-12 10:31 ` [PATCH v13 19/21] media: dt-bindings: tvp5150: add optional sdtv standards documentation Marco Felsch
2020-03-12 10:31 ` [PATCH v13 20/21] media: tvp5150: add support to limit sdtv standards Marco Felsch
2020-03-12 10:31 ` [PATCH v13 21/21] media: tvp5150: make debug output more readable Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312103156.3178-13-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=hans.verkuil@cisco.com \
--cc=jacopo+renesas@jmondi.org \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox