From patchwork Thu Jun 22 09:21:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 111554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4937452vqr; Thu, 22 Jun 2023 02:33:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7rRwoIBiXIdz2wB2LcnoeBAA50vZtl2brZ45tExC7jHMb4TgosyBZFwFjCPZjid7hfx3au X-Received: by 2002:aa7:88d0:0:b0:66a:3eb5:92bb with SMTP id k16-20020aa788d0000000b0066a3eb592bbmr4687459pff.11.1687426402426; Thu, 22 Jun 2023 02:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687426402; cv=none; d=google.com; s=arc-20160816; b=OnsFWUM3D7UYbxka/eSRHjDHgiYsTYvJqfNe4I2i2K8tIGW+rtxHOPkEQiZpH3pF24 Mq8FyR/Ps0J1lNaWn2invD+9/31pAw3mMrrQXlC9/l0TjHJvNRhEox2nsv/tFb6BXUUS ahQe8Fn5zfJPxLcVkl4YtdnyruVmWGUk5DF4z+lPeIEIfsLXCQTEhnFyAA5ilntJbM+Z eeV8faqMT0FEXJ9JsKHK2caYb4jPYQs5a9yZh9FVlY3izJXvcCjrXAiphuT0Ciiy6Ru2 mVnmUiwTShzHjg+GJ1dnU9FHy3Ct15BevINMrdVmoIGABIF19CDmWMSlKfS8/W5Hvskg 3cCw== 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=PNvB/hIFhrvwkICQLtHhGAAeVIKPYkwefn+HiWp0A1g=; b=QHSd+VMd3N31uH7CosMS7xpG5msmfCGMHPb1wh9+4JutQw9u6dhm32wpeuDfzR4/iv 475nkyf8QWncdkqTYwjJ8R4aVeqnLIAS/0YvbQjZb2ko9hVwtgm2mOoEuKjM5WtWmVqr ED5fq6PPWsrGwV+uz+KMFpchK2xCZJjRA7cgqTYn9O+r0DC7dY37Wi7fjr1V+0FWyTWE JE4bQA5eN7w4cedm+led/6jiTT7aaYhI0GOELThWY/2SvQBuI5tGgU+jnIkDHfQXm4sB qLeR2dynW+solV8hl7kDlnu44e8+7NEOvg8Va/y19AnKaN2lffJi30wVymO0XWOJZl8L ndkg== 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 i123-20020a625481000000b00666669afe56si302534pfb.250.2023.06.22.02.32.58; Thu, 22 Jun 2023 02:33: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 S231975AbjFVJbC (ORCPT + 99 others); Thu, 22 Jun 2023 05:31:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232327AbjFVJ3t (ORCPT ); Thu, 22 Jun 2023 05:29:49 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4233F4ECD for ; Thu, 22 Jun 2023 02:22:47 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed20:991a:a831:ea4b:6058]) by michel.telenet-ops.be with bizsmtp id C9Nj2A00j1yfRTD069NjDZ; Thu, 22 Jun 2023 11:22:44 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qCGWY-000Bx8-2s; Thu, 22 Jun 2023 11:22:43 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qCGWZ-003Vxr-MA; Thu, 22 Jun 2023 11:22:43 +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 Subject: [PATCH 29/39] drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip() Date: Thu, 22 Jun 2023 11:21:41 +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=ham 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769394827636103166?= X-GMAIL-MSGID: =?utf-8?q?1769394827636103166?= Move the shmob_drm_crtc_finish_page_flip() function up, to avoid having to move it during the modification in the next change. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 2c0ca802d36026f4..1d7fcf64bf2aab80 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -270,6 +270,30 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) scrtc->started = true; } +/* ----------------------------------------------------------------------------- + * Page Flip + */ + +void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) +{ + struct drm_pending_vblank_event *event; + struct drm_device *dev = scrtc->base.dev; + unsigned long flags; + + spin_lock_irqsave(&dev->event_lock, flags); + event = scrtc->event; + scrtc->event = NULL; + if (event) { + drm_crtc_send_vblank_event(&scrtc->base, event); + drm_crtc_vblank_put(&scrtc->base); + } + spin_unlock_irqrestore(&dev->event_lock, flags); +} + +/* ----------------------------------------------------------------------------- + * CRTC Functions + */ + static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) { struct drm_crtc *crtc = &scrtc->base; @@ -412,22 +436,6 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .mode_set_base = shmob_drm_crtc_mode_set_base, }; -void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) -{ - struct drm_pending_vblank_event *event; - struct drm_device *dev = scrtc->base.dev; - unsigned long flags; - - spin_lock_irqsave(&dev->event_lock, flags); - event = scrtc->event; - scrtc->event = NULL; - if (event) { - drm_crtc_send_vblank_event(&scrtc->base, event); - drm_crtc_vblank_put(&scrtc->base); - } - spin_unlock_irqrestore(&dev->event_lock, flags); -} - static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event,