From patchwork Thu Mar 26 21:48:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6102181 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 66BFA9F6E8 for ; Thu, 26 Mar 2015 21:46:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F3AE203B7 for ; Thu, 26 Mar 2015 21:46:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 924992043C for ; Thu, 26 Mar 2015 21:46:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E67716E0BD; Thu, 26 Mar 2015 14:46:24 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B8586E057 for ; Thu, 26 Mar 2015 14:46:24 -0700 (PDT) Received: by wibg7 with SMTP id g7so5183793wib.1 for ; Thu, 26 Mar 2015 14:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=lVBjmnzgwuXBhQGabje3K/VtN9GzI22ULTFDzGo9H00=; b=cCZAsIcaZTZT7dJRNLRf6P69DWLlxe9s+shQCIMnEa+QkZ1OldX5SBbqK1BfcrSBh2 bGpSaWI2Ce3p/iWmF1KmieeXbYrQk4hl2sR0CIyC5FfG3LwYc4pmHN3OO7Gftp9NyV2Y UGapx/ZloeqhaUZx0MkXwLyhYBC5Q43FiSTSE= 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; bh=lVBjmnzgwuXBhQGabje3K/VtN9GzI22ULTFDzGo9H00=; b=f22vhot47bVd1R3MbRsg3UbYS2do0agpPahhs3qRUNsEYtTWeZQLVBI7vmSpJlImwN wuHtwOBlIR2aegqcpm/dEFNnvkl8v+mm8+VKHv3mdIfKrMbxIu6hTPFtQM2O92l6n7lD yZ+T4gjM9RUZx49qvtsUiwk1zZ5kp7ge2DyWAbtv1QiF2rY1KsTDvVMXnUQ+r7Ql9R4x e49qLahtvg5+6JfJ/IhRe//LP6tdA536XBM73dQz/8BAk26Pthg6Xy/FSmTfUQDnD+zd hkDlKpDwMwIYfjmf/sLQAd55Ayhc1RICLToAoz88t4OoyWaugs7AxgDusnbELA7Xw54c Dm5g== X-Gm-Message-State: ALoCoQl4Ha/nPyDV0weXVNxAs+staEjmVbjXAjGK0q+rJ94SQBeek4Y2rZpXR0wldD0xuKQql31m X-Received: by 10.194.109.9 with SMTP id ho9mr31514193wjb.29.1427406382959; Thu, 26 Mar 2015 14:46:22 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id ch6sm84353wjc.3.2015.03.26.14.46.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Mar 2015 14:46:21 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/atomic-helpers: Properly avoid full modeset dance Date: Thu, 26 Mar 2015 22:48:04 +0100 Message-Id: <1427406484-22494-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter 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: , MIME-Version: 1.0 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 Legacy setCrtc has a nice fastpath for just updating the frontbuffer when the output routing doesn't change. Which I of course tried to keep working, except that I fumbled the job: The helpers correctly compute ->mode_changed, CRTC updates get correctly skipped but connector functions are called unconditionally. Fix this. Reported-and-Tested-by: Gustavo Padovan Reviewed-by: Gustavo Padovan Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index d9ed9a54fd1e..6e377d954538 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -587,7 +587,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) old_crtc_state = old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)]; - if (!old_crtc_state->active) + if (!old_crtc_state->active || + !needs_modeset(connector->state->crtc->state)) continue; encoder = old_conn_state->best_encoder; @@ -847,7 +848,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, if (!connector || !connector->state->best_encoder) continue; - if (!connector->state->crtc->state->active) + if (!connector->state->crtc->state->active || + !needs_modeset(connector->state->crtc->state)) continue; encoder = connector->state->best_encoder;