From patchwork Thu Nov 29 14:59:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1821661 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 DAEBF3FC5A for ; Thu, 29 Nov 2012 15:13:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4991E6040 for ; Thu, 29 Nov 2012 07:13:17 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DFC9E5FF7 for ; Thu, 29 Nov 2012 07:09:03 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so6529144eek.36 for ; Thu, 29 Nov 2012 07:09:03 -0800 (PST) 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:in-reply-to:references; bh=8VSBEfOrS9v62er8mcNJ8qZv0KY9SkvuAKsthmO8y5E=; b=aXlJKAzKHp4j2vVCcRQiGqPUffoJvTZvUNHwR4R8+snjp4ZBkK7qNYW+uygfuq0exZ 7SReRGZOpZApcJZlWV4KE3kXG0vTyfE3R1BsFFcK7X5SIfkay8FFbJmJOTqRDr4zp5KH lEH7S52KfC+TS3MFmjyKEEPwbmyv3rmj7yw08= 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:in-reply-to:references :x-gm-message-state; bh=8VSBEfOrS9v62er8mcNJ8qZv0KY9SkvuAKsthmO8y5E=; b=pOjdMJgE3rJeEO7cumqKutaa1cboGlPSSDXi97hw91vGm2Y0t0yoMjvrrn23SR2RvB +O4q+8k5XeR1IIrwqN2Nhq4LJJpssFndk/mpfBlTwWXJ2Seh3n/DY/YnulqwfWSg8IPL +VHH+jNUTxbC3FzIG07BA24kkSL70NEUZAlm9SOlAdrsMaQ64/wc2gEWRKJxC6zgczxI N/Glq/MSnbccAXg7lEl8vZo7KVyf/joV8MMNr7gJpewXvDtkezD7UJwjIVBe3oZ1ydVI hPEdMqn6SQTCdIzZ0vZyi+A+CjTkZ7c64/al2jji0BchDnmHV4gmXmiIYbyjfLWE0QnP PIgA== Received: by 10.14.221.5 with SMTP id q5mr82782636eep.33.1354201743806; Thu, 29 Nov 2012 07:09:03 -0800 (PST) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id b2sm4108893eep.9.2012.11.29.07.09.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Nov 2012 07:09:03 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 29 Nov 2012 15:59:35 +0100 Message-Id: <1354201179-14975-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> References: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQm95qo5j2GsGcZrMSH/NakJTJpxJCftKyZfXDRcsbPwwhJxwFqOQiBZYsm102BYmENFkYHZ Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 06/10] drm/i915: drop unnecessary clearing of pch dp transcoder timings 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 This has originally been added in commit 8db9d77b1b14fd730561f64beea8c00e4478d7c5 Author: Zhenyu Wang Date: Wed Apr 7 16:15:54 2010 +0800 drm/i915: Support for Cougarpoint PCH display pipeline probably to combat issues with hw state left behind by the BIOS. And indeed, I've checked out that specific revision, and there is no DP support yet. So the pch dp transcoder won't be correctly disabled, and that's important since it requires a rether special disable dance: Just writing 0 to TRANS_DP_CTL won't cut it, since we need to select the NONE port when disabling, too. And indeed, things seem to still work, so let's just remove this. Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0c44421..456acd6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5345,15 +5345,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, } else intel_put_pch_pll(intel_crtc); - if (is_dp && !is_cpu_edp) { + if (is_dp && !is_cpu_edp) intel_dp_set_m_n(crtc, mode, adjusted_mode); - } else { - /* For non-DP output, clear any trans DP clock recovery setting.*/ - I915_WRITE(TRANSDATA_M1(pipe), 0); - I915_WRITE(TRANSDATA_N1(pipe), 0); - I915_WRITE(TRANSDPLINK_M1(pipe), 0); - I915_WRITE(TRANSDPLINK_N1(pipe), 0); - } for_each_encoder_on_crtc(dev, crtc, encoder) if (encoder->pre_pll_enable)