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 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 31497C33CAB for ; Sun, 12 Jan 2020 22:54:37 +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 0721F21556 for ; Sun, 12 Jan 2020 22:54:36 +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="Nez+9afs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0721F21556 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 7B29A89FDB; Sun, 12 Jan 2020 22:54:36 +0000 (UTC) Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8BD989FF6 for ; Sun, 12 Jan 2020 22:54:35 +0000 (UTC) Received: by mail-pj1-x1042.google.com with SMTP id s7so3454495pjc.0 for ; Sun, 12 Jan 2020 14:54:35 -0800 (PST) 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:in-reply-to; bh=E8mO1B5j6mzKAR0DdEHxInx788qZQtO7FxX79mesKmw=; b=Nez+9afsB/N5CINq5KjzF4TygYJm13ll+kghYAglZ2rNzuxPuKvbX0lgNaHWMyAyeQ d5NDaSAPchb1TjCu0MY2iKCwkiPJ+rIM1fumisSDe7oO05BhSA7RrzpBA60sKf/NNjjR rGIuiZvV5cpGgc2BuJz8eJaIss932+ujLrkAc= 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:in-reply-to; bh=E8mO1B5j6mzKAR0DdEHxInx788qZQtO7FxX79mesKmw=; b=kW5HvZM9DqE35TbDe3RyD7R4xScyxcY5hh8mROL/0SWgpXOBX7/zprVNJV2KHO4Fdw 0A9f4w6m2gpgZ20nFrd8jCEtJX7ez2JvOiv3XhL07VrXshOepJs6mPS3dwlDXZCO70Vg ImKcA4ecx8C+QgoQ3/1fOkV+5JK2441EafREZo2ExAE1gSJ1jhZqnZ4VMnDxKMC72PG1 x8c3CbNfbszgxYJ+N948YrU57rQN5hQyhZKu4aZqtBDZ9HRF+FmP3SWjFHhQU35YlYcR NQYA3KWruN83YK7KE+5Fjsqrx1WCmK2sSiwiGk8i1hc/evm7jAbLwY0uPgEiJczd8Cnv zsYw== X-Gm-Message-State: APjAAAX7ZpnlvDwqtCXqlKJbrw9PZL8HUvDP3PFO+5dW9s98O7kInjtw Z14232McaH6/s7hAOGnyfkcZQg== X-Google-Smtp-Source: APXvYqzunwx+H/9dNjIeZUqcVKdATd8JGNjjxSsMtcwlIXIy4LuXX9vwxBGVKmdCQxT+f609mxMCFQ== X-Received: by 2002:a17:90a:c706:: with SMTP id o6mr18336357pjt.82.1578869675220; Sun, 12 Jan 2020 14:54:35 -0800 (PST) Received: from dvetter-linux.ger.corp.intel.com ([138.44.248.126]) by smtp.gmail.com with ESMTPSA id z26sm10444138pgu.80.2020.01.12.14.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 14:54:34 -0800 (PST) Date: Sun, 12 Jan 2020 23:54:21 +0100 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH 23/23] drm: Cleanup VBLANK callbacks in struct drm_driver Message-ID: <20200112225421.GD5340@dvetter-linux.ger.corp.intel.com> References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-24-tzimmermann@suse.de> <20200112225312.GC5340@dvetter-linux.ger.corp.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200112225312.GC5340@dvetter-linux.ger.corp.intel.com> X-Operating-System: Linux dvetter-linux.ger.corp.intel.com 5.2.11-200.fc30.x86_64 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: hamohammed.sa@gmail.com, airlied@linux.ie, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, alexandre.torgue@st.com, thellstrom@vmware.com, sean@poorly.run, linux-graphics-maintainer@vmware.com, bskeggs@redhat.com, mcoquelin.stm32@gmail.com, sunpeng.li@amd.com, linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, rodrigo.vivi@intel.com, vincent.abriou@st.com, rodrigosiqueiramelo@gmail.com, philippe.cornu@st.com, yannick.fertre@st.com, alexander.deucher@amd.com, freedreno@lists.freedesktop.org, christian.koenig@amd.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sun, Jan 12, 2020 at 11:53:12PM +0100, Daniel Vetter wrote: > On Fri, Jan 10, 2020 at 10:21:27AM +0100, Thomas Zimmermann wrote: > > All non-legacy users of VBLANK functions in struct drm_driver have been > > converted to use the respective interfaces in struct drm_crtc_funcs. The > > remaining users of VBLANK callbacks in struct drm_driver are legacy drivers > > with userspace modesetting. > > > > There are no users left of get_vblank_timestamp(), so the callback is > > being removed. The other VBLANK callbacks are being moved to the legacy > > section at the end of struct drm_driver. > > > > Signed-off-by: Thomas Zimmermann > > I think sprinkling some WARN_ON (in drm_dev_register or wherever) if new > drivers try to use the legacy hooks would be really nice. Experience says > someone is going to copypaste this stuff around forever otherwise. I meant to add: As a follow-up patch. -Daniel > > Reviewed-by: Daniel Vetter > > > --- > > drivers/gpu/drm/drm_vblank.c | 39 +++++--------- > > include/drm/drm_drv.h | 101 ++--------------------------------- > > 2 files changed, 17 insertions(+), 123 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c > > index 7cf436a4b908..ceff68474d4d 100644 > > --- a/drivers/gpu/drm/drm_vblank.c > > +++ b/drivers/gpu/drm/drm_vblank.c > > @@ -138,10 +138,9 @@ static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe) > > > > if (crtc->funcs->get_vblank_counter) > > return crtc->funcs->get_vblank_counter(crtc); > > - } > > - > > - if (dev->driver->get_vblank_counter) > > + } else if (dev->driver->get_vblank_counter) { > > return dev->driver->get_vblank_counter(dev, pipe); > > + } > > > > return drm_vblank_no_hw_counter(dev, pipe); > > } > > @@ -334,8 +333,7 @@ u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) > > unsigned long flags; > > > > WARN_ONCE(drm_debug_enabled(DRM_UT_VBL) && > > - !crtc->funcs->get_vblank_timestamp && > > - !dev->driver->get_vblank_timestamp, > > + !crtc->funcs->get_vblank_timestamp, > > "This function requires support for accurate vblank timestamps."); > > > > spin_lock_irqsave(&dev->vblank_time_lock, flags); > > @@ -357,13 +355,11 @@ static void __disable_vblank(struct drm_device *dev, unsigned int pipe) > > if (WARN_ON(!crtc)) > > return; > > > > - if (crtc->funcs->disable_vblank) { > > + if (crtc->funcs->disable_vblank) > > crtc->funcs->disable_vblank(crtc); > > - return; > > - } > > + } else { > > + dev->driver->disable_vblank(dev, pipe); > > } > > - > > - dev->driver->disable_vblank(dev, pipe); > > } > > > > /* > > @@ -791,9 +787,6 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe, > > > > ret = crtc->funcs->get_vblank_timestamp(crtc, &max_error, > > tvblank, in_vblank_irq); > > - } else if (dev->driver->get_vblank_timestamp && (max_error > 0)) { > > - ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error, > > - tvblank, in_vblank_irq); > > } > > > > /* GPU high precision timestamp query unsupported or failed. > > @@ -1016,9 +1009,11 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe) > > > > if (crtc->funcs->enable_vblank) > > return crtc->funcs->enable_vblank(crtc); > > + } else if (dev->driver->enable_vblank) { > > + return dev->driver->enable_vblank(dev, pipe); > > } > > > > - return dev->driver->enable_vblank(dev, pipe); > > + return -EINVAL; > > } > > > > static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe) > > @@ -1109,13 +1104,10 @@ static bool __vblank_disable_immediate(struct drm_device *dev, unsigned int pipe > > return false; > > > > crtc = drm_crtc_from_index(dev, pipe); > > - if (crtc && crtc->funcs->get_vblank_timestamp) > > - return true; > > - > > - if (dev->driver->get_vblank_timestamp) > > - return true; > > + if (!crtc || !crtc->funcs->get_vblank_timestamp) > > + return false; > > > > - return false; > > + return true; > > } > > > > static void drm_vblank_put(struct drm_device *dev, unsigned int pipe) > > @@ -1798,7 +1790,6 @@ static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe) > > struct drm_pending_vblank_event *e, *t; > > ktime_t now; > > u64 seq; > > - bool high_prec; > > > > assert_spin_locked(&dev->event_lock); > > > > @@ -1818,10 +1809,8 @@ static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe) > > send_vblank_event(dev, e, seq, now); > > } > > > > - high_prec = crtc->funcs->get_vblank_timestamp || > > - dev->driver->get_vblank_timestamp; > > - > > - trace_drm_vblank_event(pipe, seq, now, high_prec); > > + trace_drm_vblank_event(pipe, seq, now, > > + crtc->funcs->get_vblank_timestamp != NULL); > > } > > > > /** > > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > > index b704e252f3b2..e290b3aca6eb 100644 > > --- a/include/drm/drm_drv.h > > +++ b/include/drm/drm_drv.h > > @@ -268,104 +268,6 @@ struct drm_driver { > > */ > > void (*release) (struct drm_device *); > > > > - /** > > - * @get_vblank_counter: > > - * > > - * Driver callback for fetching a raw hardware vblank counter for the > > - * CRTC specified with the pipe argument. If a device doesn't have a > > - * hardware counter, the driver can simply leave the hook as NULL. > > - * The DRM core will account for missed vblank events while interrupts > > - * where disabled based on system timestamps. > > - * > > - * Wraparound handling and loss of events due to modesetting is dealt > > - * with in the DRM core code, as long as drivers call > > - * drm_crtc_vblank_off() and drm_crtc_vblank_on() when disabling or > > - * enabling a CRTC. > > - * > > - * This is deprecated and should not be used by new drivers. > > - * Use &drm_crtc_funcs.get_vblank_counter instead. > > - * > > - * Returns: > > - * > > - * Raw vblank counter value. > > - */ > > - u32 (*get_vblank_counter) (struct drm_device *dev, unsigned int pipe); > > - > > - /** > > - * @enable_vblank: > > - * > > - * Enable vblank interrupts for the CRTC specified with the pipe > > - * argument. > > - * > > - * This is deprecated and should not be used by new drivers. > > - * Use &drm_crtc_funcs.enable_vblank instead. > > - * > > - * Returns: > > - * > > - * Zero on success, appropriate errno if the given @crtc's vblank > > - * interrupt cannot be enabled. > > - */ > > - int (*enable_vblank) (struct drm_device *dev, unsigned int pipe); > > - > > - /** > > - * @disable_vblank: > > - * > > - * Disable vblank interrupts for the CRTC specified with the pipe > > - * argument. > > - * > > - * This is deprecated and should not be used by new drivers. > > - * Use &drm_crtc_funcs.disable_vblank instead. > > - */ > > - void (*disable_vblank) (struct drm_device *dev, unsigned int pipe); > > - > > - /** > > - * @get_vblank_timestamp: > > - * > > - * Called by drm_get_last_vbltimestamp(). Should return a precise > > - * timestamp when the most recent VBLANK interval ended or will end. > > - * > > - * Specifically, the timestamp in @vblank_time should correspond as > > - * closely as possible to the time when the first video scanline of > > - * the video frame after the end of VBLANK will start scanning out, > > - * the time immediately after end of the VBLANK interval. If the > > - * @crtc is currently inside VBLANK, this will be a time in the future. > > - * If the @crtc is currently scanning out a frame, this will be the > > - * past start time of the current scanout. This is meant to adhere > > - * to the OpenML OML_sync_control extension specification. > > - * > > - * Paramters: > > - * > > - * dev: > > - * dev DRM device handle. > > - * pipe: > > - * crtc for which timestamp should be returned. > > - * max_error: > > - * Maximum allowable timestamp error in nanoseconds. > > - * Implementation should strive to provide timestamp > > - * with an error of at most max_error nanoseconds. > > - * Returns true upper bound on error for timestamp. > > - * vblank_time: > > - * Target location for returned vblank timestamp. > > - * in_vblank_irq: > > - * True when called from drm_crtc_handle_vblank(). Some drivers > > - * need to apply some workarounds for gpu-specific vblank irq quirks > > - * if flag is set. > > - * > > - * Returns: > > - * > > - * True on success, false on failure, which means the core should > > - * fallback to a simple timestamp taken in drm_crtc_handle_vblank(). > > - * > > - * FIXME: > > - * > > - * We should move this hook to &struct drm_crtc_funcs like all the other > > - * vblank hooks. > > - */ > > - bool (*get_vblank_timestamp) (struct drm_device *dev, unsigned int pipe, > > - int *max_error, > > - ktime_t *vblank_time, > > - bool in_vblank_irq); > > - > > /** > > * @irq_handler: > > * > > @@ -720,6 +622,9 @@ struct drm_driver { > > int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); > > int (*dma_quiescent) (struct drm_device *); > > int (*context_dtor) (struct drm_device *dev, int context); > > + u32 (*get_vblank_counter)(struct drm_device *dev, unsigned int pipe); > > + int (*enable_vblank)(struct drm_device *dev, unsigned int pipe); > > + void (*disable_vblank)(struct drm_device *dev, unsigned int pipe); > > int dev_priv_size; > > }; > > > > -- > > 2.24.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- 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