Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4440280rdb; Fri, 15 Sep 2023 02:08:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8auQ/XBy8LesR3Y12gA+Kp6uxnPgFFgpd+czF63Eu1wdadDiuVxmZTGFOfHYzWs3ScqYJ X-Received: by 2002:a17:902:ea09:b0:1c3:29c4:c4e4 with SMTP id s9-20020a170902ea0900b001c329c4c4e4mr1160054plg.36.1694768937280; Fri, 15 Sep 2023 02:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694768937; cv=none; d=google.com; s=arc-20160816; b=TuCvTmJQBKvSI3YuG25Y2sxEdbfe+gN0IIIiDcXS/rGdK70xkV4tcHqfhjRmYaVvmk mx2M6KTL1BOHLU/E8iewfo5+1xfc6JZiWHfWe2j6IPzDSMgo7PnzLaZmt0V1ZblJiRIN 8SFwweCrB+BbSkxH8ulOKq8dCPq0PGmSyHhVYr09jb7JsDs//kxkSPcmZenDuW8I/uKY c+sCBfdct0yV2xfBoZ9oMILZfX4cMl6Z9W19coY3iuGZrJTjhdJt3yPOFblzTXKn4HBc q5IoyBxqfG9zMa72jwqXkBSjjTmfWnht59v9vmah8l6jjukHTHD6qeW4pElc6TjfUy8W 6Vcw== 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=pkaevWe+3dnAnligYL3qUJmsPMlWZzlFPR4qQKxtWK0=; fh=KH8HnsdO2yip8Q9uuYy0FWJVbOcjQeNq7C+3VKM5Hzg=; b=wMEfkn4lYKKauH9Iwct9EkZL6K0C/p+ieh1f0vKHTiW0vzf0zV0z5OEjHYiF678msQ 97SXGdQjJYTxoit7CVS+Kj1u37Odb8EStnJoxtOGUemYev+4d4nBcbMvNkuWxWqrQ1Gl x+tVYHRmClBhH8Y5y2zb5yJtGUWaVw4LjyPY8h5X60MewMY3U6XEqcMZ7xRb42vSIxfp IjywQ08j9gsKAFsbeMwjeUX7McD1ECNMISsNWpAR+ma6f4uuFaGa8hF7qLrAeShFB6dJ nQUik6pvL426+sFRiPyJbmk6lU9OdpZ4eN3XzYMNo5M6Vie0mveM73qhcGeuO7wORqcu Tggg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l15-20020a170903244f00b001b9eb5d1ea2si3290527pls.198.2023.09.15.02.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:08:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F28F9822CE1B; Fri, 15 Sep 2023 01:54:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233470AbjIOIyu (ORCPT + 99 others); Fri, 15 Sep 2023 04:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233241AbjIOIy0 (ORCPT ); Fri, 15 Sep 2023 04:54:26 -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 90CAF2736 for ; Fri, 15 Sep 2023 01:54:17 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:7135:da8b:ba1d:1a7c]) by albert.telenet-ops.be with bizsmtp id m8uE2A00P3q21w7068uEY7; Fri, 15 Sep 2023 10:54:15 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qh4aJ-003lG8-6L; Fri, 15 Sep 2023 10:54:14 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qh4ac-00Gdav-6Y; Fri, 15 Sep 2023 10:54:14 +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 v4 04/41] drm: renesas: shmobile: Fix overlay plane disable Date: Fri, 15 Sep 2023 10:53:19 +0200 Message-Id: <54e2556e18b5524ce153a7ac79faf2c7b0a55260.1694767209.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 01:54:53 -0700 (PDT) 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 --- v4: - No changes, 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; } -- 2.34.1