From patchwork Sun Jul 21 14:14:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2830921 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 72CF7C0319 for ; Sun, 21 Jul 2013 14:14:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8792D20138 for ; Sun, 21 Jul 2013 14:14:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 71CA4200C3 for ; Sun, 21 Jul 2013 14:14:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 32BCEE5FA0 for ; Sun, 21 Jul 2013 07:14:23 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EE63E5C14 for ; Sun, 21 Jul 2013 07:14:13 -0700 (PDT) Received: by mail-ee0-f43.google.com with SMTP id l10so3283767eei.2 for ; Sun, 21 Jul 2013 07:14:12 -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:x-mailer; bh=7JPQUiGP6aCw/czcHkJf4vokH+EfNPX766oiK/jGp9w=; b=OEltdS6ecbBKMKTFaPAbYGCUC4o5OSV3jUPNWgGFjypaitV8cNbi8xIKG7cgr5mXcC 1ypJw4JDQ+gVaGpq+/G1tueBz1Tc12ivCaMYSdW1qxC+cZ4pazRzReRei5W86rxp07Zm XXlSLuJxcgIqCqDc5e5KvQjiWWVQVViFMwd1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=7JPQUiGP6aCw/czcHkJf4vokH+EfNPX766oiK/jGp9w=; b=W1MjdaOTrkVabn8uQ7Gw1aqE8WftSSlrJm2HRSmPRa4SkXvBacDD+hwuYbGJe9S0FT urY1KH40YOYe/GRhGpy8YbMouq8Yw2Rh0Q7nFZKEuZssLWgCXWKJICMxHOqCx4YRyzKZ pDCwHCNePGqkmUAznbRUNpfYz58iUnj534k33ocMNEApQ86wpNF2G0DvMtcEMCDbchwJ AI83EkZdmRY++YN+CCwHQue7TJHnHIVGLIpF1dhDSPVJAF8gZZn+DMp4ltkoNTgKhkGr 5ysX9LfDi++b7jFWM/jyVZeuWgb9WvMVM7e5ognXkOgOO7I4Ut39dmNU2B238xUQBVjO lLsA== X-Received: by 10.15.21.199 with SMTP id d47mr23276992eeu.36.1374416052057; Sun, 21 Jul 2013 07:14:12 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id b3sm43207879eev.10.2013.07.21.07.14.10 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jul 2013 07:14:11 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 21 Jul 2013 16:14:07 +0200 Message-Id: <1374416047-3525-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 X-Gm-Message-State: ALoCoQkmMRRBvfZ59YXL+IGn7GFhisndUr23UqAiwsqHn3S5A8W7OA6sEuG02YJFqx02wKBV4GQL Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: fix hdmi portclock limits on Haswell 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.5 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 In commit 325b9d048810f7689ec644595061c0b700e64bce Author: Daniel Vetter Date: Fri Apr 19 11:24:33 2013 +0200 drm/i915: fixup 12bpc hdmi dotclock handling I've errornously claimed that we don't yet support the hdmi 1.4 dotclocks > 225 MHz on Haswell. But a bug report and a closer look at the wrpll table showed that we've supported port clocks up to 300MHz. With the new code to dynamically compute wrpll limits we should have no issues going up to the full 340 MHz range of hdmi 1.4, so let's just use that to fix this regression. That'll allow 4k over hdmi for free! v2: Drop the random hunk that somehow slipped in. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67048 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67030 Tested-by: Andreas Reis Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_hdmi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 98df2a0..29b6028 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -806,6 +806,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, struct drm_device *dev = encoder->base.dev; struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2; + int portclock_limit = IS_HASWELL(dev) ? 340000 : 225000; int desired_bpp; if (intel_hdmi->color_range_auto) { @@ -829,7 +830,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, * outputs. We also need to check that the higher clock still fits * within limits. */ - if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= 225000 + if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit && HAS_PCH_SPLIT(dev)) { DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n"); desired_bpp = 12*3; @@ -846,7 +847,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, pipe_config->pipe_bpp = desired_bpp; } - if (adjusted_mode->clock > 225000) { + if (adjusted_mode->clock > portclock_limit) { DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n"); return false; }