From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7091FC2BCA1 for ; Fri, 7 Jun 2019 15:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 406062147A for ; Fri, 7 Jun 2019 15:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922611; bh=7Z35jrIAXwzoyP0jG6tlgu4ZXHM6GMNtRFN3qjCeJ08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jJUgZmlbkA3Vr56ZWpHHGbxEPHgLqpAj+dasWIud58e3raO8CmM7ofGMSr0z1JMBn l0KORzVfpGZ8Whtcembbc+oIr9l/RVXZMHbxiVz8sKX4v1nZkFqv3d3i7rYO3uFRhU jT30IHT1xXnncvmVvmDuvR6BT9rz36j179bAhy/c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732118AbfFGPuJ (ORCPT ); Fri, 7 Jun 2019 11:50:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:36652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730765AbfFGPuH (ORCPT ); Fri, 7 Jun 2019 11:50:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7EA142147A; Fri, 7 Jun 2019 15:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922607; bh=7Z35jrIAXwzoyP0jG6tlgu4ZXHM6GMNtRFN3qjCeJ08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QWA+SCvW/unJYWK7uhq/LZmII1iwO3fpMyFIaA7yVJv/pzioQZbs8DvgeDsfDqONe V5iQ6X/ddUpGNCuMAUFwAXmvswb+h6sV77xhhngrNs5/Czyx6XAR6fEMlhxFeJYZfM 7TuOHF+mJt1PXr3PShnA/+/t46OxOmYa8xYgKnC8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Hellstrom , Deepak Rawat Subject: [PATCH 5.1 74/85] drm/vmwgfx: Dont send drm sysfs hotplug events on initial master set Date: Fri, 7 Jun 2019 17:39:59 +0200 Message-Id: <20190607153857.293521333@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153849.101321647@linuxfoundation.org> References: <20190607153849.101321647@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Hellstrom commit 63cb44441826e842b7285575b96db631cc9f2505 upstream. This may confuse user-space clients like plymouth that opens a drm file descriptor as a result of a hotplug event and then generates a new event... Cc: Fixes: 5ea1734827bb ("drm/vmwgfx: Send a hotplug event at master_set") Signed-off-by: Thomas Hellstrom Reviewed-by: Deepak Rawat Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1240,7 +1240,13 @@ static int vmw_master_set(struct drm_dev } dev_priv->active_master = vmaster; - drm_sysfs_hotplug_event(dev); + + /* + * Inform a new master that the layout may have changed while + * it was gone. + */ + if (!from_open) + drm_sysfs_hotplug_event(dev); return 0; }