From patchwork Thu Jul 26 18:49:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245211 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 672E83FC33 for ; Thu, 26 Jul 2012 20:42:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 290FD9E9FE for ; Thu, 26 Jul 2012 13:42:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B4E69E790 for ; Thu, 26 Jul 2012 12:57:20 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so1724686wgb.12 for ; Thu, 26 Jul 2012 12:57:20 -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=MQX0RuR+Ldhn/YKEbWLWdouIcD/kMz64w8kR+9VJDQI=; b=Ir6RdGgeP3VSlYd6dvKfUZLLnK3pjr1iDGfnapcb0QvRlJirgMSI48WAPxoeeBlNnN i7wQjarMcyXKmb74uEqOq/J1C8/dUYMo7VbIWXe2e1fYNmIm7JrvlCDkl9l0FeVXz7iC QQExhj2RUEmO4fbTE93GhcrTTNNDLYus6r0EA= 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=MQX0RuR+Ldhn/YKEbWLWdouIcD/kMz64w8kR+9VJDQI=; b=Vye+4XzwlD7m36CeiJf010E2imG+rS/Qya2Q5GCFgJwHV0BOjhvxnXf5Iu8j35HGFI hzYwtHAAdYbDBPOZtsRZjl0yDGAbcOPJJVl/ImbjtcyqrJk0l5tvEPhdnQI5uZ41e9bL 6qzhdr4f3SpXquBQ5UO2ykzULYjm4tzEskZKB3FdnpjurVLvbkdGouCl3fCD6W1XnxGB pZi+mmgSZca762Idx6+YM9Sa8XBnOS41MxIveNR7XhXyeMv2uSe9rO9/kcnJUji0kE7F BgCPktXtBDkEavjESWeGDBpDOtIwl1nqwCaYMAZJWvijGmJg0NzrA0TxFL2TyvJtazSL XeLA== Received: by 10.180.86.133 with SMTP id p5mr81324wiz.17.1343332640256; Thu, 26 Jul 2012 12:57:20 -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 fr4sm391403wib.8.2012.07.26.12.57.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:19 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:18 +0200 Message-Id: <1343328581-2324-54-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkKtjcCAHaDKiO4E5Q9gXCEWf5q4SGHV2bvsKiub8ygqeIy+ex+lpVy7pZnxklHY2CyTYXE Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 53/76] drm/i915: remove crtc disabling special case 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 Originally this has been introduced in commit 6eebd6bb5f1ea04f04019e5c39f87a0f17ffb472 Author: Chris Wilson Date: Mon Nov 28 21:10:05 2011 +0000 drm: Fix lack of CRTC disable for drm_crtc_helper_set_config(.fb=NULL) With the improvements of the output state staging and no longer overwriting crtc->fb before the hw state is updated we can now handle crtc disabling as part of the normal modeset sequence. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a691c76..e0cc193 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6512,30 +6512,6 @@ static bool intel_encoder_crtc_ok(struct drm_encoder *encoder, return false; } -static int -intel_crtc_helper_disable(struct drm_crtc *crtc) -{ - struct drm_device *dev = crtc->dev; - struct drm_connector *connector; - struct drm_encoder *encoder; - - /* Decouple all encoders and their attached connectors from this crtc */ - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - if (encoder->crtc != crtc) - continue; - - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - if (connector->encoder != encoder) - continue; - - connector->encoder = NULL; - } - } - - drm_helper_disable_unused_functions(dev); - return 0; -} - static void intel_crtc_prepare_encoders(struct drm_device *dev) { @@ -6938,7 +6914,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) (int)set->num_connectors, set->x, set->y); } else { DRM_DEBUG_KMS("[CRTC:%d] [NOFB]\n", set->crtc->base.id); - return intel_crtc_helper_disable(set->crtc); } dev = set->crtc->dev;