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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A69E2C433DF for ; Fri, 29 May 2020 11:44:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7BF7D207D4 for ; Fri, 29 May 2020 11:44:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="RrTm/HvN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7BF7D207D4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBD756E8CE; Fri, 29 May 2020 11:44:49 +0000 (UTC) Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id B851E6E8CC for ; Fri, 29 May 2020 11:44:47 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id v19so2944882wmj.0 for ; Fri, 29 May 2020 04:44:47 -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:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=CWZW0brigDhHuwUPT0N5cVqqNsShAY5Bk/tmJTlhXXo=; b=RrTm/HvNJjOdbrPVvxKE38bT5xR+b5JyglIpw9asfeiOeS0Zh1/M+hTW5cnn6jP7kH HZ3hbpnDSWS0Og9t7PDlJfI6GlMpwKLCQhWO0uDbmKswg7Y/0+qSwaAz3IgQITHXbss3 TRS+dFIY0xlGmsgFG0drFQJafI2COh1Pokna4= 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:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=CWZW0brigDhHuwUPT0N5cVqqNsShAY5Bk/tmJTlhXXo=; b=GA5Dl6pbC4yYMFjbLCA6s0d0ZJSqy7ba6iOudUiqT5laxiRHQjVo6FJUHk5Fyljal5 CINFODHqz/2F8LFzENjwiszlS3hNTy/NurXnfM0Hh07j1bcsX73Khw2kK6SK4ka0tYWi m+NUDSA1ORhBpZLRg27wQT+rEXY/Kfq3JniV59y7qlJ3vT7z7PKb9g5Y3Qzl4ETo+h2v mIcGBO22PzsR+6suIveLVMPS4ewuUQ86jT8p7aQ7bZViLzSX5SAKVtA4KUWjpK9Ut07w sjwgHzD3nO70HrmbN7Br3hqcHs5pzFNm2rTD+Ck/0gNZo5EMiEB/RJIbJGiY9emvbOBX VNDg== X-Gm-Message-State: AOAM533svFa4t677IUVuYHmpj2HpNe87Wqz8ihit6u1biYdBAoTSaTI2 5a9mSG/90VtXEKPt+cv9EEo49w== X-Google-Smtp-Source: ABdhPJxansyb5PnLxUfFjvBDCGBY1gLSJZ4svvnAjSRMab0yGi9/wjFJVcJYG8SAqxfgDkAsSZwAUQ== X-Received: by 2002:a7b:c358:: with SMTP id l24mr8638180wmj.13.1590752686181; Fri, 29 May 2020 04:44:46 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id c5sm9709168wrb.72.2020.05.29.04.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 04:44:45 -0700 (PDT) Date: Fri, 29 May 2020 13:39:17 +0200 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH] drm: use drm_dev_has_vblank more Message-ID: <20200529113917.GB1630358@phenom.ffwll.local> References: <20200527111134.1571781-1-daniel.vetter@ffwll.ch> <62d8b46c-0d77-5f37-2894-aea0d3b76ae1@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <62d8b46c-0d77-5f37-2894-aea0d3b76ae1@suse.de> X-Operating-System: Linux phenom 5.6.0-1-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , DRI Development , Daniel Vetter Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, May 27, 2020 at 02:02:12PM +0200, Thomas Zimmermann wrote: > = > Am 27.05.20 um 13:11 schrieb Daniel Vetter: > > For historical reasons it's called dev->num_crtcs, which is rather > > confusing ever since kms was added. But now we have a nice helper, so > > let's use it for better readability! > > = > > Only code change is in atomic helpers: vblank support means that > > dev->irq_enabled must be set too. Another one of these quirky things > > ... But since it's implied we can simplify that check. > > = > > Signed-off-by: Daniel Vetter > > Cc: Maarten Lankhorst > > Cc: Maxime Ripard > > Cc: Thomas Zimmermann > > Cc: David Airlie > > Cc: Daniel Vetter > = > Reviewed-by: Thomas Zimmermann Thanks for your review, patch queued up. -Daniel > = > > --- > > drivers/gpu/drm/drm_atomic_helper.c | 2 +- > > drivers/gpu/drm/drm_irq.c | 2 +- > > drivers/gpu/drm/drm_vblank.c | 14 +++++++------- > > 3 files changed, 9 insertions(+), 9 deletions(-) > > = > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_= atomic_helper.c > > index 0a541368246e..bfcc7857a9a1 100644 > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > @@ -1097,7 +1097,7 @@ disable_outputs(struct drm_device *dev, struct dr= m_atomic_state *old_state) > > else if (funcs->dpms) > > funcs->dpms(crtc, DRM_MODE_DPMS_OFF); > > = > > - if (!(dev->irq_enabled && dev->num_crtcs)) > > + if (!drm_dev_has_vblank(dev)) > > continue; > > = > > ret =3D drm_crtc_vblank_get(crtc); > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > > index 588be45abd7a..09d6e9e2e075 100644 > > --- a/drivers/gpu/drm/drm_irq.c > > +++ b/drivers/gpu/drm/drm_irq.c > > @@ -181,7 +181,7 @@ int drm_irq_uninstall(struct drm_device *dev) > > * vblank/irq handling. KMS drivers must ensure that vblanks are all > > * disabled when uninstalling the irq handler. > > */ > > - if (dev->num_crtcs) { > > + if (drm_dev_has_vblank(dev)) { > > spin_lock_irqsave(&dev->vbl_lock, irqflags); > > for (i =3D 0; i < dev->num_crtcs; i++) { > > struct drm_vblank_crtc *vblank =3D &dev->vblank[i]; > > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c > > index e278d6407f8e..162d9f7e692a 100644 > > --- a/drivers/gpu/drm/drm_vblank.c > > +++ b/drivers/gpu/drm/drm_vblank.c > > @@ -605,7 +605,7 @@ void drm_calc_timestamping_constants(struct drm_crt= c *crtc, > > int linedur_ns =3D 0, framedur_ns =3D 0; > > int dotclock =3D mode->crtc_clock; > > = > > - if (!dev->num_crtcs) > > + if (!drm_dev_has_vblank(dev)) > > return; > > = > > if (WARN_ON(pipe >=3D dev->num_crtcs)) > > @@ -1065,7 +1065,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *= crtc, > > unsigned int pipe =3D drm_crtc_index(crtc); > > ktime_t now; > > = > > - if (dev->num_crtcs > 0) { > > + if (drm_dev_has_vblank(dev)) { > > seq =3D drm_vblank_count_and_time(dev, pipe, &now); > > } else { > > seq =3D 0; > > @@ -1137,7 +1137,7 @@ static int drm_vblank_get(struct drm_device *dev,= unsigned int pipe) > > unsigned long irqflags; > > int ret =3D 0; > > = > > - if (!dev->num_crtcs) > > + if (!drm_dev_has_vblank(dev)) > > return -EINVAL; > > = > > if (WARN_ON(pipe >=3D dev->num_crtcs)) > > @@ -1506,7 +1506,7 @@ static void drm_legacy_vblank_pre_modeset(struct = drm_device *dev, > > struct drm_vblank_crtc *vblank =3D &dev->vblank[pipe]; > > = > > /* vblank is not initialized (IRQ not installed ?), or has been freed= */ > > - if (!dev->num_crtcs) > > + if (!drm_dev_has_vblank(dev)) > > return; > > = > > if (WARN_ON(pipe >=3D dev->num_crtcs)) > > @@ -1533,7 +1533,7 @@ static void drm_legacy_vblank_post_modeset(struct= drm_device *dev, > > unsigned long irqflags; > > = > > /* vblank is not initialized (IRQ not installed ?), or has been freed= */ > > - if (!dev->num_crtcs) > > + if (!drm_dev_has_vblank(dev)) > > return; > > = > > if (WARN_ON(pipe >=3D dev->num_crtcs)) > > @@ -1558,7 +1558,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_devic= e *dev, void *data, > > unsigned int pipe; > > = > > /* If drm_vblank_init() hasn't been called yet, just no-op */ > > - if (!dev->num_crtcs) > > + if (!drm_dev_has_vblank(dev)) > > return 0; > > = > > /* KMS drivers handle this internally */ > > @@ -1896,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, un= signed int pipe) > > unsigned long irqflags; > > bool disable_irq, fence_cookie; > > = > > - if (WARN_ON_ONCE(!dev->num_crtcs)) > > + if (WARN_ON_ONCE(!drm_dev_has_vblank(dev))) > > return false; > > = > > if (WARN_ON(pipe >=3D dev->num_crtcs)) > > = > = > -- = > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 N=FCrnberg, Germany > (HRB 36809, AG N=FCrnberg) > Gesch=E4ftsf=FChrer: Felix Imend=F6rffer > = -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel