From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Mark Yao <mark.yao@rock-chips.com>,
David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org
Subject: [PATCH] drm/rockchip: vop: Reset yrgb_mst when re-enabling
Date: Fri, 18 Mar 2016 12:22:27 +0100 [thread overview]
Message-ID: <1458300147-6472-1-git-send-email-tomeu.vizoso@collabora.com> (raw)
When the VOP is re-enabled, it will start scanning right away the
framebuffers that were configured from the last time, even if those have
been destroyed already. To prevent the VOP from trying to access freed
memory, reset the registers that hold pointers to framebuffers right
after we can write to them, but before the VOP is awaken from standby.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw@mail.gmail.com
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 5e57f5b2e4b0..0df91c28740b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -429,6 +429,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
static void vop_enable(struct drm_crtc *crtc)
{
struct vop *vop = to_vop(crtc);
+ int i;
int ret;
if (vop->is_enabled)
@@ -476,6 +477,18 @@ static void vop_enable(struct drm_crtc *crtc)
*/
vop->is_enabled = true;
+ /*
+ * Before turning the VOP completely on, unset the registers
+ * containing FB addresses to avoid the HW start scanning old FBs.
+ */
+ for (i = 0; i < vop->data->win_size; i++) {
+ struct vop_win *vop_win = &vop->win[i];
+ const struct vop_win_data *win = vop_win->data;
+
+ VOP_WIN_SET(vop, win, yrgb_mst, 0x0);
+ VOP_WIN_SET(vop, win, uv_mst, 0x0);
+ }
+
spin_lock(&vop->reg_lock);
VOP_CTRL_SET(vop, standby, 0);
--
2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>,
dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drm/rockchip: vop: Reset yrgb_mst when re-enabling
Date: Fri, 18 Mar 2016 12:22:27 +0100 [thread overview]
Message-ID: <1458300147-6472-1-git-send-email-tomeu.vizoso@collabora.com> (raw)
When the VOP is re-enabled, it will start scanning right away the
framebuffers that were configured from the last time, even if those have
been destroyed already. To prevent the VOP from trying to access freed
memory, reset the registers that hold pointers to framebuffers right
after we can write to them, but before the VOP is awaken from standby.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw@mail.gmail.com
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 5e57f5b2e4b0..0df91c28740b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -429,6 +429,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
static void vop_enable(struct drm_crtc *crtc)
{
struct vop *vop = to_vop(crtc);
+ int i;
int ret;
if (vop->is_enabled)
@@ -476,6 +477,18 @@ static void vop_enable(struct drm_crtc *crtc)
*/
vop->is_enabled = true;
+ /*
+ * Before turning the VOP completely on, unset the registers
+ * containing FB addresses to avoid the HW start scanning old FBs.
+ */
+ for (i = 0; i < vop->data->win_size; i++) {
+ struct vop_win *vop_win = &vop->win[i];
+ const struct vop_win_data *win = vop_win->data;
+
+ VOP_WIN_SET(vop, win, yrgb_mst, 0x0);
+ VOP_WIN_SET(vop, win, uv_mst, 0x0);
+ }
+
spin_lock(&vop->reg_lock);
VOP_CTRL_SET(vop, standby, 0);
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: tomeu.vizoso@collabora.com (Tomeu Vizoso)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drm/rockchip: vop: Reset yrgb_mst when re-enabling
Date: Fri, 18 Mar 2016 12:22:27 +0100 [thread overview]
Message-ID: <1458300147-6472-1-git-send-email-tomeu.vizoso@collabora.com> (raw)
When the VOP is re-enabled, it will start scanning right away the
framebuffers that were configured from the last time, even if those have
been destroyed already. To prevent the VOP from trying to access freed
memory, reset the registers that hold pointers to framebuffers right
after we can write to them, but before the VOP is awaken from standby.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw at mail.gmail.com
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 5e57f5b2e4b0..0df91c28740b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -429,6 +429,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
static void vop_enable(struct drm_crtc *crtc)
{
struct vop *vop = to_vop(crtc);
+ int i;
int ret;
if (vop->is_enabled)
@@ -476,6 +477,18 @@ static void vop_enable(struct drm_crtc *crtc)
*/
vop->is_enabled = true;
+ /*
+ * Before turning the VOP completely on, unset the registers
+ * containing FB addresses to avoid the HW start scanning old FBs.
+ */
+ for (i = 0; i < vop->data->win_size; i++) {
+ struct vop_win *vop_win = &vop->win[i];
+ const struct vop_win_data *win = vop_win->data;
+
+ VOP_WIN_SET(vop, win, yrgb_mst, 0x0);
+ VOP_WIN_SET(vop, win, uv_mst, 0x0);
+ }
+
spin_lock(&vop->reg_lock);
VOP_CTRL_SET(vop, standby, 0);
--
2.5.0
next reply other threads:[~2016-03-18 11:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 11:22 Tomeu Vizoso [this message]
2016-03-18 11:22 ` [PATCH] drm/rockchip: vop: Reset yrgb_mst when re-enabling Tomeu Vizoso
2016-03-18 11:22 ` Tomeu Vizoso
2016-03-19 1:15 ` Mark yao
2016-03-19 1:15 ` Mark yao
2016-03-19 1:15 ` Mark yao
2016-03-21 14:55 ` Tomeu Vizoso
2016-03-21 14:55 ` Tomeu Vizoso
2016-03-21 14:55 ` Tomeu Vizoso
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=1458300147-6472-1-git-send-email-tomeu.vizoso@collabora.com \
--to=tomeu.vizoso@collabora.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.yao@rock-chips.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 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.