Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3899703imu; Mon, 28 Jan 2019 12:57:45 -0800 (PST) X-Google-Smtp-Source: ALg8bN4o9IZeCWpMSZJD7N8wGF0ys2ByesaAxyaeSwQX5pQdGKL/ToSBSlIBJu2FAum4zhkD0Jm4 X-Received: by 2002:a63:902:: with SMTP id 2mr19943670pgj.219.1548709065510; Mon, 28 Jan 2019 12:57:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548709065; cv=none; d=google.com; s=arc-20160816; b=kww8DnJEIaih9UACrUoAkWJbSgjbsI5iuUvP7Mc9Kjrang/N/jy3mM/wJgvwF2/yPN vEURcjCMPosbCieTNHjfRRss4SGtk5BCgo+FjZoEvIEZpE2CWn6puBsRSvFqVJaVywmP znqipUJ73XC8GfXiqrrCjsK/Veys/+vFE/7DIIiVGPVu4VOJ98ZVNu0002Ax65aZn5ZC AuTPfD+S77hX3wruXiNfDalCD5Bn9NgcuBzRD7fBEZyQHYqXwBkLu0HjQuahjwnQ2QKC NWq+rvZ8Xhk6a9OeRi5r4bfFXebLVGIhCxyKl2jHXHS6gHZ8zbyqn3GHAgPbt4LSz/c5 C33g== 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=Cuz7fGyLyWfW8LDQg9HXI7wSK5mhHqKoJJJgyyVgYdeEsYeLl8vH8Uk69kN/S6xbOy lS+srf2h2/8p/PyYCg4sNh1vvTxYu70Gh2Fgeb1xtxxd2i6E/ift/h8cSVl1fStCAgax T/Lw6hyDXdJkQTaDCferY+Z7/MqxWxbLX64YZwDGT4EE7Q+gNnVbn2hFKjBV+ZbDXb22 j+PPA6meXyq1jNe7g/XyiPyGlwDio4U55/8ZQ0vd0TXuBIg1tNtZfaMrOKogGJmnGVar MiPrMrT23q35lEI0hLFSR+zyNaZoWHqhw1pyqX2kUtil/RHb7ioEmY+cW51BOTXMaRa2 qGhg== 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 u131si34137605pgc.287.2019.01.28.12.57.30; Mon, 28 Jan 2019 12:57:45 -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 S1728051AbfA1U4X (ORCPT + 99 others); Mon, 28 Jan 2019 15:56:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33958 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728368AbfA1U4V (ORCPT ); Mon, 28 Jan 2019 15:56:21 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F40C122E84; Mon, 28 Jan 2019 20:56:21 +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 7E222747D2; Mon, 28 Jan 2019 20:56:19 +0000 (UTC) From: Lyude Paul To: intel-gfx@lists.freedesktop.org Cc: Imre Deak , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] drm/i915: Don't send hotplug in intel_dp_check_mst_status() Date: Mon, 28 Jan 2019 15:56:03 -0500 Message-Id: <20190128205603.16372-4-lyude@redhat.com> In-Reply-To: <20190128205603.16372-1-lyude@redhat.com> References: <20190128205603.16372-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 28 Jan 2019 20:56:21 +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