From patchwork Mon Feb 27 19:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13154129 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 137C7C7EE2D for ; Mon, 27 Feb 2023 19:36:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A01B10E49F; Mon, 27 Feb 2023 19:36:20 +0000 (UTC) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE1A810E3BC; Mon, 27 Feb 2023 19:36:15 +0000 (UTC) Received: by mail-pj1-x102b.google.com with SMTP id c23so7320459pjo.4; Mon, 27 Feb 2023 11:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Q0NqEufkMDZIkDjHCzybwLnsn4J9qQK3EtCROjv4c4CAc99HZTKvvfzkYXKjWYYoB6 l7OazioTiiSTWaLSffa8Ed39GCqqqN5Ige+TFR5Qm1FAqyhCon6mIipzuo+RC3hAXo/Q v4plfWaeiZxbioPm6ZzrBzdQ7fw5LaMHtBq+zpK6oWiQVXnJZRL9vnoIc3iFLuS6V/q9 we/iLpwdWXMFwHxzyBlAhJSfZg1BMPKoVLQW6Uo/lARIkblp310Zd/0O+V9vzK0kzP8E 2v/koAkAULQHw0d9nwd7xNNu1DltzF+b72F7b7/cRA4fFOkdQ3U3AWWrkFnmew+T1tG9 +cRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=P56BoOtjOXs7GwpTnhPgBtpM13MdvOI5yJsOSb+0Leyv0DYk/aPrsIeF8nQOYHsBll ZoUr64q/3voDLfSf4G8bm4j2Y6hbH+LDmTWuSM3Z0Dtpt6WJmwk+DcKYxOwi02Ds4Mrd wwjmBFRxz9rbwKPHyrRIwlOdjD+DVb+pEXGpn6OwqkEFsgD5epGw6X60i/SCBeMbC1vR fWT+b9eowBwBmWGTmogIUITIwf6ByxmzkR+7knCnFuLlJzpoqB52feecSPa+ro7aqI++ k4cF38hChqp7dNyOENlHzbSN2Bkp17xao2vcgKVQ2G9nJhPweyI5cG2i5MOGS+rtfbn1 gouw== X-Gm-Message-State: AO0yUKUwZNoOzQF1Vmz5jWR7QCQNJC6JNh96ZprLRDSgDEjdg5C7Hm7o 4FwDPB1Ov3Spv9Ko0tRCNG8xXo4NHFI= X-Google-Smtp-Source: AK7set88rQrrQrTTzWZUmg1ax7k5vgVzy2wFfdqhlnrfnAMYKgTWuBnItaDxtjqFcBrNhbLZ/dv5Xg== X-Received: by 2002:a05:6a20:5499:b0:cd:52a:faf0 with SMTP id i25-20020a056a20549900b000cd052afaf0mr573957pzk.59.1677526575436; Mon, 27 Feb 2023 11:36:15 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:61b:48ed:72ab:435b]) by smtp.gmail.com with ESMTPSA id j8-20020aa78008000000b00575d1ba0ecfsm4592396pfi.133.2023.02.27.11.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 11:36:15 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH v7 11/15] drm/atomic-helper: Set fence deadline for vblank Date: Mon, 27 Feb 2023 11:35:17 -0800 Message-Id: <20230227193535.2822389-12-robdclark@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230227193535.2822389-1-robdclark@gmail.com> References: <20230227193535.2822389-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;