From patchwork Fri Mar 3 13:27:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 9604895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F6DA60234 for ; Mon, 6 Mar 2017 00:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 916FF272F9 for ; Mon, 6 Mar 2017 00:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8668E27D45; Mon, 6 Mar 2017 00:10:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1639D272F9 for ; Mon, 6 Mar 2017 00:10:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FDCF6E38F; Mon, 6 Mar 2017 00:08:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtprelay.synopsys.com (us01smtprelay-2.synopsys.com [198.182.60.111]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE47A6ED1C for ; Fri, 3 Mar 2017 13:27:33 +0000 (UTC) Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id 4BE5110C1458; Fri, 3 Mar 2017 05:27:33 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 2DECE5B5; Fri, 3 Mar 2017 05:27:33 -0800 (PST) Received: from US01WEHTC3.internal.synopsys.com (us01wehtc3.internal.synopsys.com [10.15.84.232]) by mailhost.synopsys.com (Postfix) with ESMTP id 0FD015B1; Fri, 3 Mar 2017 05:27:33 -0800 (PST) Received: from DE02WEHTCB.internal.synopsys.com (10.225.19.94) by US01WEHTC3.internal.synopsys.com (10.15.84.232) with Microsoft SMTP Server (TLS) id 14.3.266.1; Fri, 3 Mar 2017 05:27:32 -0800 Received: from DE02WEMBXB.internal.synopsys.com ([fe80::95ce:118a:8321:a099]) by DE02WEHTCB.internal.synopsys.com ([::1]) with mapi id 14.03.0266.001; Fri, 3 Mar 2017 14:27:30 +0100 From: Alexey Brodkin To: "daniel@ffwll.ch" Subject: Re: [PATCH] drm/arcpgu: use .mode_fixup instead of .atomic_check Thread-Topic: [PATCH] drm/arcpgu: use .mode_fixup instead of .atomic_check Thread-Index: AQHSk3pbdSSv6ibt+0alj80EoRWJA6GB5e0AgAEmKoA= Date: Fri, 3 Mar 2017 13:27:30 +0000 Message-ID: <1488547649.2940.5.camel@synopsys.com> References: <1488475674-6694-1-git-send-email-abrodkin@synopsys.com> <20170302195437.mlhzia2q2oav27mr@phenom.ffwll.local> In-Reply-To: <20170302195437.mlhzia2q2oav27mr@phenom.ffwll.local> Accept-Language: en-US, ru-RU Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.121.8.45] Content-ID: <2F560457E31F02458E7087E5AA1FAF02@internal.synopsys.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 06 Mar 2017 00:08:29 +0000 Cc: "Jose.Abreu@synopsys.com" , "daniel.vetter@ffwll.ch" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "linux-snps-arc@lists.infradead.org" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Daniel, On Thu, 2017-03-02 at 20:54 +0100, Daniel Vetter wrote: > On Thu, Mar 02, 2017 at 08:27:54PM +0300, Alexey Brodkin wrote: > > > > Since we cannot always generate exactly requested pixel clock > > there's not much sense in checking requested_clock == clk_round_rate(). > > In that case for quite some modes we'll be getting -EINVAL and no video > > output at all. > > > > But given there's some tolerance to real pixel clock in TVs/monitors > > we may still give it a try with the clock as close to requested one as > > PLL on the board may generate. So we just do a fixup to what current > > board may provide. > > > > Signed-off-by: Alexey Brodkin > > Cc: Daniel Vetter > > Cc: David Airlie > > Cc: Jose Abreu > > --- > >  drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +++++++--------- > >  1 file changed, 7 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c > > index ad9a95916f1f..3f2823c1efc3 100644 > > --- a/drivers/gpu/drm/arc/arcpgu_crtc.c > > +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c > > @@ -129,18 +129,16 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc) > >         ~ARCPGU_CTRL_ENABLE_MASK); > >  } > >   > > -static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc, > > -      struct drm_crtc_state *state) > > +static bool arc_pgu_crtc_mode_fixup(struct drm_crtc *crtc, > > +     const struct drm_display_mode *mode, > > +     struct drm_display_mode *adjusted_mode) > > This isn't required at all, see drm_crtc_state.adjusted_mode. Just update > that and you're good - .mode_fixup is the backwards compatibility function > for old kms drivers, atomic_check is strictly more powerful. So if I understood you correct here what I really need is just to get rid of existing check, right? I.e. the following is to be in v2 respin: ------------------------------->8------------------------------- > Please also make sure the documentation properly explains this, and if > not, please submit a patch to improve it. You mean explains what? That .mode_fixup is not meant to be used in new code? -Alexey diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c index ad9a95916f1f..86f1555914e8 100644 --- a/drivers/gpu/drm/arc/arcpgu_crtc.c +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c @@ -129,20 +129,6 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc)                               ~ARCPGU_CTRL_ENABLE_MASK);  }   -static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc, -                                    struct drm_crtc_state *state) -{ -       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); -       struct drm_display_mode *mode = &state->adjusted_mode; -       long rate, clk_rate = mode->clock * 1000; - -       rate = clk_round_rate(arcpgu->clk, clk_rate); -       if (rate != clk_rate) -               return -EINVAL; - -       return 0; -} -  static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,                                       struct drm_crtc_state *state)  { @@ -165,7 +151,6 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {         .disable        = arc_pgu_crtc_disable,         .prepare        = arc_pgu_crtc_disable,         .commit         = arc_pgu_crtc_enable, -       .atomic_check   = arc_pgu_crtc_atomic_check,         .atomic_begin   = arc_pgu_crtc_atomic_begin,  }; ------------------------------->8-------------------------------