From patchwork Wed Oct 31 19:23:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 1681131 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 65E5DDFB80 for ; Wed, 31 Oct 2012 19:23:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 398D29ED90 for ; Wed, 31 Oct 2012 12:23:38 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 68E4F9EAF2 for ; Wed, 31 Oct 2012 12:23:26 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so3371724wib.12 for ; Wed, 31 Oct 2012 12:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=gxOY7WWBDjFv2O8gqLsRNHhO6UpnW/oQ0lMB+I8KaqM=; b=escsEIil42ZSNNrRXiG2V/aRHX52ybf+PRiLi8AMu04AtZfpE7fzSgalS28APIDHrT ZAZVcHYTwnC7JQIMVyIG6DhfUSUXRCOL4ijxEB7lX8HAEE6cby5uqgnY/R33nzZMg1iY bSyzNfFL9c7oCv19OJEmXfY0NRX4amQ/vwV/+VyyZRArV7BkuL6wFT6GdKeyj51155TS X3tf0Vja98ApFeACaU+TxuEkRJZNlulkZgc3/woviux+Qcz1JrECM7Vvwvezj1GPx9Im UqdA+1EQgOkLRVQYkldQJSt6YQXqhjOj7jMeelQlw/dqrcipS2q1evwIlqC4zM8+mu/B ZWQw== Received: by 10.216.195.100 with SMTP id o78mr20722536wen.182.1351711405312; Wed, 31 Oct 2012 12:23:25 -0700 (PDT) Received: from localhost.localdomain ([83.217.123.106]) by mx.google.com with ESMTPS id p4sm7127863wix.0.2012.10.31.12.23.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 12:23:24 -0700 (PDT) From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Wed, 31 Oct 2012 19:23:16 +0000 Message-Id: <1351711396-6373-1-git-send-email-damien.lespiau@gmail.com> X-Mailer: git-send-email 1.7.11.7 Subject: [Intel-gfx] [PATCH] drm/i915: Only check for valid PP_{ON, OFF}_DELAYS on pre ILK hardware 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 From: Damien Lespiau ILK+ have this register on the PCH. This check was triggering unclaimed writes. Signed-off-by: Damien Lespiau Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_bios.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 0ed6baf..87e9b92 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -762,7 +762,8 @@ void intel_setup_bios(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; /* Set the Panel Power On/Off timings if uninitialized. */ - if ((I915_READ(PP_ON_DELAYS) == 0) && (I915_READ(PP_OFF_DELAYS) == 0)) { + if (!HAS_PCH_SPLIT(dev) && + I915_READ(PP_ON_DELAYS) == 0 && I915_READ(PP_OFF_DELAYS) == 0) { /* Set T2 to 40ms and T5 to 200ms */ I915_WRITE(PP_ON_DELAYS, 0x019007d0);