Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5009163imu; Tue, 29 Jan 2019 11:10:54 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Sa7Yrkv56nLGcWxNFpkSl2v5xYCvmXOv82r182WYNJSdWOotjjErFA+WOWkjOGV84Zsuj X-Received: by 2002:a62:ae04:: with SMTP id q4mr27399074pff.126.1548789053969; Tue, 29 Jan 2019 11:10:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548789053; cv=none; d=google.com; s=arc-20160816; b=0uPpwNHf4uTE+4wKiiub0tb1/zVTD1t31nNuyhM80biXMzjmuwcFr+niNpNtThgSl9 Dm6bDc9COxLr7PsAtDBEPfTJ2sKyOtS4BdlwmSoh3qmQktaoaweA7u4zDVVfFbwlO77l MyJZgBdgrYv9DalzSNO5a2YtwO8U0N6u3ZoTeP0gkjlRsSlciTxXDHgpZd1Ii5wnJU2b uGdKbfjT1tWw3xOaZQkpI04cXQwMkBvLE8j4JjJ6PZvmouerkFzuWiyt/cO2b4NT3vrA bQXSO1xySjaB+e3MI4QGKE5/JyLEaJc03Vc6dlbVph+Yq2wGMT5VBEClPplL5hNvaW5x gKYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=KqiuxkEdLSmWeq1/i8VobIlChXpMSO8hzDtLI4/QMks=; b=UaVNG1Z06X5cQUEvI2nvEEWvR8yMic4IOVEgbeir+QPlJoPS031Kt2DQqluBWtfpDC PVQ3CD/cvNicISRLTh8Wl56DwAOROaL3CMVD9NakZfvAPrDjqmhegOHLIYolZWjjYaFo Fun0u8dAvebsIcDXddRhA8aRmVeEyiiBSqo4XIIOiJO7K4SBc6u1kr7AeTBcXdE9Nb0k fuZ09jyFILu6fqG3A2idv5GN/kOXRa0f+Cckf9f1jOGnuJkZEWxgvnvxGRSM9v1D+BON 5+flQfgou9bL+4XTr0USau4obNGPGkYaq1ITTQgE7GHmgRZDqcejRU92g+lN45048dmL p9XQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s80si3294486pfa.130.2019.01.29.11.10.38; Tue, 29 Jan 2019 11:10:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729411AbfA2TK1 (ORCPT + 99 others); Tue, 29 Jan 2019 14:10:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36978 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729399AbfA2TK0 (ORCPT ); Tue, 29 Jan 2019 14:10:26 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23B247FDE3; Tue, 29 Jan 2019 19:10:25 +0000 (UTC) Received: from malachite.bss.redhat.com (dhcp-10-20-1-11.bss.redhat.com [10.20.1.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 071C71715E; Tue, 29 Jan 2019 19:10:23 +0000 (UTC) From: Lyude Paul To: intel-gfx@lists.freedesktop.org Cc: Chris Wilson , Imre Deak , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] drm/i915: Don't send hotplug in intel_dp_check_mst_status() Date: Tue, 29 Jan 2019 14:10:01 -0500 Message-Id: <20190129191001.442-4-lyude@redhat.com> In-Reply-To: <20190129191001.442-1-lyude@redhat.com> References: <20190129191001.442-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 29 Jan 2019 19:10:26 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This hotplug also isn't needed: drm_dp_mst_topology_mgr_set_mst() already sends a hotplug on its own from drm_dp_destroy_connector_work() after destroying connectors in the MST topology. Signed-off-by: Lyude Paul Cc: Imre Deak Cc: Daniel Vetter --- drivers/gpu/drm/i915/intel_dp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index c2399acf177b..f9113c0cdfcd 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4608,12 +4608,10 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) return ret; } else { - struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); DRM_DEBUG_KMS("failed to get ESI - device may have failed\n"); intel_dp->is_mst = false; - drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); - /* send a hotplug event */ - drm_kms_helper_hotplug_event(intel_dig_port->base.base.dev); + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, + intel_dp->is_mst); } } return -EINVAL; -- 2.20.1