From patchwork Tue Jul 7 18:26:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 6736891 Return-Path: X-Original-To: patchwork-intel-gfx@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 632649F2F0 for ; Tue, 7 Jul 2015 18:27:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D40420668 for ; Tue, 7 Jul 2015 18:27:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A1AFD205FD for ; Tue, 7 Jul 2015 18:27:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 255176EA50; Tue, 7 Jul 2015 11:27:05 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk0-f175.google.com (mail-qk0-f175.google.com [209.85.220.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2F1D6EA50 for ; Tue, 7 Jul 2015 11:27:01 -0700 (PDT) Received: by qkeo142 with SMTP id o142so146249474qke.1 for ; Tue, 07 Jul 2015 11:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pmd0Dv2uxPlwG9tx/Rqrn1AnX67c/homBrULa8xX+jI=; b=hoYT5nw87C5R+ALO/tPg4K5Fb5RDYB/SGGNaFJqyEgolCy5GHGA+/MAAPmFyvJ0CpG +5JLpaa2qeLdsLIQ/RQtCIiG2z8cDYCPsLTf7VjIpvicQrtYccOw/A6/SsQrh5UI0m5D /D8yEBWAVvVK4V3ujeXebeburxows8DJE8mZQowPVfuO8k5XkbdPQagRcRsuvr3K2gwq fFfyXDJJ2EnOkBx8Ln35U8mTZ+rQy8k2Osc8jsJM2N9nvjPvWxpF6urK6Lh0FkPKozEO T5j6rKTXGNqbe2WCkiPgFncT5afifj+nW5reFXJ5BBNJjyUEyFKzm6Bf671DngdjBYr/ kY2w== X-Received: by 10.55.42.1 with SMTP id q1mr9050186qkh.3.1436293620912; Tue, 07 Jul 2015 11:27:00 -0700 (PDT) Received: from localhost.localdomain (r130-pw-tresbarras.ibys.com.br. [189.76.1.243]) by mx.google.com with ESMTPSA id h81sm11588457qkh.34.2015.07.07.11.26.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 11:27:00 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 7 Jul 2015 15:26:08 -0300 Message-Id: <1436293568-1674-7-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436293568-1674-1-git-send-email-przanoni@gmail.com> References: <1436293568-1674-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 6/6] drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc() 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Paulo Zanoni So now all the calls are inside __intel_fbc_update(). Consistency! Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 790edb3..c271af7 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -509,10 +509,8 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv) break; } - if (!crtc || crtc->primary->fb == NULL) { - set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT); + if (!crtc || crtc->primary->fb == NULL) return NULL; - } return crtc; } @@ -720,8 +718,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv) * - going to an unsupported config (interlace, pixel multiply, etc.) */ crtc = intel_fbc_find_crtc(dev_priv); - if (!crtc) + if (!crtc) { + set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT); goto out_disable; + } if (!multiple_pipes_ok(dev_priv)) { set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES);