From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B282C4338F for ; Tue, 10 Aug 2021 10:20:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6185161075 for ; Tue, 10 Aug 2021 10:20:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238876AbhHJKVK (ORCPT ); Tue, 10 Aug 2021 06:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238922AbhHJKVF (ORCPT ); Tue, 10 Aug 2021 06:21:05 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64B8EC0613D3 for ; Tue, 10 Aug 2021 03:20:42 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id f5so9742224wrm.13 for ; Tue, 10 Aug 2021 03:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=8RAzZS2hEugFiV4ZxID8a4ZMcTz4OPkpeI06mw37uVk=; b=DGGlOAZ2n6wwyKWNsJB+0bvHEx3kSPt1H9FV85g0/pWtL6jz/f/Cn1YObyE+d4c2QT wQH+IfYdz+EmuExe4c1zux72MY8itRr6ZfAkS4qy/ShxWysYpsRFj8y10/2ftXmLZ//3 UPDoAxBSgq4gfttlRqNEHxnR3EKm+2s1lZnSE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=8RAzZS2hEugFiV4ZxID8a4ZMcTz4OPkpeI06mw37uVk=; b=lFWe6jEkFuseonPcH1ZdGplDXxtjz9XUGi9Vhqao/pMpw27+y6Rq2wfC4ev3DUpDeB 3OGTdrqRlezBGFh+dlR8uZNOSCCooRnJ0tfxmuSjmyhv3bN6uJrRJJJ1sc+BMS3UAiOA 7RaU1pvWkx4Mlx3jcCs7Fhtie3Umc3LEZ6B3A+EKASbEEX2yFTrKyejkCsk+RGdGPk+i o9HqgO2H9KKlNXWojHiMuP5DR762K5hsrhfJuI1S5KbKVX3T8pq8qZ3JU4Hy/MDsvlYo 3l5vO2l1GtJPq+lKN+v4+kvGQtfh8oVwjJwWXXhkVFTt1ZHh8qnVPNN5/lASuJtG0ND2 sQGQ== X-Gm-Message-State: AOAM533mhhesxYVz/F1PKiIIvw9Zrfa6HsXTXEnqdrn6Zhk4KE9IWdWL D5m0ZQg+qccuhalWaMjat/XHXQ== X-Google-Smtp-Source: ABdhPJxE4DlZ7A2HljtV10Bk58EMZUJKx7lMKSfiibUOtkXLH7tUkPVu6ftZl2LbyOCfq4M/TbeUyQ== X-Received: by 2002:adf:90b1:: with SMTP id i46mr16671362wri.159.1628590840965; Tue, 10 Aug 2021 03:20:40 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f17sm26871903wrt.18.2021.08.10.03.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 03:20:40 -0700 (PDT) Date: Tue, 10 Aug 2021 12:20:38 +0200 From: Daniel Vetter To: Paul Cercueil Cc: David Airlie , Daniel Vetter , "H . Nikolaus Schaller" , Paul Boddie , list@opendingux.net, Sam Ravnborg , linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/8] drm/ingenic: Use standard drm_atomic_helper_commit_tail Message-ID: Mail-Followup-To: Paul Cercueil , David Airlie , "H . Nikolaus Schaller" , Paul Boddie , list@opendingux.net, Sam Ravnborg , linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20210808134526.119198-1-paul@crapouillou.net> <20210808134526.119198-4-paul@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210808134526.119198-4-paul@crapouillou.net> X-Operating-System: Linux phenom 5.10.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Sun, Aug 08, 2021 at 03:45:21PM +0200, Paul Cercueil wrote: > By making the CRTC's .vblank_enable() function return an error when it > is known that the hardware won't deliver a VBLANK, we can drop the > ingenic_drm_atomic_helper_commit_tail() function and use the standard > drm_atomic_helper_commit_tail() function instead. > > Signed-off-by: Paul Cercueil > --- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 ++++------------------- > 1 file changed, 4 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index bc71ba44ccf4..3ed7c27a8dde 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -706,29 +706,6 @@ static int ingenic_drm_encoder_atomic_check(struct drm_encoder *encoder, > } > } > > -static void ingenic_drm_atomic_helper_commit_tail(struct drm_atomic_state *old_state) > -{ > - /* > - * Just your regular drm_atomic_helper_commit_tail(), but only calls > - * drm_atomic_helper_wait_for_vblanks() if priv->no_vblank. > - */ > - struct drm_device *dev = old_state->dev; > - struct ingenic_drm *priv = drm_device_get_priv(dev); > - > - drm_atomic_helper_commit_modeset_disables(dev, old_state); > - > - drm_atomic_helper_commit_planes(dev, old_state, 0); > - > - drm_atomic_helper_commit_modeset_enables(dev, old_state); > - > - drm_atomic_helper_commit_hw_done(old_state); > - > - if (!priv->no_vblank) > - drm_atomic_helper_wait_for_vblanks(dev, old_state); > - > - drm_atomic_helper_cleanup_planes(dev, old_state); > -} > - > static irqreturn_t ingenic_drm_irq_handler(int irq, void *arg) > { > struct ingenic_drm *priv = drm_device_get_priv(arg); > @@ -749,6 +726,9 @@ static int ingenic_drm_enable_vblank(struct drm_crtc *crtc) > { > struct ingenic_drm *priv = drm_crtc_get_priv(crtc); > > + if (priv->no_vblank) > + return -EWOULDBLOCK; I think other drivers return EINVAL here. I'm not sure exactly this is specified, but the errno here is visible to userspace. Maybe would be good to update the kerneldoc for this hook? Anyway this is great, with the errno fixed: Reviewed-by: Daniel Vetter > + > regmap_update_bits(priv->map, JZ_REG_LCD_CTRL, > JZ_LCD_CTRL_EOF_IRQ, JZ_LCD_CTRL_EOF_IRQ); > > @@ -856,7 +836,7 @@ static const struct drm_mode_config_funcs ingenic_drm_mode_config_funcs = { > }; > > static struct drm_mode_config_helper_funcs ingenic_drm_mode_config_helpers = { > - .atomic_commit_tail = ingenic_drm_atomic_helper_commit_tail, > + .atomic_commit_tail = drm_atomic_helper_commit_tail, > }; > > static void ingenic_drm_unbind_all(void *d) > -- > 2.30.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch