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 v12 11/19] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Date: Mon, 9 Mar 2020 11:14:20 +0100 [thread overview]
Message-ID: <20200309101428.15267-12-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20200309101428.15267-1-m.felsch@pengutronix.de>
Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops")
the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is
no way to try different selections. The patch adds a helper function to
select the correct selection memory space (sub-device file handle or
driver state) which will be set/returned.
The selection rectangle is updated if the format is FORMAT_ACTIVE and
the rectangle position and/or size differs from the current set
rectangle.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
Changelog:
v11:
- s/__tvp5150_get_pad_crop/tvp5150_get_pad_crop/
- s/__tvp5150_set_selection/tvp5150_set_hw_selection/
- drop inline for tvp5150_set_hw_selection
- fix allignment issue
v10:
- __tvp5150_get_pad_crop: drop confusing fall-through
- set_selection: fix FORMAT_TRY handling if CONFIG_VIDEO_V4L2_SUBDEV_API
is disabled. Adapt sel->r and return 0.
v8:
- adapt commit message
- remove wrong FORMAT_TRY handling for tvp5150_fill_fmt() handling
- return 0 during set_selection if FORMAT_TRY was requested and
CONFIG_VIDEO_V4L2_SUBDEV_API is disabled
- return -EINVAL during get_selection if FORMAT_TRY was requested and
CONFIG_VIDEO_V4L2_SUBDEV_API is disabled
v7:
- __tvp5150_get_pad_crop(): return error on default case
- simplify __tvp5150_get_pad_crop() error handling
- tvp5150_set_selection() squash __tvp5150_set_selection() execution
conditions
v6:
nothing
v5:
- handle stub for v4l2_subdev_get_try_crop() internal since commit
("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*")
isn't anymore part of this series.
- add error handling of __tvp5150_get_pad_crop()
v4:
- fix merge conflict due to rebase on top of media-tree/master
- __tvp5150_get_pad_crop(): cosmetic alignment fixes
---
drivers/media/i2c/tvp5150.c | 113 ++++++++++++++++++++++++++----------
1 file changed, 81 insertions(+), 32 deletions(-)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 38f02c23e352..e9fa473d61f3 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -19,6 +19,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-fwnode.h>
#include <media/v4l2-mc.h>
+#include <media/v4l2-rect.h>
#include "tvp5150_reg.h"
@@ -995,6 +996,25 @@ static void tvp5150_set_default(v4l2_std_id std, struct v4l2_rect *crop)
crop->height = TVP5150_V_MAX_OTHERS;
}
+static struct v4l2_rect *
+tvp5150_get_pad_crop(struct tvp5150 *decoder,
+ struct v4l2_subdev_pad_config *cfg, unsigned int pad,
+ enum v4l2_subdev_format_whence which)
+{
+ switch (which) {
+ case V4L2_SUBDEV_FORMAT_ACTIVE:
+ return &decoder->rect;
+ case V4L2_SUBDEV_FORMAT_TRY:
+#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
+ return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad);
+#else
+ return ERR_PTR(-EINVAL);
+#endif
+ default:
+ return ERR_PTR(-EINVAL);
+ }
+}
+
static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *format)
@@ -1019,17 +1039,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
return 0;
}
+unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd)
+{
+ struct tvp5150 *decoder = to_tvp5150(sd);
+ v4l2_std_id std;
+
+ /* Calculate height based on current standard */
+ if (decoder->norm == V4L2_STD_ALL)
+ std = tvp5150_read_std(sd);
+ else
+ std = decoder->norm;
+
+ return (std & V4L2_STD_525_60) ?
+ TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS;
+}
+
+static void tvp5150_set_hw_selection(struct v4l2_subdev *sd,
+ struct v4l2_rect *rect)
+{
+ struct tvp5150 *decoder = to_tvp5150(sd);
+ unsigned int hmax = tvp5150_get_hmax(sd);
+
+ regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect->top);
+ regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP,
+ rect->top + rect->height - hmax);
+ regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB,
+ rect->left >> TVP5150_CROP_SHIFT);
+ regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB,
+ rect->left | (1 << TVP5150_CROP_SHIFT));
+ regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB,
+ (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);
+}
+
static int tvp5150_set_selection(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_selection *sel)
{
struct tvp5150 *decoder = to_tvp5150(sd);
struct v4l2_rect *rect = &sel->r;
- v4l2_std_id std;
- int hmax;
+ struct v4l2_rect *crop;
+ unsigned int hmax;
- if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE ||
- sel->target != V4L2_SEL_TGT_CROP)
+ if (sel->target != V4L2_SEL_TGT_CROP)
return -EINVAL;
dev_dbg_lvl(sd->dev, 1, debug, "%s left=%d, top=%d, width=%d, height=%d\n",
@@ -1038,17 +1092,7 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd,
/* 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);
-
- /* Calculate height based on current standard */
- if (decoder->norm == V4L2_STD_ALL)
- std = tvp5150_read_std(sd);
- else
- std = decoder->norm;
-
- if (std & V4L2_STD_525_60)
- hmax = TVP5150_V_MAX_525_60;
- else
- hmax = TVP5150_V_MAX_OTHERS;
+ hmax = tvp5150_get_hmax(sd);
/*
* alignments:
@@ -1061,20 +1105,23 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd,
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_STOP,
- rect->top + rect->height - hmax);
- regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB,
- rect->left >> TVP5150_CROP_SHIFT);
- regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB,
- rect->left | (1 << TVP5150_CROP_SHIFT));
- regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB,
- (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);
+ if (!IS_ENABLED(CONFIG_VIDEO_V4L2_SUBDEV_API) &&
+ sel->which == V4L2_SUBDEV_FORMAT_TRY)
+ return 0;
+
+ crop = tvp5150_get_pad_crop(decoder, cfg, sel->pad, sel->which);
+ if (IS_ERR(crop))
+ return PTR_ERR(crop);
+
+ /*
+ * Update output image size if the selection (crop) rectangle size or
+ * position has been modified.
+ */
+ if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE &&
+ !v4l2_rect_equal(rect, crop))
+ tvp5150_set_hw_selection(sd, rect);
- decoder->rect = *rect;
+ *crop = *rect;
return 0;
}
@@ -1084,11 +1131,9 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd,
struct v4l2_subdev_selection *sel)
{
struct tvp5150 *decoder = container_of(sd, struct tvp5150, sd);
+ struct v4l2_rect *crop;
v4l2_std_id std;
- if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE)
- return -EINVAL;
-
switch (sel->target) {
case V4L2_SEL_TGT_CROP_BOUNDS:
sel->r.left = 0;
@@ -1106,7 +1151,11 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd,
sel->r.height = TVP5150_V_MAX_OTHERS;
return 0;
case V4L2_SEL_TGT_CROP:
- sel->r = decoder->rect;
+ crop = tvp5150_get_pad_crop(decoder, cfg, sel->pad,
+ sel->which);
+ if (IS_ERR(crop))
+ return PTR_ERR(crop);
+ sel->r = *crop;
return 0;
default:
return -EINVAL;
--
2.20.1
next prev parent reply other threads:[~2020-03-09 10:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 10:14 [PATCH v12 00/19] TVP5150 Features and Fixes Marco Felsch
2020-03-09 10:14 ` [PATCH v12 01/19] dt-bindings: connector: analog: add sdtv standards property Marco Felsch
2020-03-09 10:14 ` [PATCH v12 02/19] dt-bindings: display: add sdtv-standards defines Marco Felsch
2020-03-09 10:14 ` [PATCH v12 03/19] media: v4l: link dt-bindings and uapi Marco Felsch
2020-03-09 10:14 ` [PATCH v12 04/19] media: v4l2-fwnode: add endpoint id field to v4l2_fwnode_link Marco Felsch
2020-03-11 8:15 ` Sakari Ailus
2020-03-11 8:39 ` Marco Felsch
2020-03-09 10:14 ` [PATCH v12 05/19] media: v4l2-fwnode: add v4l2_fwnode_connector Marco Felsch
2020-03-09 10:14 ` [PATCH v12 06/19] media: v4l2-fwnode: add initial connector parsing support Marco Felsch
2020-03-11 8:17 ` Sakari Ailus
2020-03-11 8:43 ` Marco Felsch
2020-03-11 9:03 ` Sakari Ailus
2020-03-11 9:12 ` Marco Felsch
2020-03-09 10:14 ` [PATCH v12 07/19] partial revert of "[media] tvp5150: add HW input connectors support" Marco Felsch
2020-03-09 10:14 ` [PATCH v12 08/19] media: tvp5150: add input source selection of_graph support Marco Felsch
2020-03-09 10:14 ` [PATCH v12 09/19] media: dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2020-03-09 10:14 ` [PATCH v12 10/19] media: tvp5150: fix set_selection rectangle handling Marco Felsch
2020-03-09 10:14 ` Marco Felsch [this message]
2020-03-09 10:14 ` [PATCH v12 12/19] media: tvp5150: initialize subdev before parsing device tree Marco Felsch
2020-03-09 10:14 ` [PATCH v12 13/19] media: tvp5150: move irq en-/disable into runtime-pm ops Marco Felsch
2020-03-09 10:14 ` [PATCH v12 14/19] media: tvp5150: add v4l2-event support Marco Felsch
2020-03-09 10:14 ` [PATCH v12 15/19] media: tvp5150: add subdev open/close callbacks Marco Felsch
2020-03-09 10:14 ` [PATCH v12 16/19] media: dt-bindings: tvp5150: cleanup bindings stlye Marco Felsch
2020-03-09 10:14 ` [PATCH v12 17/19] media: dt-bindings: tvp5150: add optional sdtv standards documentation Marco Felsch
2020-03-09 10:14 ` [PATCH v12 18/19] media: tvp5150: add support to limit sdtv standards Marco Felsch
2020-03-09 10:14 ` [PATCH v12 19/19] media: tvp5150: make debug output more readable Marco Felsch
2020-03-11 8:33 ` [PATCH v12 00/19] TVP5150 Features and Fixes Sakari Ailus
2020-03-11 9:08 ` Hans Verkuil
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=20200309101428.15267-12-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;
as well as URLs for NNTP newsgroup(s).