From patchwork Fri Mar 18 11:22:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8618451 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2EA20C0553 for ; Fri, 18 Mar 2016 11:22:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 317C32037F for ; Fri, 18 Mar 2016 11:22:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3BA6F202F0 for ; Fri, 18 Mar 2016 11:22:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 412266E0A2; Fri, 18 Mar 2016 11:22:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD5396EBD3 for ; Fri, 18 Mar 2016 11:22:49 +0000 (UTC) Received: by mail-wm0-x233.google.com with SMTP id p65so64037366wmp.1 for ; Fri, 18 Mar 2016 04:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=Pmmkg9OGgVd8hdSJ0h0IZXrEqXjQj5dvOkx/71Xbznc=; b=URgPvlwPFab1DEbJ2U0MkH2PyCqL85gyRGrUdnIdPOO3XmOHKAq1gZYOLamlDrzVHw P6pN2OqxZZUd3TKba1uWDdPJotl9W3+NYdZUQowEjqACcVySZzexepI7l4Ps07lUFAHA akb55K+1BY29m1Z0sUxWW4z1b4MNF8bbFnP7Vj+WmWSxLOzt4oCPsrLIrZhu0np7UjIr OYhDwYpEhb5xZN6DTLv0tzSt/d+tXUuS5So298+5wClIOQz5B815TuvsjiNTUUXU/M2E 6/B/HZdb0VqSbRU5MkSWPPCFRcIrv2OhLJaHK1y9yAbO+AX4o1FSfoGRfRqRppmNaZk3 0tWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=Pmmkg9OGgVd8hdSJ0h0IZXrEqXjQj5dvOkx/71Xbznc=; b=Ua5AChZiM6n+Gzc3sCrW8z7osiKPWLTj2Hu1o/PLR2KkYgTBa5ILgcAEqM5vp+Pjts WhEmUNhGmhqeNnnA11C+K8vjPOrOyfoEd72q37daRJPQQUVOYuCIAo7FT129AQwBRxbJ K5K/YhRX3L1fU5625SZ2IkaJNySBD09hrXiebszTzKB2zxaxjG+oMfL98DVVf4urZ7nY pKNsTXqkfiUfO01tAmnQ0JpE2m+/AYEdGbb/Tf+S3z6MwvYdjicxVSvfIcOz/PGjqlxm gfIZwFVGAviEBtrwiWiLxQi62e/Y1g8XY3I4F0npo4UBd7pxkCk0bDuTaKwimC/otzt5 lZSw== X-Gm-Message-State: AD7BkJIjHTZXAXrSMSila10HsBVRbfQNuqyOQRfZvj0dlp2moIk+oqWhyeaaGN+FeWQzCw== X-Received: by 10.28.128.80 with SMTP id b77mr43733206wmd.42.1458300167644; Fri, 18 Mar 2016 04:22:47 -0700 (PDT) Received: from cizrna.lan ([109.72.12.137]) by smtp.gmail.com with ESMTPSA id g203sm34252216wmf.23.2016.03.18.04.22.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Mar 2016 04:22:46 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: vop: Reset yrgb_mst when re-enabling Date: Fri, 18 Mar 2016 12:22:27 +0100 Message-Id: <1458300147-6472-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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);