From patchwork Tue Jul 3 18:57:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1152821 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3159B3FE4F for ; Tue, 3 Jul 2012 19:01:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F7D39F6DC for ; Tue, 3 Jul 2012 12:01:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yx0-f177.google.com (mail-yx0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 63D5DA0870 for ; Tue, 3 Jul 2012 11:57:56 -0700 (PDT) Received: by yenr9 with SMTP id r9so6074242yen.36 for ; Tue, 03 Jul 2012 11:57:55 -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:x-mailer:in-reply-to:references; bh=COZt6lo5OeFL9IfEeGHbyzt+vOIHjNMlMy1DeCVSee8=; b=y0tBFUX/QWJ2+TjAfqRL80y8hag30rJy36oENEfjemNiwCwxj7QCfEqIq2/hIDKxFL 5UrthdKMwsXPMIBUvfYVrd9OfxrEbEDMV5ldhKEP2OLWMOLbOE6pRi4hV22sFi/nzsfw 3uNG2XzGRWElcw5C5wH4+DWcDUohdj/lZkd7DeqRHL5DUeMSN6+4VvGSv1hE1TU+gIik whxyfFEapWk/2VWkbKcnIlQIhgh8K+/Hg0RauWq3fU1+ZEu0ILJKfsXz941sMeyrfLpj q014I+oVHiEnLpcw/Vzn9xXfV4Qb7ZpiUfND7uz9Y2j1UR4Sr2d3Jg5zydPA+AKo3bmm JFwg== Received: by 10.236.155.130 with SMTP id j2mr21491864yhk.127.1341341875842; Tue, 03 Jul 2012 11:57:55 -0700 (PDT) Received: from vicky.domain.invalid (189.26.42.14.dynamic.adsl.gvt.net.br. [189.26.42.14]) by mx.google.com with ESMTPS id a64sm33216753yhe.11.2012.07.03.11.57.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 11:57:55 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 3 Jul 2012 15:57:33 -0300 Message-Id: <1341341853-4092-3-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341341853-4092-1-git-send-email-przanoni@gmail.com> References: <1341341853-4092-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 3/3] drm/i915: don't ironlake_init_pch_refclk() on LPT 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: Paulo Zanoni This function is used to set the PCH_DREF_CONTROL register, which does not exist on LPT anymore. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) My crystal ball tells me patches like this will become more and more common in the future... That's why patch 01 was proposed. This patch depends on patch 01, otherwise we'll start calling ironlake_init_pch_refclk on non-pch machines. diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1794833..0630471 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -687,7 +687,7 @@ static int i915_drm_thaw(struct drm_device *dev) /* KMS EnterVT equivalent */ if (drm_core_check_feature(dev, DRIVER_MODESET)) { - if (HAS_PCH_SPLIT(dev)) + if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) ironlake_init_pch_refclk(dev); mutex_lock(&dev->struct_mutex); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8cd5032..da33911 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6855,7 +6855,7 @@ static void intel_setup_outputs(struct drm_device *dev) /* disable all the possible outputs/crtcs before entering KMS mode */ drm_helper_disable_unused_functions(dev); - if (HAS_PCH_SPLIT(dev)) + if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) ironlake_init_pch_refclk(dev); }