From patchwork Tue Jul 18 16:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1880467vqt; Tue, 18 Jul 2023 09:56:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlGJRzY1/haXsRZ5cwu2rHtZn2yjYGinZVHHQggtJ8vWfiCvLDRjHdhn+LFZX6narYhC35Mb X-Received: by 2002:a05:6a00:99b:b0:682:a6c5:6f28 with SMTP id u27-20020a056a00099b00b00682a6c56f28mr181156pfg.32.1689699382123; Tue, 18 Jul 2023 09:56:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689699382; cv=none; d=google.com; s=arc-20160816; b=xQ6gOAaoeHDu5385MzYEjfh0uLUNrg4hSEzPJcWgXInKa9Tqm1igsNQnYoRn7/KARu TWWLM9S/0oWBhvMEBnbTh3Jf1uKBX5FQlEhrqvY4OPLknsHEOA07Bmh2T1XR+kMhWW7l vRPmNi6Fi32Y9CFAFAZ8U6Cp6pul2ekZVoXU0/6y+EAmacYs1XtQgUug1DuqsBwUlFMb FKLoMHcpC7opvjFI4iw9IL7yGyARRW91X11dEU8d/hWD0uKxA3eX6hL8KiCPL1rrNIGS upaKbs0iX+sgJ5umA0+Rn1h3v+Bsa1+qe+3tL73d9N8vovcQOfdEw9ZFQF6RrfNRjwLZ hxpg== 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=iFU3t77TWgC4Kyw1IIR6BPNe9qRv7X5vc1Feykejtv8=; fh=Ople2ijcDVdvBJwvAg2RvyZp0qNZK7It46SN0LxlrVk=; b=wF0XtL5p6bB9vKe2fugMeiWIWvrdxR1tYC+Yn4u2dhXCDEzxEeZPwH751zsCuN10st IUAoE3zhRN3gK0CtouDC8xNsS4s+hJCcWS1LQu9vTRdDU1orrzH6B/XYqz6QmprAHN2z wTBHMmpmhyzYPBimeOXWakLkP6X9c/Vyyk+bMqwSJrA08hSsvoZrIg+r7FcNxAgEZNrX ZMdm3Mm+Gd0lBLOkmAnJyCMZoA06aOlyWh8+ggMhDCzxen4AxQlugQtgBTFke4LuA5JA 24scDWXl7cs+ie8F+6oDzSuqgA+/mJSHBLW6VEWrdRAX4Og08emASogC4p8/1sFTtCDq Z+Cg== 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 p10-20020a056a000b4a00b006824f156b00si1822010pfo.346.2023.07.18.09.56.08; Tue, 18 Jul 2023 09:56:22 -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 S233317AbjGRQzP (ORCPT + 99 others); Tue, 18 Jul 2023 12:55:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232030AbjGRQy6 (ORCPT ); Tue, 18 Jul 2023 12:54:58 -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 0526D199D for ; Tue, 18 Jul 2023 09:54:54 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5803:2d6d:5bbc:e252]) by albert.telenet-ops.be with bizsmtp id Ngur2A0080ucMBo06gurSX; Tue, 18 Jul 2023 18:54:52 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nXe-30; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gbQ-4A; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v2 04/41] drm: renesas: shmobile: Fix overlay plane disable Date: Tue, 18 Jul 2023 18:54:09 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: 1771778219365667911 X-GMAIL-MSGID: 1771778219365667911 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 --- 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; }