Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2548206ybk; Tue, 12 May 2020 02:06:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8hFaXmH2wf+kxQln3zA3SkdPldGO8nBmqXU6kmTzkq5HZc7XNRt+iawDw3RDaNx8pEaN4 X-Received: by 2002:a17:906:16c2:: with SMTP id t2mr1486727ejd.17.1589274376925; Tue, 12 May 2020 02:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589274376; cv=none; d=google.com; s=arc-20160816; b=bzTnBKzOSOlivLs1gf/kjFD7JXgSwCiPOgo6ogF76yxXgeoN7Z4KbYdUxf4eKUKBOm gnbevYMsPFAnB5iTBpBlrptr1dOXcpuOZhZUpAg7a7toS65FpD7+rqTbziNuxZ4ttsIn MKio4X4ds365LNqEpXon0Mazv7jZbM+mDapml6mq5iWbBPGXsFvMjFe6m7RPSikwqju0 xnpFWQw/OSloYfm348rPBrdYl6CeEe2sMxvBN36Y3ZAM9ZtqIb7t+s2j2dowNtHwalnv ggRDLJ6WgFMpKX+cZoOqJ0o3L3RS7dL3CZM57N5uFyFExQDMVZY5kIu08RqrAfxYoXQo jOaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=k3OodW5bIt6jtahEoyPvdqvd8L7bfSaZtDSgdgQ0KSE=; b=Jeu6kolFXInptMHe+wCC23iyShR6fu57mD3vduLaA6hl6sZBsSk3cicj8t4hALoyoi yNqYI0ZzPuMzNrZvusYZtRsHgAufXAp+Pz5kvCxEunFec5GsKb2VLB3MrfrTHgoYE2ql vbec3es1IA0pgfosF72wwrdzIPv1O29zh7H9yI18+oxTd9UlYpGUAmvSit2mcz0j0ZRj iE+EI1cTgbcjKQDzie63IoNnz7jx5rnlVoC2zf6yEjXt5DjKSyUYgyo99hcraCnkZUX3 pYm1xvS5lwgDgsD2sPc+kZJ1VskHn5gp6zp6FEU3fXJyM09yzSZYzY5E0eYYdKHqjZYB +DMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b="Tba/CBQc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j22si2184599edt.526.2020.05.12.02.05.53; Tue, 12 May 2020 02:06:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b="Tba/CBQc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729540AbgELJBO (ORCPT + 99 others); Tue, 12 May 2020 05:01:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729351AbgELJAD (ORCPT ); Tue, 12 May 2020 05:00:03 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F4E5C061A0C for ; Tue, 12 May 2020 02:00:03 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id l11so8435393wru.0 for ; Tue, 12 May 2020 02:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k3OodW5bIt6jtahEoyPvdqvd8L7bfSaZtDSgdgQ0KSE=; b=Tba/CBQcoFuTPwNcOK0uHe+q5z5Fq6i1EP5lEPO6yQnGb0xZi3OTwd+ZAJUMrRox80 JQxMbr1Hy5zgQtio1imHYMaQf8uOuY/D0v6qpXbtodzS2aPiBGDFHO2m+fo/NUnJQtIa 9QatpvOy7g08efja4D6G7OF9WYNAibebHkhiY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k3OodW5bIt6jtahEoyPvdqvd8L7bfSaZtDSgdgQ0KSE=; b=FoIi3c/P/Qv5RLCdRkXV4N8mxGY6xxM7L89oJKCyi5odXXeUssvtCM5o02Mt6kqPqj rsDos3Pq7n9Qx6cheRYSmObg3X71/ugZ0UdzfOJxEP6ZcnY8rIFonE9Czwf+M3PZF+fQ 5Ex2+D1KsjSQWn3dhNJjo0ESEPAK+bdcHPnP1boCNS0HsLYwfHdRXKyR/3twytEaLqKR JyPYaYDInegHRpal0URWeLlXf5+6y18gDZ/8oCtctl7X23ybzDq6wPWue1jb/oDzHiuu EM9ZMVSohrsGwgrmYYoB9YyX/U0+Y0XYnsAGBYdaf+cOKreYumzbmcOE4/QB/0gdyQ02 LXng== X-Gm-Message-State: AGi0PuZy61PAG2pYu6qHsPkco80GN9zZIMPwxIVftFNsgbo+SpJ0Kwi1 Lqn9v+vySBZaI+XSva4i7GBzNA== X-Received: by 2002:adf:ca0e:: with SMTP id o14mr25265512wrh.254.1589274001957; Tue, 12 May 2020 02:00:01 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id y10sm18845457wrd.95.2020.05.12.02.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 02:00:01 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: LKML , Daniel Vetter , linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-rdma@vger.kernel.org, amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Chris Wilson , Maarten Lankhorst , =?UTF-8?q?Christian=20K=C3=B6nig?= , Daniel Vetter Subject: [RFC 05/17] drm/vblank: Annotate with dma-fence signalling section Date: Tue, 12 May 2020 10:59:32 +0200 Message-Id: <20200512085944.222637-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512085944.222637-1-daniel.vetter@ffwll.ch> References: <20200512085944.222637-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is rather overkill since currently all drivers call this from hardirq (or at least timers). But maybe in the future we're going to have thread irq handlers and what not, doesn't hurt to be prepared. Plus this is an easy start for sprinkling these fence annotations into shared code. Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Cc: linux-rdma@vger.kernel.org Cc: amd-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Cc: Chris Wilson Cc: Maarten Lankhorst Cc: Christian König Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_vblank.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index 758bf74e1cab..125ef0c0f9a1 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -24,6 +24,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include #include #include @@ -1895,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) { struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; unsigned long irqflags; - bool disable_irq; + bool disable_irq, fence_cookie; if (WARN_ON_ONCE(!dev->num_crtcs)) return false; @@ -1903,6 +1904,8 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) if (WARN_ON(pipe >= dev->num_crtcs)) return false; + fence_cookie = dma_fence_begin_signalling(); + spin_lock_irqsave(&dev->event_lock, irqflags); /* Need timestamp lock to prevent concurrent execution with @@ -1915,6 +1918,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) if (!vblank->enabled) { spin_unlock(&dev->vblank_time_lock); spin_unlock_irqrestore(&dev->event_lock, irqflags); + dma_fence_end_signalling(fence_cookie); return false; } @@ -1940,6 +1944,8 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) if (disable_irq) vblank_disable_fn(&vblank->disable_timer); + dma_fence_end_signalling(fence_cookie); + return true; } EXPORT_SYMBOL(drm_handle_vblank); -- 2.26.2