From patchwork Sat Oct 27 13:52:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1655891 Return-Path: X-Original-To: patchwork-dri-devel@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 EC3F53FD4F for ; Sat, 27 Oct 2012 15:10:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7B2D9EFF8 for ; Sat, 27 Oct 2012 08:10:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 2965C9EF3E for ; Sat, 27 Oct 2012 08:00:28 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id c1so1507912eek.36 for ; Sat, 27 Oct 2012 08:00:28 -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:in-reply-to:references; bh=NKoAHKUKh4IW0xP4ktg4iSwdVTfdaNshCc6AX36AZbg=; b=lr/d6XBx8xNWwtI9NuoSPBAMayTZU2lAB5MupOdQYZjkj/fMM+S9a1ejMHY6Byvu8/ Ba2Fxl75oB40yW2+B1VdTeWgcGkHxO8ysRIgRmmt1C8jqJDnDjCzRFZLkU2IOZTR38Fa neoCa36ARYnqzpn1zxL5rveLPRt5tr+szx0J4= 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=NKoAHKUKh4IW0xP4ktg4iSwdVTfdaNshCc6AX36AZbg=; b=AnJtcLqNxjnU6L1Qc5ox4oMvO3EclH/2YDN43qO9DKalGeMwOLnMETyaHVqNVSBo45 T9D9hXbxvlNai7AiVdVXRlOHWFkf0cfJ4ng3EaUcjhd/Ap1UWyUdNaNY5hqkWkIeXqJp ZQrMhIAHHqc/WEM1D5H/pubzWhtn6M1QKGMJY1ri8sOcy47U5Rs9l5UMAutwHrEuPvZe DJXW7n5QzDQY+tGPf5fqfeb6o0kmiK5L9n5FtwvmNw9GeKR9aqQb96B99R7T9kyasDiI bK0Y4ESS4OpJoi39F/j85hvsLeIdiuzd4GnKBPJiKEh25uT1TfVP/IyTmTKStZ7UWpCI 8dXw== Received: by 10.14.194.136 with SMTP id m8mr43033635een.10.1351350028320; Sat, 27 Oct 2012 08:00:28 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id z43sm9773248een.16.2012.10.27.08.00.27 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 27 Oct 2012 08:00:27 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/2] drm/i915: move panel connectors to the front Date: Sat, 27 Oct 2012 15:52:05 +0200 Message-Id: <1351345925-17510-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351345925-17510-1-git-send-email-daniel.vetter@ffwll.ch> References: <1351345925-17510-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmAJw2Cc1tFU/g/lSszYherVCD56JeBHX1ObTHOpJJADUY/XTTWkR4vTMitJxHrnCCLlh11 Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This essentially reverts commit cb0953d734348e8862d6d7edc666cfb3bf6d8fae Author: Adam Jackson Date: Fri Jul 16 14:46:29 2010 -0400 drm/i915: Initialize LVDS and eDP outputs before anything else simply because it doesn't scale: It misses SDVO and DVO panels, and now with DDI encoders on haswell this is becoming unmanageable. Instead we simply sort the connector list after everything is set up. Signed-off-by: Daniel Vetter Reviewed-by: Adam Jackson --- drivers/gpu/drm/i915/intel_display.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dc9676a..d91ee4b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7862,16 +7862,6 @@ static void intel_setup_outputs(struct drm_device *dev) I915_WRITE(PFIT_CONTROL, 0); } - if (HAS_PCH_SPLIT(dev)) { - dpd_is_edp = intel_dpd_is_edp(dev); - - if (has_edp_a(dev)) - intel_dp_init(dev, DP_A, PORT_A); - - if (dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED)) - intel_dp_init(dev, PCH_DP_D, PORT_D); - } - intel_crt_init(dev); if (IS_HASWELL(dev)) { @@ -7895,6 +7885,10 @@ static void intel_setup_outputs(struct drm_device *dev) intel_ddi_init(dev, PORT_D); } else if (HAS_PCH_SPLIT(dev)) { int found; + dpd_is_edp = intel_dpd_is_edp(dev); + + if (has_edp_a(dev)) + intel_dp_init(dev, DP_A, PORT_A); if (I915_READ(HDMIB) & PORT_DETECTED) { /* PCH SDVOB multiplex with HDMIB */ @@ -7914,7 +7908,7 @@ static void intel_setup_outputs(struct drm_device *dev) if (I915_READ(PCH_DP_C) & DP_DETECTED) intel_dp_init(dev, PCH_DP_C, PORT_C); - if (!dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED)) + if (I915_READ(PCH_DP_D) & DP_DETECTED) intel_dp_init(dev, PCH_DP_D, PORT_D); } else if (IS_VALLEYVIEW(dev)) { int found; @@ -7990,6 +7984,8 @@ static void intel_setup_outputs(struct drm_device *dev) if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) ironlake_init_pch_refclk(dev); + + drm_helper_move_panel_connectors_to_head(dev); } static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)