From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Sascha Hauer <s.hauer@pengutronix.de>
Cc: "Sandy Huang" <hjc@rock-chips.com>,
linux-rockchip@lists.infradead.org, kernel@pengutronix.de,
"Chris Morgan" <macroalpha82@gmail.com>,
"Köry Maincent" <kory.maincent@bootlin.com>,
"Michael Riesch" <michael.riesch@wolfvision.net>,
"Paul Kocialkowski" <paul.kocialkowski@bootlin.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
stable@vger.kernel.org
Subject: Re: [PATCH] drm/rockchip: vop2: fix suspend/resume
Date: Mon, 17 Apr 2023 12:46:05 +0200 [thread overview]
Message-ID: <7404631.18pcnM708K@diego> (raw)
In-Reply-To: <20230417094215.2049231-1-s.hauer@pengutronix.de>
Hi Sascha,
Am Montag, 17. April 2023, 11:42:15 CEST schrieb Sascha Hauer:
> During a suspend/resume cycle the VO power domain will be disabled and
> the VOP2 registers will reset to their default values. After that the
> cached register values will be out of sync and the read/modify/write
> operations we do on the window registers will result in bogus values
> written. Fix this by marking the regcache as dirty each time we disable
> the VOP2 and call regcache_sync() each time we enable it again. With
> this the VOP2 will show a picture after a suspend/resume cycle whereas
> without this the screen stays dark.
>
> Fixes: 604be85547ce4 ("drm/rockchip: Add VOP2 driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
somehow we overlapped with this v2 and me applying the original one [0]
to drm-misc. With drm-misc being a shared tree there is also no way back.
So if this v2 is better suited, could do a follow-up patch instead - on
top of your original one?
Thanks
Heiko
[0] https://cgit.freedesktop.org/drm/drm-misc/commit/?h=drm-misc-fixes&id=afa965a45e01e541cdbe5c8018226eff117610f0
> ---
>
> Changes since v1:
> - Use regcache_mark_dirty()/regcache_sync() instead of regmap_reinit_cache()
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ba3b817895091..293c228a83f90 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -839,6 +839,8 @@ static void vop2_enable(struct vop2 *vop2)
> return;
> }
>
> + regcache_sync(vop2->map);
> +
> if (vop2->data->soc_id == 3566)
> vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
>
> @@ -867,6 +869,8 @@ static void vop2_disable(struct vop2 *vop2)
>
> pm_runtime_put_sync(vop2->dev);
>
> + regcache_mark_dirty(vop2->map);
> +
> clk_disable_unprepare(vop2->aclk);
> clk_disable_unprepare(vop2->hclk);
> }
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Sascha Hauer <s.hauer@pengutronix.de>
Cc: "Sandy Huang" <hjc@rock-chips.com>,
linux-rockchip@lists.infradead.org, kernel@pengutronix.de,
"Chris Morgan" <macroalpha82@gmail.com>,
"Köry Maincent" <kory.maincent@bootlin.com>,
"Michael Riesch" <michael.riesch@wolfvision.net>,
"Paul Kocialkowski" <paul.kocialkowski@bootlin.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
stable@vger.kernel.org
Subject: Re: [PATCH] drm/rockchip: vop2: fix suspend/resume
Date: Mon, 17 Apr 2023 12:46:05 +0200 [thread overview]
Message-ID: <7404631.18pcnM708K@diego> (raw)
In-Reply-To: <20230417094215.2049231-1-s.hauer@pengutronix.de>
Hi Sascha,
Am Montag, 17. April 2023, 11:42:15 CEST schrieb Sascha Hauer:
> During a suspend/resume cycle the VO power domain will be disabled and
> the VOP2 registers will reset to their default values. After that the
> cached register values will be out of sync and the read/modify/write
> operations we do on the window registers will result in bogus values
> written. Fix this by marking the regcache as dirty each time we disable
> the VOP2 and call regcache_sync() each time we enable it again. With
> this the VOP2 will show a picture after a suspend/resume cycle whereas
> without this the screen stays dark.
>
> Fixes: 604be85547ce4 ("drm/rockchip: Add VOP2 driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
somehow we overlapped with this v2 and me applying the original one [0]
to drm-misc. With drm-misc being a shared tree there is also no way back.
So if this v2 is better suited, could do a follow-up patch instead - on
top of your original one?
Thanks
Heiko
[0] https://cgit.freedesktop.org/drm/drm-misc/commit/?h=drm-misc-fixes&id=afa965a45e01e541cdbe5c8018226eff117610f0
> ---
>
> Changes since v1:
> - Use regcache_mark_dirty()/regcache_sync() instead of regmap_reinit_cache()
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ba3b817895091..293c228a83f90 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -839,6 +839,8 @@ static void vop2_enable(struct vop2 *vop2)
> return;
> }
>
> + regcache_sync(vop2->map);
> +
> if (vop2->data->soc_id == 3566)
> vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
>
> @@ -867,6 +869,8 @@ static void vop2_disable(struct vop2 *vop2)
>
> pm_runtime_put_sync(vop2->dev);
>
> + regcache_mark_dirty(vop2->map);
> +
> clk_disable_unprepare(vop2->aclk);
> clk_disable_unprepare(vop2->hclk);
> }
>
WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Sascha Hauer <s.hauer@pengutronix.de>
Cc: "Köry Maincent" <kory.maincent@bootlin.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Sandy Huang" <hjc@rock-chips.com>,
stable@vger.kernel.org, "Chris Morgan" <macroalpha82@gmail.com>,
"Paul Kocialkowski" <paul.kocialkowski@bootlin.com>,
linux-rockchip@lists.infradead.org,
"Michael Riesch" <michael.riesch@wolfvision.net>,
kernel@pengutronix.de
Subject: Re: [PATCH] drm/rockchip: vop2: fix suspend/resume
Date: Mon, 17 Apr 2023 12:46:05 +0200 [thread overview]
Message-ID: <7404631.18pcnM708K@diego> (raw)
In-Reply-To: <20230417094215.2049231-1-s.hauer@pengutronix.de>
Hi Sascha,
Am Montag, 17. April 2023, 11:42:15 CEST schrieb Sascha Hauer:
> During a suspend/resume cycle the VO power domain will be disabled and
> the VOP2 registers will reset to their default values. After that the
> cached register values will be out of sync and the read/modify/write
> operations we do on the window registers will result in bogus values
> written. Fix this by marking the regcache as dirty each time we disable
> the VOP2 and call regcache_sync() each time we enable it again. With
> this the VOP2 will show a picture after a suspend/resume cycle whereas
> without this the screen stays dark.
>
> Fixes: 604be85547ce4 ("drm/rockchip: Add VOP2 driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
somehow we overlapped with this v2 and me applying the original one [0]
to drm-misc. With drm-misc being a shared tree there is also no way back.
So if this v2 is better suited, could do a follow-up patch instead - on
top of your original one?
Thanks
Heiko
[0] https://cgit.freedesktop.org/drm/drm-misc/commit/?h=drm-misc-fixes&id=afa965a45e01e541cdbe5c8018226eff117610f0
> ---
>
> Changes since v1:
> - Use regcache_mark_dirty()/regcache_sync() instead of regmap_reinit_cache()
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ba3b817895091..293c228a83f90 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -839,6 +839,8 @@ static void vop2_enable(struct vop2 *vop2)
> return;
> }
>
> + regcache_sync(vop2->map);
> +
> if (vop2->data->soc_id == 3566)
> vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
>
> @@ -867,6 +869,8 @@ static void vop2_disable(struct vop2 *vop2)
>
> pm_runtime_put_sync(vop2->dev);
>
> + regcache_mark_dirty(vop2->map);
> +
> clk_disable_unprepare(vop2->aclk);
> clk_disable_unprepare(vop2->hclk);
> }
>
next prev parent reply other threads:[~2023-04-17 10:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 9:42 [PATCH] drm/rockchip: vop2: fix suspend/resume Sascha Hauer
2023-04-17 9:42 ` Sascha Hauer
2023-04-17 9:42 ` Sascha Hauer
2023-04-17 10:46 ` Heiko Stübner [this message]
2023-04-17 10:46 ` Heiko Stübner
2023-04-17 10:46 ` Heiko Stübner
2023-04-17 12:38 ` Sascha Hauer
2023-04-17 12:38 ` Sascha Hauer
2023-04-17 12:38 ` Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2023-04-13 14:43 Sascha Hauer
2023-04-13 14:43 ` Sascha Hauer
2023-04-13 14:43 ` Sascha Hauer
2023-04-13 15:27 ` Chris Morgan
2023-04-13 15:27 ` Chris Morgan
2023-04-13 15:27 ` Chris Morgan
2023-04-14 14:20 ` Paul Kocialkowski
2023-04-14 14:20 ` Paul Kocialkowski
2023-04-14 14:20 ` Paul Kocialkowski
2023-04-17 9:45 ` Sascha Hauer
2023-04-17 9:45 ` Sascha Hauer
2023-04-17 9:45 ` Sascha Hauer
2023-04-17 10:43 ` Heiko Stuebner
2023-04-17 10:43 ` Heiko Stuebner
2023-04-17 10:43 ` Heiko Stuebner
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=7404631.18pcnM708K@diego \
--to=heiko@sntech.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=kernel@pengutronix.de \
--cc=kory.maincent@bootlin.com \
--cc=linux-rockchip@lists.infradead.org \
--cc=macroalpha82@gmail.com \
--cc=michael.riesch@wolfvision.net \
--cc=paul.kocialkowski@bootlin.com \
--cc=s.hauer@pengutronix.de \
--cc=stable@vger.kernel.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: link
Be 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.