From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org Subject: [PATCH v3 03/12] media: staging: rkisp1: params: use the new effect value in cproc config Date: Tue, 22 Sep 2020 13:33:53 +0200 [thread overview] Message-ID: <20200922113402.12442-4-dafna.hirschfeld@collabora.com> (raw) In-Reply-To: <20200922113402.12442-1-dafna.hirschfeld@collabora.com> The cproc (color processing) configuration needs to know if an image effect is configured. The code uses the image effect in 'cur_params' which is the first params buffer queued in the stream. This is the wrong place to read the value. The value should be taken from the current params buffer. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> --- drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 8bd7cc622e4f..ab2deb57b1eb 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -552,7 +552,7 @@ static void rkisp1_cproc_config(struct rkisp1_params *params, const struct rkisp1_cif_isp_cproc_config *arg) { struct rkisp1_cif_isp_isp_other_cfg *cur_other_cfg = - ¶ms->cur_params.others; + container_of(arg, struct rkisp1_cif_isp_isp_other_cfg, cproc_config); struct rkisp1_cif_isp_ie_config *cur_ie_config = &cur_other_cfg->ie_config; u32 effect = cur_ie_config->effect; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, dafna3@gmail.com, tfiga@chromium.org, hverkuil@xs4all.nl, linux-rockchip@lists.infradead.org, helen.koike@collabora.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, kernel@collabora.com, ezequiel@collabora.com Subject: [PATCH v3 03/12] media: staging: rkisp1: params: use the new effect value in cproc config Date: Tue, 22 Sep 2020 13:33:53 +0200 [thread overview] Message-ID: <20200922113402.12442-4-dafna.hirschfeld@collabora.com> (raw) In-Reply-To: <20200922113402.12442-1-dafna.hirschfeld@collabora.com> The cproc (color processing) configuration needs to know if an image effect is configured. The code uses the image effect in 'cur_params' which is the first params buffer queued in the stream. This is the wrong place to read the value. The value should be taken from the current params buffer. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> --- drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 8bd7cc622e4f..ab2deb57b1eb 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -552,7 +552,7 @@ static void rkisp1_cproc_config(struct rkisp1_params *params, const struct rkisp1_cif_isp_cproc_config *arg) { struct rkisp1_cif_isp_isp_other_cfg *cur_other_cfg = - ¶ms->cur_params.others; + container_of(arg, struct rkisp1_cif_isp_isp_other_cfg, cproc_config); struct rkisp1_cif_isp_ie_config *cur_ie_config = &cur_other_cfg->ie_config; u32 effect = cur_ie_config->effect; -- 2.17.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-09-22 11:34 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-22 11:33 [PATCH v3 00/12] media: staging: rkisp1: various bug fixes Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-22 11:33 ` [PATCH v3 01/12] media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-25 19:08 ` Tomasz Figa 2020-09-25 19:08 ` Tomasz Figa 2020-09-22 11:33 ` [PATCH v3 02/12] media: staging: rkisp1: params: in the isr, return if buffer list is empty Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld [this message] 2020-09-22 11:33 ` [PATCH v3 03/12] media: staging: rkisp1: params: use the new effect value in cproc config Dafna Hirschfeld 2020-09-22 11:33 ` [PATCH v3 04/12] media: staging: rkisp1: params: avoid using buffer if params is not streaming Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-25 20:16 ` Tomasz Figa 2020-09-25 20:16 ` Tomasz Figa 2020-09-22 11:33 ` [PATCH v3 05/12] media: staging: rkisp1: params: set vb.sequence to be the isp's frame_sequence + 1 Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-22 11:33 ` [PATCH v3 06/12] media: staging: rkisp1: remove atomic operations for frame sequence Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-25 20:42 ` Tomasz Figa 2020-09-25 20:42 ` Tomasz Figa 2020-10-02 9:16 ` Dafna Hirschfeld 2020-10-02 9:16 ` Dafna Hirschfeld 2020-10-02 15:30 ` Tomasz Figa 2020-10-02 15:30 ` Tomasz Figa 2020-11-06 14:43 ` Helen Koike 2020-11-06 14:43 ` Helen Koike 2020-11-10 10:40 ` Tomasz Figa 2020-11-10 10:40 ` Tomasz Figa 2020-09-22 11:33 ` [PATCH v3 07/12] media: staging: rkisp1: isp: add a warning and debugfs var for irq delay Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-22 11:33 ` [PATCH v3 08/12] media: staging: rkisp1: isp: don't enable signal RKISP1_CIF_ISP_FRAME_IN Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-22 11:33 ` [PATCH v3 09/12] media: staging: rkisp1: stats: protect write to 'is_streaming' in start_streaming cb Dafna Hirschfeld 2020-09-22 11:33 ` Dafna Hirschfeld 2020-09-25 20:47 ` Tomasz Figa 2020-09-25 20:47 ` Tomasz Figa 2020-09-22 11:34 ` [PATCH v3 10/12] media: staging: rkisp1: params: no need to lock default config Dafna Hirschfeld 2020-09-22 11:34 ` Dafna Hirschfeld 2020-09-22 11:34 ` [PATCH v3 11/12] media: staging: rkisp1: use the right variants of spin_lock Dafna Hirschfeld 2020-09-22 11:34 ` Dafna Hirschfeld 2020-09-25 20:51 ` Tomasz Figa 2020-09-25 20:51 ` Tomasz Figa 2020-09-22 11:34 ` [PATCH v3 12/12] media: staging: rkisp1: cap: protect access to buf with the spin lock Dafna Hirschfeld 2020-09-22 11:34 ` Dafna Hirschfeld 2020-09-25 20:53 ` Tomasz Figa 2020-09-25 20:53 ` Tomasz Figa 2020-09-27 9:43 ` Mauro Carvalho Chehab 2020-09-27 9:43 ` Mauro Carvalho Chehab 2020-09-27 9:54 ` Dafna Hirschfeld 2020-09-27 9:54 ` Dafna Hirschfeld 2020-09-27 11:05 ` Mauro Carvalho Chehab 2020-09-27 11:05 ` Mauro Carvalho Chehab 2020-09-28 15:29 ` Dafna Hirschfeld 2020-09-28 15:29 ` Dafna Hirschfeld
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=20200922113402.12442-4-dafna.hirschfeld@collabora.com \ --to=dafna.hirschfeld@collabora.com \ --cc=dafna3@gmail.com \ --cc=ezequiel@collabora.com \ --cc=helen.koike@collabora.com \ --cc=hverkuil@xs4all.nl \ --cc=kernel@collabora.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@kernel.org \ --cc=sakari.ailus@linux.intel.com \ --cc=tfiga@chromium.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.