From patchwork Fri Dec 4 08:46:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7766891 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 351CD9F350 for ; Fri, 4 Dec 2015 08:47:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 867E9204A0 for ; Fri, 4 Dec 2015 08:47:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5DD6A2051D for ; Fri, 4 Dec 2015 08:47:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F1A08A83C; Fri, 4 Dec 2015 00:46:50 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id F37318A823 for ; Fri, 4 Dec 2015 00:46:47 -0800 (PST) Received: by wmww144 with SMTP id w144so55377016wmw.0 for ; Fri, 04 Dec 2015 00:46:46 -0800 (PST) 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-type:content-transfer-encoding; bh=p2ZOyFr8J3Kfw6qU6zGAx6gmEFDR520AXntIQoX0T20=; b=bSDwZeZuDbiMRAuO8+SJO91vgKHReCi2SZKFU+PkJzEkkJyQ/bsRUsEJZT5Rl7PJK1 m4LopK5LaT248PtRJ/lEBuCSfkkD0A3363ywYuyFjtaetsk2nXKNIl62wk6fnkk7IyAO kpWQ9l0KCAj8/OnLg7yOhy/JOVPaaBkUti4tY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=p2ZOyFr8J3Kfw6qU6zGAx6gmEFDR520AXntIQoX0T20=; b=UoWVHcdC/tqZgloyCzTKV548gWZivhoUTjQISbnZ0ZyT29eamE1cj+tekWhoq9Ohfp M+AmwuQmvwHfTuyeI9OmXOtQh+wSmO5kdz3RoLYENL7VMwKNov99lO3fEjKxRMzRjJFJ gGj8i9Z+mFg/7FLO7Mufct+4IBfj+JYEAoQLQGBAx5csSYqfivLgFGPGqS9KvziS7PWf oUgr97sxmG2LSDHPYkpIh2YtJYZ3DY9eIfUpyvs2/Fk0V+TIxPQL6asdQim3z5GGk9SA iF957apEAaRHuLTwvMt0RFBd/4gCRUNdPZhVFwBwWq1tdTIGmlG/EQrWw2RVl9+Q+vCv 8VxQ== X-Gm-Message-State: ALoCoQllVqKI3pIXCGyQHx/7g2KOjcbZJF/ShewBN43iN6g9u4iRtk7eJ8FsAdQQV/z9QSYW0cz372csVHckeyZE8Dkz70mqdA== X-Received: by 10.28.99.214 with SMTP id x205mr3448335wmb.20.1449218806621; Fri, 04 Dec 2015 00:46:46 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pc2sm6926311wjb.11.2015.12.04.00.46.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Dec 2015 00:46:46 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 28/28] drm/atomic-helper: Reject legacy flips on a disabled pipe Date: Fri, 4 Dec 2015 09:46:09 +0100 Message-Id: <1449218769-16577-29-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1449218769-16577-1-git-send-email-daniel.vetter@ffwll.ch> References: <1449218769-16577-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , Daniel Stone X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We want this for consistency with existing page_flip semantics. Since this spurred quite a discussion on IRC also document why we reject even generation when the pipe is off: It's not that it's hard to implement, but userspace has a track recording proofing that it's way too easy to accidentally abuse and cause havoc. We want to make sure userspace doesn't get away with that. Cc: Daniel Stone Cc: Ville Syrjälä Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic.c | 9 +++++++++ drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 7426d40017a0..06cdb52907da 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1265,6 +1265,15 @@ int drm_atomic_check_only(struct drm_atomic_state *state) if (config->funcs->atomic_check) ret = config->funcs->atomic_check(state->dev, state); + /* + * Reject event generation for when a CRTC is off and stays off. It + * wouldn't be hard to implement this, but userspace has a track record + * of happily burning through 100% cpu (or worse, crash) when the + * display pipe is suspended. To avoid all that fun just reject updates + * that ask for events since likely that indicates a bug in the + * compositors drawing loop. This is consistent with the vblank ioctl + * which also rejects service on a disabled pipe. + */ if (!state->allow_modeset) { for_each_crtc_in_state(state, crtc, crtc_state, i) { if (drm_atomic_crtc_needs_modeset(crtc_state)) { diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 110f3db8dd05..8e281a96c35f 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2283,6 +2283,14 @@ retry: goto fail; drm_atomic_set_fb_for_plane(plane_state, fb); + state->allow_modeset = false; + if (!crtc_state->active) { + DRM_DEBUG_ATOMIC("[CRTC:%d] disabled, rejecting legacy flip\n", + crtc->base.id); + ret = -EINVAL; + goto fail; + } + ret = drm_atomic_async_commit(state); if (ret != 0) goto fail;