From patchwork Wed Aug 16 09:50:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 135774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp60370vqi; Wed, 16 Aug 2023 07:40:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDtOTfRdRKII2l/9TuJuOQwTkeXwBDLmTLs+FuDTbn60s8byGottXMDh/7henThoywPay3 X-Received: by 2002:a05:6808:2199:b0:3a4:225d:8135 with SMTP id be25-20020a056808219900b003a4225d8135mr2910837oib.31.1692196817627; Wed, 16 Aug 2023 07:40:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692196817; cv=none; d=google.com; s=arc-20160816; b=BhXWD21LQ2i9bqmd1Abi6q804Ff059Nu6oGrXmCIXTcAteM1OkGxiawNEmVE44silL OmC7uIXNietZIJjqEuY9pS2H/18YkIHMM9S5w+LdDXbRFe+w0fY/lvjGLnSVbq68e9AN L69QP6pOp46DPr1ZwE5hZZWN0MgYg1uY8TM2KyReG+LyZq53o96/VHu1RBL3ieOLi0P+ Nm/mDv1+CPAF6XQ0yJcf0ffKZbE6zmkP68Yy7TKXH1awPEl4ytarUoZlsXleFLwVPlil wfnpsA7ulW3Mw8D8uTf3fi9yO74/EI5IvuDq0gyz1JQyTyrGiQTpj6WKByrmMsqlf19x RmBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=P53cgHFlWsK376qpCWj5XLeVL2RAEvDhM4hxFJCqJTs=; fh=OmmZDJEp3pl7jaFV8O2/yN66VkuJIFqajAiD2ZUHFno=; b=aV9JSKks1RYWM0PJXKHA2g0iv5HXxNF7E44VcBcps0A7vY+4Pgh+yIAPYwe6rFQ6Bo 11GjYpr3W/K7DSuG9LcD0fV6hcsZhxhbh0ktuPN+NnevWWYohTE11dx9cQ4OO7p5V4mp Mmpq9neVawleZxnmV6Wigzu6hk6EbDvEAHrrXprrXQIJuU/RBGxi3s+mLemJBzr/eOkq 1Ph//9pefSO8uhFl9yhjP9GngokNvyMlHgYHmWRGIiq1UEbSDAvhgojrGyB2ebsljjt+ idCjGBwa9BePx1Y0YcSuRqBLv04vAl4VLUOTFyJAwwnc/ZyulAStLQx17FkoL5D+A2Hf tm0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h62-20020a638341000000b00565e98183d6si2216124pge.626.2023.08.16.07.40.03; Wed, 16 Aug 2023 07:40:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbjHPKqI (ORCPT + 99 others); Wed, 16 Aug 2023 06:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244042AbjHPKpV (ORCPT ); Wed, 16 Aug 2023 06:45:21 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D24E4211E for ; Wed, 16 Aug 2023 03:45:10 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5d0c:f209:12a7:4ce5]) by albert.telenet-ops.be with bizsmtp id aAki2A00A45ualL06AkiRT; Wed, 16 Aug 2023 12:44:43 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qWE0x-000otB-Pr; Wed, 16 Aug 2023 12:44:42 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qWDAw-00674P-Dd; Wed, 16 Aug 2023 11:50:50 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v3 04/41] drm: renesas: shmobile: Fix overlay plane disable Date: Wed, 16 Aug 2023 11:50:11 +0200 Message-Id: <7a8c8d3085ef791b5affc277e985fbbf2c0ea5a2.1692178020.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774396970222223884 X-GMAIL-MSGID: 1774396970222223884 Merely writing zero to the CHn Source Image Format Register is not sufficient to disable a plane, as the programmed register value is not propagated immediately to the current side. This can be seen when using the -P option of modetest: the extra plane is displayed correctly, but does not disappear after exit. Fix this by doing the full update dance using the Blend Control Register, like is done when enabling the plane. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c index 850986cee848226a..0e34573c3cb3d032 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c @@ -215,7 +215,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane, splane->format = NULL; + lcdc_write(sdev, LDBCR, LDBCR_UPC(splane->index)); lcdc_write(sdev, LDBnBSIFR(splane->index), 0); + lcdc_write(sdev, LDBCR, + LDBCR_UPF(splane->index) | LDBCR_UPD(splane->index)); return 0; }