From patchwork Thu Mar 2 23:53:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13158104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B9EDAC6FA8E for ; Thu, 2 Mar 2023 23:54:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1705010E5BF; Thu, 2 Mar 2023 23:54:25 +0000 (UTC) Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by gabe.freedesktop.org (Postfix) with ESMTPS id E584F10E5B2; Thu, 2 Mar 2023 23:54:22 +0000 (UTC) Received: by mail-pg1-x52e.google.com with SMTP id d6so504018pgu.2; Thu, 02 Mar 2023 15:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677801262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MXVtv6kxe3TDMQ2pw6mJDt0CFb+4GUA2rpUfR00AfQQ=; b=Z61bfh00Rec8zY5KmfpfHiKo+C2+EC3BX+zxN86/3V50gTS1EA+yUmnvTqbEF5gU2o ue2/h/GeUQXz4CmaZG3BWbKWHplzMfNB8f0i3AXm32c5V25DzEhWkHABjVgEuXuqlrsE PfVcfkB8vgPByxFw8lj7KewXv+0Zi+kLga1mF5h5+/FdebTukkwwBgL5MP4NIR3nVhGA wBBjWaaPJ1PKzLiKFKuOdCdJOW7DYKuax/FSynCJeRJsfOswB5Plvm7XptszT7I9KXRF K446aSXTE3vqRlEXjp/7AlsoHI98maOY4kjkl1+C+0iu95/kZekWobxS+hvob6ScpD3K 9UnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677801262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXVtv6kxe3TDMQ2pw6mJDt0CFb+4GUA2rpUfR00AfQQ=; b=BBtlNfM1Urn2goUs+LEBVsS+zM0rmOLGzt3m6xVRZTquqckHjxjtQpr+3NcY5ZQT5G IHpksudY7uQbe8akCzgMupXQsc/VucYmg3yBxEMYvmsHtotZ+AOv4/lJ8wgDdUeFpBzU e4BrLVLiCTUCHzeEFAwiArbHNYw0AKv4SrQJxEF6Lo2Cac0Re48fEGhPZLva2hejWLbC 68AspHSOMUJPb6GpcGVNQZhTzsdwUgOoQER41evJMYVuUMctAISuAE7I33FvQfmFL15g RMIHm/pRpoVC+rg8LOeFKyQhhHAjnXv4FdvzuE1AaR2ZSyHAKKRdNywzSk/YLFDh5tdy bdzg== X-Gm-Message-State: AO0yUKXd8WAgQPvyWyQGmigH1oqYDFEya+wvRDYJ1HikXKogEgewN1nK B90D9peXD0DEglJFSxhN49SflgustcQ= X-Google-Smtp-Source: AK7set/NIuV3qeeo1RK5MQFd9CggFAdL5hfgAIUNfnCuspzyu6Q6fMwz5vrHANFyeqfgydjNY+lvUg== X-Received: by 2002:a62:1dd4:0:b0:5aa:6125:dbf4 with SMTP id d203-20020a621dd4000000b005aa6125dbf4mr186424pfd.11.1677801262188; Thu, 02 Mar 2023 15:54:22 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:61b:48ed:72ab:435b]) by smtp.gmail.com with ESMTPSA id n4-20020a62e504000000b005a8c92f7c27sm216478pff.212.2023.03.02.15.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 15:54:21 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH v9 11/15] drm/atomic-helper: Set fence deadline for vblank Date: Thu, 2 Mar 2023 15:53:33 -0800 Message-Id: <20230302235356.3148279-12-robdclark@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230302235356.3148279-1-robdclark@gmail.com> References: <20230302235356.3148279-1-robdclark@gmail.com> MIME-Version: 1.0 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: Rob Clark , Thomas Zimmermann , Tvrtko Ursulin , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Michel_D=C3=A4nzer?= , open list , Daniel Vetter , Pekka Paalanen , Luben Tuikov , Rodrigo Vivi , Alex Deucher , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark For an atomic commit updating a single CRTC (ie. a pageflip) calculate the next vblank time, and inform the fence(s) of that deadline. v2: Comment typo fix (danvet) Signed-off-by: Rob Clark Reviewed-by: Daniel Vetter Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index d579fd8f7cb8..d8ee98ce2fc5 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1511,6 +1511,40 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, } EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables); +/* + * For atomic updates which touch just a single CRTC, calculate the time of the + * next vblank, and inform all the fences of the deadline. + */ +static void set_fence_deadline(struct drm_device *dev, + struct drm_atomic_state *state) +{ + struct drm_crtc *crtc, *wait_crtc = NULL; + struct drm_crtc_state *new_crtc_state; + struct drm_plane *plane; + struct drm_plane_state *new_plane_state; + ktime_t vbltime; + int i; + + for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) { + if (wait_crtc) + return; + wait_crtc = crtc; + } + + /* If no CRTCs updated, then nothing to do: */ + if (!wait_crtc) + return; + + if (drm_crtc_next_vblank_start(wait_crtc, &vbltime)) + return; + + for_each_new_plane_in_state (state, plane, new_plane_state, i) { + if (!new_plane_state->fence) + continue; + dma_fence_set_deadline(new_plane_state->fence, vbltime); + } +} + /** * drm_atomic_helper_wait_for_fences - wait for fences stashed in plane state * @dev: DRM device @@ -1540,6 +1574,8 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev, struct drm_plane_state *new_plane_state; int i, ret; + set_fence_deadline(dev, state); + for_each_new_plane_in_state(state, plane, new_plane_state, i) { if (!new_plane_state->fence) continue;