From patchwork Fri Jul 7 22:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Almeida?= X-Patchwork-Id: 117321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3581135vqx; Fri, 7 Jul 2023 15:44:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlFROGT/ZwWwU2NrOlex1iIEPxJWE7e76xlFeXeMmLac0Aa9vOndNRmy20GxQMb9SX2Tuiql X-Received: by 2002:a05:6358:7e43:b0:134:e301:2c21 with SMTP id p3-20020a0563587e4300b00134e3012c21mr6925255rwm.15.1688769866368; Fri, 07 Jul 2023 15:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688769866; cv=none; d=google.com; s=arc-20160816; b=ljfxPKrYfkSRgBQFWQ0G7lAKmRuUANhq5vgaDGOJpCMOJ3HJsep/Lvi3GmnoECkpx6 Jc6s/lit9PqmKOXP1B+wCLu42zKMDCp+COu9KInURBy/h5l211TrQMkSMrcW9FrfHgbP U5TjUF87UT5hyywl+S6jYb7lhO9erTWQVCxSuMm6pj0u10kWb8yjo+HJFPBhyVmwgaUF dd2KvOFe7xxmhfei6KE5QtiTpwBxKLLmldNWr5t+ofMA+SlRZhyAyKEsGomZArOtrPeR 7PxebNXJ80q6wMWggHydciQ3DvkgUgy546hAZDihbUc1XRVIKOniEzv6i4V6C3wrIfud hVIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lbvpM8EakHHy+USxQroX9eqPrbtC1pudfZEWMIGGBk8=; fh=qbfaDyBg+GqerSAvcu3kFTx3mMThVk/CBXk9qNOf42k=; b=Y79Jv+OOHMuEaNV/PBvBN7S2cNNoEN2fmUHrhDyXtCKiXOGJw5EW2fgv5hOeZ2tks9 kH0ZDJnwcBPex1u/BkCBHAOPEBp0Jmm8QLpNxQsOPWcVAngqOFdRzAMcEtF5GNW8d2ia hEnZv30j05K0c5Lmg/h7bYg3ToKeXajapAevyQyJk0ZWqdViy4jBmrFwVsgRx/MA7YtH /KRrEqzi//jx0VCuA/dlTDoMVSo8Le+Vkfl5zHD2q50tRkWFC8/+qPMQdl3WdsCWbZrX 1oFP3EfXMayLCUVAGyOxPJbhZQ6QaBW/noKuJpraOqHYkfEYZnGxAGIQ7WVmkX6GKfPH ujzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=fxyL4ff7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d11-20020a170903230b00b001b8904eadb8si4779278plh.460.2023.07.07.15.44.14; Fri, 07 Jul 2023 15:44:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=fxyL4ff7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231761AbjGGWl2 (ORCPT + 99 others); Fri, 7 Jul 2023 18:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbjGGWlZ (ORCPT ); Fri, 7 Jul 2023 18:41:25 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A692211F for ; Fri, 7 Jul 2023 15:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=lbvpM8EakHHy+USxQroX9eqPrbtC1pudfZEWMIGGBk8=; b=fxyL4ff7fQ10YsgKGvzcUVvtFI p+2pbiSuengbOyfgEX7mZ8lXTSI7tvgLAA0dOfvWZbKBDdrQoK3o6Rs2VoYq4zyxZvN0rlD8cO7pG YfMidR8hIZr8UzR4e5moUaoCGOwy/d0ckun1CfGkjvo1iUkUUpGQPIDRAAFlskonw2nMb7QBSOaVJ 40F9r34Sw5jG6SkQfJmd/Q9EppE9UPaYuNiMRfE7+TrYixL44oxhldYgDRDCKWLXWhbDL33OZTYw+ BS2OeCGbK4yDJqf+B6CtYA858He/2hJoE5nn/uK8flf06YY+yocKKDRhkv/FqSDLsnMZbN0108553 qjfmS/Aw==; Received: from [187.74.70.209] (helo=steammachine.lan) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qHu8b-00AP6e-Cf; Sat, 08 Jul 2023 00:41:17 +0200 From: =?utf-8?q?Andr=C3=A9_Almeida?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, wayland-devel@lists.freedesktop.org Cc: kernel-dev@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, pierre-eric.pelloux-prayer@amd.com, Simon Ser , Rob Clark , Pekka Paalanen , Daniel Vetter , Daniel Stone , =?utf-8?b?J01hcmVrIE9sxaHDoWsn?= , Dave Airlie , =?utf-8?q?Michel_D=C3=A4nzer?= , Randy Dunlap , hwentlan@amd.com, joshua@froggi.es, ville.syrjala@linux.intel.com, =?utf-8?q?Andr=C3=A9_Almeida?= Subject: [PATCH v5 1/6] drm: allow DRM_MODE_PAGE_FLIP_ASYNC for atomic commits Date: Fri, 7 Jul 2023 19:40:54 -0300 Message-ID: <20230707224059.305474-2-andrealmeid@igalia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707224059.305474-1-andrealmeid@igalia.com> References: <20230707224059.305474-1-andrealmeid@igalia.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770803551375429760?= X-GMAIL-MSGID: =?utf-8?q?1770803551375429760?= From: Simon Ser If the driver supports it, allow user-space to supply the DRM_MODE_PAGE_FLIP_ASYNC flag to request an async page-flip. Set drm_crtc_state.async_flip accordingly. Document that drivers will reject atomic commits if an async flip isn't possible. This allows user-space to fall back to something else. For instance, Xorg falls back to a blit. Another option is to wait as close to the next vblank as possible before performing the page-flip to reduce latency. Signed-off-by: Simon Ser Reviewed-by: Alex Deucher Co-developed-by: André Almeida Signed-off-by: André Almeida --- v4: no changes --- drivers/gpu/drm/drm_atomic_uapi.c | 28 +++++++++++++++++++++++++--- include/uapi/drm/drm_mode.h | 9 +++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index d867e7f9f2cd..dfd4cf7169df 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1286,6 +1286,18 @@ static void complete_signaling(struct drm_device *dev, kfree(fence_state); } +static void +set_async_flip(struct drm_atomic_state *state) +{ + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; + int i; + + for_each_new_crtc_in_state(state, crtc, crtc_state, i) { + crtc_state->async_flip = true; + } +} + int drm_mode_atomic_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { @@ -1326,9 +1338,16 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, } if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) { - drm_dbg_atomic(dev, - "commit failed: invalid flag DRM_MODE_PAGE_FLIP_ASYNC\n"); - return -EINVAL; + if (!dev->mode_config.async_page_flip) { + drm_dbg_atomic(dev, + "commit failed: DRM_MODE_PAGE_FLIP_ASYNC not supported\n"); + return -EINVAL; + } + if (dev->mode_config.atomic_async_page_flip_not_supported) { + drm_dbg_atomic(dev, + "commit failed: DRM_MODE_PAGE_FLIP_ASYNC not supported with atomic\n"); + return -EINVAL; + } } /* can't test and expect an event at the same time. */ @@ -1426,6 +1445,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (ret) goto out; + if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) + set_async_flip(state); + if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { ret = drm_atomic_check_only(state); } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 46becedf5b2f..56342ba2c11a 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -949,6 +949,15 @@ struct hdr_output_metadata { * Request that the page-flip is performed as soon as possible, ie. with no * delay due to waiting for vblank. This may cause tearing to be visible on * the screen. + * + * When used with atomic uAPI, the driver will return an error if the hardware + * doesn't support performing an asynchronous page-flip for this update. + * User-space should handle this, e.g. by falling back to a regular page-flip. + * + * Note, some hardware might need to perform one last synchronous page-flip + * before being able to switch to asynchronous page-flips. As an exception, + * the driver will return success even though that first page-flip is not + * asynchronous. */ #define DRM_MODE_PAGE_FLIP_ASYNC 0x02 #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4