[PATCH 4.9 48/83] drm/vmwgfx: Dont send drm sysfs hotplug events on initial master set

[Greg Kroah-Hartman]

From: Thomas Hellstrom <thellst...@vmware.com>

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: <sta...@vger.kernel.org>
Fixes: 5ea1734827bb ("drm/vmwgfx: Send a hotplug event at master_set")
Signed-off-by: Thomas Hellstrom <thellst...@vmware.com>
Reviewed-by: Deepak Rawat <dra...@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 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
@@ -1245,7 +1245,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;
 }