From patchwork Tue Jul 7 09:15:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6731471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ED3D2C05AC for ; Tue, 7 Jul 2015 09:13:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A7F1206DF for ; Tue, 7 Jul 2015 09:13:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 38D77206E2 for ; Tue, 7 Jul 2015 09:13:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF4366E8D1; Tue, 7 Jul 2015 02:13:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id E5A216E8D1 for ; Tue, 7 Jul 2015 02:13:07 -0700 (PDT) Received: by widjy10 with SMTP id jy10so182652507wid.1 for ; Tue, 07 Jul 2015 02:13:06 -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:in-reply-to:references; bh=+GpisMQ5E+Hsj4MDu/JC3G2mMurqYhr9eTTFnguvlag=; b=XkmXwP2x/OLmXenbPow24Mmpxr0LxsLdGqkC2ijNsG4FcN1AMMZds9s97fjRIdEB3n OdvJ/7aCuRE8xlsULhJ/YpUakk/pRLxRT4CDOn+0SW/ZvxkN4NZmXz9OMVELSNYx5j88 UGIUpF07l1AQ44wqEVvrR05MMZOsUOgEOLMgg= 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; bh=+GpisMQ5E+Hsj4MDu/JC3G2mMurqYhr9eTTFnguvlag=; b=Xe1FkTqie5pGMjuEcsi4HGQ0K/1o+BUNvPK6538gr7zvpvc8D6G+pny/uNmgQ1Cil0 X5CQigLnGJ3LzhFadiT+PKqzkbzni5+QlvNr30Myzh1aD6cN2mQUhqB8Pc+bpPr6T2Eo /W0VUOYuFU9sVr/1QlfemVKPOagi2Nyd83dprfUXihpNJSvbLlHk7nPpgEaD22BKRiIm qKAAlOH458+hE1D71dEhxJqdE9VOfROs2xxGwaX/WUdkaOixj0o+yywSf8+wCgkoB1Uh TQTIfK2Y+K66fn9wAy3ZT9TNzRvU7ltJ5CR18CdgJJkcij+Gh4A3266mtsteKAUgZDIp lETA== X-Gm-Message-State: ALoCoQnxth7xJaply07a7tSC7sWZGk9d9Oe8Il1SXNU0lzaoinRGW7om2okYc9Guyv9Fcgg3CH+z X-Received: by 10.180.8.68 with SMTP id p4mr39661627wia.27.1436260386404; Tue, 07 Jul 2015 02:13:06 -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 fb3sm51459753wib.21.2015.07.07.02.13.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 02:13:05 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 7 Jul 2015 11:15:47 +0200 Message-Id: <1436260547-1879-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436260547-1879-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436260547-1879-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Ander Conselvan de Oliveira Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Use crtc_state->active in primary check_plane func X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Since commit 8c7b5ccb729870e606321b3703e2c2e698c49a95 Author: Ander Conselvan de Oliveira Date: Tue Apr 21 17:13:19 2015 +0300 drm/i915: Use atomic helpers for computing changed flags we compute the plane state for a modeset before actually committing any changes, which means crtc->active won't be correct yet. Looking at future work in the modeset conversion targetting 4.3 the only places where crtc_state->active isn't accurate is when disabling other CRTCs than the one the modeset is for (when stealing connectors). Which isn't the case here. And that's also confirmed by an audit, we do unconditionally update crtc_state->active for the current pipe. We also don't need to update any other plane check functions since we only ever add the primary state to the modeset update right now. Cc: Ander Conselvan de Oliveira Cc: Maarten Lankhorst Cc: Jani Nikula Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 647b1404c441..ba9321998a41 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13276,7 +13276,7 @@ intel_check_primary_plane(struct drm_plane *plane, if (ret) return ret; - if (intel_crtc->active) { + if (crtc_state->base.active) { struct intel_plane_state *old_state = to_intel_plane_state(plane->state);