From patchwork Sun Aug 19 19:13:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1345191 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 B47AEDF264 for ; Sun, 19 Aug 2012 20:50:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A65C3A105D for ; Sun, 19 Aug 2012 13:50:55 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DF78A1041 for ; Sun, 19 Aug 2012 13:21:14 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hn17so2755791wib.12 for ; Sun, 19 Aug 2012 13:21:14 -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=QWlI8KOkC2s4KdwHx3uP7RwySoDc+H84LJRB9qrxacU=; b=RPeUQR4WRuNp7AoMEH7XpyBLvSprgyIsWLMpr9dtqM3aVDNncrHyVljJEebNCdChu3 C57iLly74eUYodH0pYP1wyqHr3AwvNtkea1iDHq4hnCt8RJa/bbwSSy9MvXkUbbJ8hNG hhMDdDXg3c4SukV9n2INqkTMjY3/d9WRaXldM= 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=QWlI8KOkC2s4KdwHx3uP7RwySoDc+H84LJRB9qrxacU=; b=QSnEe3scfoiAG/HSrmnraB8fxqciVUiFKVMXy5+lc3ZlZvk85n8TcahF7Dt5aFQ+4C PFaeb3caYbAZwGCebhppvGHAXtssTdQYRA9yUFwYRl/QDaCATSBqsIi7dB2JAfsP4P1X Lhd7cYu6Qq5ZrdNwiV1n9bsL9Rkg/sLoP2GPZEH/krkkumlD/67u9iAYryiwDhOYmufO PqO9L0PVAOyF6C3ZH+KlmzTZ96Z4SlC3szBIeUTOkbyVnDkXDk09PtHGX2vBsEEWDg4p av6Yw+6eYltJrv9XWBMg3woTOa68OcJioq2PWP5zsTCHr2C0Z4JuGCS2dq8LOlYdg7jX 9Kag== Received: by 10.180.106.97 with SMTP id gt1mr22038693wib.5.1345407674595; Sun, 19 Aug 2012 13:21:14 -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 fu8sm24194367wib.5.2012.08.19.13.21.13 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 13:21:13 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 19 Aug 2012 21:13:02 +0200 Message-Id: <1345403595-9678-46-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmy0dAD2VohLgTIu+uxSuS8YoUOVgRa+iTMcOXWackCtteDFXtoxHWe11DpbGefjMhUMHBd Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 45/58] 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 Reviewed-by: Jesse Barnes --- 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 cd3606c..4e72119 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6585,30 +6585,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) { @@ -7015,7 +6991,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;