From patchwork Tue Nov 21 09:42:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10067871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28AA3602B7 for ; Tue, 21 Nov 2017 09:42:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EC8E28D4A for ; Tue, 21 Nov 2017 09:42:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 137B228D51; Tue, 21 Nov 2017 09:42:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A706C28D4A for ; Tue, 21 Nov 2017 09:42:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 585D389D7C; Tue, 21 Nov 2017 09:42:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1AF189D7C for ; Tue, 21 Nov 2017 09:42:48 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id l188so98980wma.1 for ; Tue, 21 Nov 2017 01:42:48 -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:mime-version :content-transfer-encoding; bh=rKyiVziAo81pAf4N/K7JIoSsF6WKbT54GHr+usSPIVs=; b=T7A8hB81YaluEUFOG1U8SyFhd/ap2ps+brG0/RToAvFGB7R1Jd3QBkhTWmuOnvpDwa EjQ7XEStfAh7RWo0VdPNLVNvku5d6cTLv1Vj+NPDr8iDE2VPcBvIKvC43xszYBXiOoyT Xy3+5ujripnOefJQmWHC/bNG3J87ES5tanrYQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rKyiVziAo81pAf4N/K7JIoSsF6WKbT54GHr+usSPIVs=; b=GJe9NKQN5PfOIh3h0HC7CI2+l8NhXRkDgrfSXwEHHmRGzhynUn4Juo1jPsMFaGQjo7 gWAcotjsA7DljJDnlduF9h65dwW/lWaafGrceSf8WM06veDwYTeQ0Sx5qOox7wjoe1jI Is5rv5uD9+3b+tfpRh6OXfz4COm7mQWqGefa4LbPOM/6EQLfvAt9fK0p9NOaMtrt5QT4 oTHbzV3BpC4O07KOZ7mVPlnZV6PW+uDI1pNeQT/ctzD6/NwaHnKs/D2uJBFVCh68DKVc ZQHJXlhohhY9hvyizwczO4iEJuiNdS+vvIiguC9K71jJEebcbU5t3pTkEE2dVeGUenL6 T7EA== X-Gm-Message-State: AJaThX45KjHiAltim1ttbo8Z5YwIfMa1+2boNBaMhHjQEAg7mD/mAHSS HJPHvLffs6SG9tAhgzRm+/tS6x/z X-Google-Smtp-Source: AGs4zMbiaGV0rYynBkhibJxEu2wXysXorK7+iju76Chn6WOoROkpz+fJUOGvx4HhyvDHrdG8GAs5dg== X-Received: by 10.80.164.209 with SMTP id x17mr23344557edb.158.1511257367075; Tue, 21 Nov 2017 01:42:47 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id l4sm11376663edc.20.2017.11.21.01.42.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Nov 2017 01:42:46 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 21 Nov 2017 10:42:41 +0100 Message-Id: <20171121094241.9129-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.0 MIME-Version: 1.0 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: remove stale comment from sanitize_encoder X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This goes back to pre-atomic, where due to intermediate dpms states connectors and encoder states might indeed not have matched. With atomic that's all smashed together (and hopefully no bios ever enables a vga output in dpms standby/suspedn state or we're toast). In commit 873ffe69a9097fb241fff2967ea6f0bf2c179195 Author: Maarten Lankhorst Date: Wed Aug 5 12:37:07 2015 +0200 drm/i915: Remove connectors_active from sanitization, v2. sanitize_encoders was changed to disable the encoder in all cases, which made the comment obsolete. Remove the misleading comment. Reported-by: Ville Syrjälä Cc: Ville Syrjälä Cc: Maarten Lankhorst Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 84817ccc5305..b16c563b453f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) connector->base.dpms = DRM_MODE_DPMS_OFF; connector->base.encoder = NULL; } - /* Enabled encoders without active connectors will be fixed in - * the crtc fixup. */ } void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)