From patchwork Fri Jan 17 21:16:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 3507461 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A3CC3C02DC for ; Fri, 17 Jan 2014 21:17:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3A492017B for ; Fri, 17 Jan 2014 21:17:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E38C8200C1 for ; Fri, 17 Jan 2014 21:17:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4356FCAB6; Fri, 17 Jan 2014 13:17:15 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from qproxy1.mail.unifiedlayer.com (qproxy1-pub.mail.unifiedlayer.com [173.254.64.10]) by gabe.freedesktop.org (Postfix) with SMTP id E689FFCAB6 for ; Fri, 17 Jan 2014 13:17:13 -0800 (PST) Received: (qmail 3568 invoked by uid 0); 18 Jan 2014 04:17:14 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by qproxy1.mail.unifiedlayer.com with SMTP; 18 Jan 2014 04:17:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=/SlroWgPfsqlXcRHD0CoYLB3DyQNThBgeIJ6HfJqR4Q=; b=M5K/ofuF247SbMnG5rRw2GewiVeFSQ1RmQcWju04J1u4v5eOumjc7YzF6eyywsm9HdPGfc/EIUEFaKEQevzYNwjQukXyWfSizDg5/f+YwmE+BfEiOuDJ85or33ZGV3sQ; Received: from [67.161.37.189] (port=48332 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (UNKNOWN:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1W4Gmu-0001QH-Oo for intel-gfx@lists.freedesktop.org; Fri, 17 Jan 2014 14:17:12 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Jan 2014 13:16:58 -0800 Message-Id: <1389993418-2133-3-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1389993418-2133-1-git-send-email-jbarnes@virtuousgeek.org> References: <1389993418-2133-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 3/3] drm/i915: always check clocks when comparing pipe configs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Now that we have DDI support, we can check these all the time. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7a9ff57..0efa8b3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9418,10 +9418,8 @@ intel_pipe_config_compare(struct drm_device *dev, if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) PIPE_CONF_CHECK_I(pipe_bpp); - if (!HAS_DDI(dev)) { - PIPE_CONF_CHECK_CLOCK_FUZZY(adjusted_mode.crtc_clock); - PIPE_CONF_CHECK_CLOCK_FUZZY(port_clock); - } + PIPE_CONF_CHECK_CLOCK_FUZZY(adjusted_mode.crtc_clock); + PIPE_CONF_CHECK_CLOCK_FUZZY(port_clock); #undef PIPE_CONF_CHECK_X #undef PIPE_CONF_CHECK_I