From patchwork Tue Sep 3 19:06:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128623 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0FD1B14DE for ; Tue, 3 Sep 2019 19:07:01 +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 EBFE122CF7 for ; Tue, 3 Sep 2019 19:07:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBFE122CF7 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 E529A89801; Tue, 3 Sep 2019 19:06:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC74C897F5 for ; Tue, 3 Sep 2019 19:06:58 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id g24so19589012edu.3 for ; Tue, 03 Sep 2019 12:06:58 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=ckY/KAeiZDB3HVlWWtTrREXRk00i+gfuUAhn7BUyNQc=; b=i+ceunnhPJHeGTtwf39MGZ56dL9Pu/QlM9P/6i2zK4zxu35d6JpqG3naV4A45VN1Cw WNyy53H2WpM+qTbPbHwHXbIX5g+h8JkqDSRp3q2xgMU16jw/4PZo94pSyScOdYq0Poel SdfF8JcVhxHe9lvtkDuiLyqE5hMJM5xPWwKCmmbMJe+uncQDv2/NsAOVOXl/8l/yc0fd ptANNLqEgbCtlgksvBH1W5xf09m4W8oTVvWi9m8fEO7TBZ5RNEB0aN/f+1dxCB8ATUVg E4VAC1ZsR9mc1jvZ41PgV4TqoYkBTDTnM4p1llu4SM7jNu4YqHTntSAupYk8okJNCjw3 PIaQ== X-Gm-Message-State: APjAAAVuL2jn7kYcazgsBfOHxx99USSM/VNBka1sgYKy7ixXfpGPhiPK GPkaHAYx7J8W+V4wKiJgal8p8WLa1K0= X-Google-Smtp-Source: APXvYqx1BOkLWrBFwYTyatQP2rtihPWcoLWBj195C0eN89jv+ZkAeI6xRXFztEdEdx+ijWV2lChkuQ== X-Received: by 2002:a17:906:c802:: with SMTP id cx2mr29826265ejb.114.1567537617137; Tue, 03 Sep 2019 12:06:57 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id b12sm3655583edj.93.2019.09.03.12.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:06:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/3] drm/atomic: Take the atomic toys away from X Date: Tue, 3 Sep 2019 21:06:40 +0200 Message-Id: <20190903190642.32588-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ckY/KAeiZDB3HVlWWtTrREXRk00i+gfuUAhn7BUyNQc=; b=HcguDoinyhyklB70paAwAOsIanu+sNgBF0yAcpJHLx3t0bOo4u5VOKazsy/uNHnGkF doqd6Nx3eF0PJTgC8nyUow73FANyqbLGFiYOEqQBnKilYlk1pFIV3s2QTt9gQSDMSHVP BQtkWGqNHAkmHQp0BRaOIFWbPz9NwimF7mA5M= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , stable@vger.kernel.org, Daniel Vetter , Sean Paul , =?utf-8?q?Michel_D=C3=A4nzer?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The -modesetting ddx has a totally broken idea of how atomic works: - doesn't disable old connectors, assuming they get auto-disable like with the legacy setcrtc - assumes ASYNC_FLIP is wired through for the atomic ioctl - not a single call to TEST_ONLY Iow the implementation is a 1:1 translation of legacy ioctls to atomic, which is a) broken b) pointless. We already have bugs in both i915 and amdgpu-DC where this prevents us from enabling neat features. If anyone ever cares about atomic in X we can easily add a new atomic level (req->value == 2) for X to get back the shiny toys. Since these broken versions of -modesetting have been shipping, there's really no other way to get out of this bind. References: https://gitlab.freedesktop.org/xorg/xserver/issues/629 References: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/180 Cc: Maarten Lankhorst Cc: Michel Dänzer Cc: Alex Deucher Cc: Adam Jackson Cc: Sean Paul Cc: David Airlie Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/drm_ioctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 2c120c58f72d..1cb7b4c3c87c 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -334,6 +334,9 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) file_priv->universal_planes = req->value; break; case DRM_CLIENT_CAP_ATOMIC: + /* The modesetting DDX has a totally broken idea of atomic. */ + if (strstr(current->comm, "X")) + return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) return -EOPNOTSUPP; if (req->value > 1) From patchwork Tue Sep 3 19:06:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128627 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F16C1813 for ; Tue, 3 Sep 2019 19:07:03 +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 5706021897 for ; Tue, 3 Sep 2019 19:07:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5706021897 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 A325A89804; Tue, 3 Sep 2019 19:07:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 43E09897F5 for ; Tue, 3 Sep 2019 19:07:00 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id c19so5684914edy.10 for ; Tue, 03 Sep 2019 12:07:00 -0700 (PDT) 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=rMbe/90UeFfqEUrk4ND8PxMTYBDDkx6JYpo4F1BWcC8=; b=YrhXon+iZEVHJf5BIn1JUnhQY0rWI8W8qwd8PGSSHUtFs0tLX7MISKglcqVlOw66We fNOEweb2qwJWeYX2wM7K6eag01La+ZZ7nfAPJprhTxgSEOpSacE1ZXpMwOTtD9tIPmCM TRwAb9/CXFGIHmGRUP2+7BM+EV1JRO9mPEn3glB/7LSQT4z2Svhw0+pqZNWFykKwa0Ib aenOvcQbBpA0O7sUXpbCRzF5VTr5k4WalnKWYIl/nI8Az1UTaFAdcwew8hpzQFbnoC4/ 8HGgI1WqFEDsfqcIIkB39pqrh6LyJTVZzeV/10SrOtlXePQaK9dQ9B6i+TySHb4eLQWc 2hgA== X-Gm-Message-State: APjAAAXlWScVoemw6cr+J5pymyVdTEXdpvIS82I/xasoTIvnfzlBrHoX 3aYweVUaWm8EEDiVgm2oV3S3ydSzUPU= X-Google-Smtp-Source: APXvYqweLY86stxuQkQXezP/PFuo3lvwCfIEpFRc8/jxHYyer1v3jB8UP3B3FCjCKXceMYgpkvb9eA== X-Received: by 2002:a17:906:c08:: with SMTP id s8mr8462775ejf.66.1567537618355; Tue, 03 Sep 2019 12:06:58 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id b12sm3655583edj.93.2019.09.03.12.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:06:57 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm/atomic: Reject FLIP_ASYNC unconditionally Date: Tue, 3 Sep 2019 21:06:41 +0200 Message-Id: <20190903190642.32588-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190903190642.32588-1-daniel.vetter@ffwll.ch> References: <20190903190642.32588-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-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=rMbe/90UeFfqEUrk4ND8PxMTYBDDkx6JYpo4F1BWcC8=; b=GBOWMGKL2htvO3SG2dtez5oS9+y04XBknjNmJprvWjn75fZ0rnETw5swFSjkZtTClo ThuibSbiJQweoF8PUR9R6qvA0cNz8onWs/Gg6Wr38ugYlhNTuTjHWsD06MsQLBm80ycm gMsJ0Cu+sxjStk/RcC0NXV+LdYOEQf3dFZDxk= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , Daniel Vetter , Sean Paul , =?utf-8?q?Michel_D=C3=A4nzer?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's never been wired up. Only userspace that tried to use it (and didn't actually check whether anything works, but hey it builds) is the -modesetting atomic implementation. And we just shut that up. If there's anyone else then we need to silently accept this flag no matter what, and find a new one. Because once a flag is tainted, it's lost. Cc: Maarten Lankhorst Cc: Michel Dänzer Cc: Alex Deucher Cc: Adam Jackson Cc: Sean Paul Cc: David Airlie Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_uapi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 5a5b42db6f2a..7a26bfb5329c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1305,8 +1305,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (arg->reserved) return -EINVAL; - if ((arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) && - !dev->mode_config.async_page_flip) + if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) return -EINVAL; /* can't test and expect an event at the same time. */ From patchwork Tue Sep 3 19:06:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128631 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 077BC1813 for ; Tue, 3 Sep 2019 19:07:06 +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 E35F521897 for ; Tue, 3 Sep 2019 19:07:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E35F521897 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 88E6B89812; Tue, 3 Sep 2019 19:07:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDEEE89812 for ; Tue, 3 Sep 2019 19:07:01 +0000 (UTC) Received: by mail-ed1-x534.google.com with SMTP id g24so19589180edu.3 for ; Tue, 03 Sep 2019 12:07:01 -0700 (PDT) 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=Z/b6b8/+ZReB8KjRY9V8cYDl8cNCH8FvtkYu2Z13AoM=; b=Wc33KZx/FkbTsgzI99DygNZnEXIc2sZH6A3BzltDLXg9oam852wrRLeevtis/LJr9Q qPFi9ENgJwpJifIezBRO3xMQGZ3WXV0P9lSjR+1EzeotFtbLaaYcCuBfPcLbtnxgcCNm TpQeZ4diazxL4P+nOORTkiiiY2Vw6EiX+FvVJO9wTzhwFsKE/sF92vCxp/UV3BPWblKu 3gFQenpv/hR2839chI7oZzOVN/uCQ84n9nQ0AD1m0rczTMikuSiumBeGZm6t6Nq+uwpP Wru9oG0UiVhpMjq8LDSMqDjpl6fp+qsGJUNdxQ/DPz396cZ24laplKfxL1C/m3vNufRl aVTw== X-Gm-Message-State: APjAAAVlS81xAfu3KrZlKvlQWoZw+CVG3Mug4nCUamoFJROEi+Ua/GdO zKP4y3V8dQE3a4DKDseye1dAWC//+do= X-Google-Smtp-Source: APXvYqzRCJAJigLCGbAjIreAMml8R4CPyBx08eCx3POwBhfbIslrlcdWJ8I8Zhuds73sIxgaZAZF2A== X-Received: by 2002:a50:b264:: with SMTP id o91mr37893733edd.7.1567537619736; Tue, 03 Sep 2019 12:06:59 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id b12sm3655583edj.93.2019.09.03.12.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:06:59 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/3] drm/atomic: Rename crtc_state->pageflip_flags to async_flip Date: Tue, 3 Sep 2019 21:06:42 +0200 Message-Id: <20190903190642.32588-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190903190642.32588-1-daniel.vetter@ffwll.ch> References: <20190903190642.32588-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-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=Z/b6b8/+ZReB8KjRY9V8cYDl8cNCH8FvtkYu2Z13AoM=; b=D223YzkzUV+qYGFCeIAvzTNpoh+ibV50QW8llKIAishMcpwCa6dXvEhfNDsdTwG1cT +sRK9Yco1h1EmxgN3Ne3zMThEavVpzgW4eGoGA9Z5hMqWPPUQYSrxj9Cu6nVp7XkF8nL i4JGUoZxpsbIuZYyjpf37ZbOe8f0mscXX5kUs= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Daniel Vetter , Sam Ravnborg , Sean Paul , David Francis , Maxime Ripard , Ben Skeggs , =?utf-8?q?Michel_D=C3=A4nzer?= , Leo Li , Intel Graphics Development , Bhawanpreet Lakha , Nicholas Kazlauskas , =?utf-8?q?Christian_K?= =?utf-8?q?=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's the only flag anyone actually cares about. Plus if we're unlucky, the atomic ioctl might need a different flag for async flips. So better to abstract this away from the uapi a bit. Cc: Maarten Lankhorst Cc: Michel Dänzer Cc: Alex Deucher Cc: Adam Jackson Cc: Sean Paul Cc: David Airlie Signed-off-by: Daniel Vetter Cc: Maxime Ripard Cc: Daniel Vetter Cc: Nicholas Kazlauskas Cc: Leo Li Cc: Harry Wentland Cc: David Francis Cc: Mario Kleiner Cc: Bhawanpreet Lakha Cc: Ben Skeggs Cc: "Christian König" Cc: Ilia Mirkin Cc: Sam Ravnborg Cc: Chris Wilson Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 ++-- include/drm/drm_crtc.h | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 0a71ed1e7762..2f0ef0820f00 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5756,8 +5756,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, * change FB pitch, DCC state, rotation or mirroing. */ bundle->flip_addrs[planes_count].flip_immediate = - (crtc->state->pageflip_flags & - DRM_MODE_PAGE_FLIP_ASYNC) != 0 && + crtc->state->async_flip && acrtc_state->update_type == UPDATE_TYPE_FAST; timestamp_ns = ktime_get_ns(); @@ -6334,7 +6333,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) amdgpu_dm_enable_crtc_interrupts(dev, state, true); for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) - if (new_crtc_state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC) + if (new_crtc_state->async_flip) wait_for_vblank = false; /* update planes when needed per crtc*/ diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index e9c6112e7f73..1e5293eb66e3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3263,7 +3263,7 @@ static int page_flip_common(struct drm_atomic_state *state, return PTR_ERR(crtc_state); crtc_state->event = event; - crtc_state->pageflip_flags = flags; + crtc_state->async_flip = flags & DRM_MODE_PAGE_FLIP_ASYNC; plane_state = drm_atomic_get_plane_state(state, plane); if (IS_ERR(plane_state)) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index 46dc264a248b..d0a937fb0c56 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -128,7 +128,7 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, state->zpos_changed = false; state->commit = NULL; state->event = NULL; - state->pageflip_flags = 0; + state->async_flip = false; /* Self refresh should be canceled when a new update is available */ state->active = drm_atomic_crtc_effectively_active(state); diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index 2db029371c91..5193b6257061 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -267,7 +267,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, asyw->image.pitch[0] = fb->base.pitches[0]; } - if (!(asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)) + if (!asyh->state.async_flip) asyw->image.interval = 1; else asyw->image.interval = 0; @@ -383,7 +383,7 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, } /* Can't do an immediate flip while changing the LUT. */ - asyh->state.pageflip_flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; + asyh->state.async_flip = false; } static int diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 7e2963cad543..900ae8d452b8 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -284,12 +284,12 @@ struct drm_crtc_state { u32 target_vblank; /** - * @pageflip_flags: + * @async_flip: * - * DRM_MODE_PAGE_FLIP_* flags, as passed to the page flip ioctl. - * Zero in any other case. + * This is set when DRM_MODE_PAGE_FLIP_ASYNC is set in the legacy + * PAGE_FLIP IOCTL. It's not wired up for the atomic IOCTL itself yet. */ - u32 pageflip_flags; + bool async_flip; /** * @vrr_enabled: