queue-5.1/drm-vmwgfx-don-t-send-drm-sysfs-hotplug-events-on-initial-master-set.patch

   1 From 63cb44441826e842b7285575b96db631cc9f2505 Mon Sep 17 00:00:00 2001
   2 From: Thomas Hellstrom <thellstrom@vmware.com>
   3 Date: Tue, 7 May 2019 11:07:53 +0200
   4 Subject: drm/vmwgfx: Don't send drm sysfs hotplug events on initial master set
   5
   6 From: Thomas Hellstrom <thellstrom@vmware.com>
   7
   8 commit 63cb44441826e842b7285575b96db631cc9f2505 upstream.
   9
  10 This may confuse user-space clients like plymouth that opens a drm
  11 file descriptor as a result of a hotplug event and then generates a
  12 new event...
  13
  14 Cc: <stable@vger.kernel.org>
  15 Fixes: 5ea1734827bb ("drm/vmwgfx: Send a hotplug event at master_set")
  16 Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
  17 Reviewed-by: Deepak Rawat <drawat@vmware.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c |    8 +++++++-
  22  1 file changed, 7 insertions(+), 1 deletion(-)
  23
  24 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
  25 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
  26 @@ -1240,7 +1240,13 @@ static int vmw_master_set(struct drm_dev
  27         }
  28
  29         dev_priv->active_master = vmaster;
  30 -       drm_sysfs_hotplug_event(dev);
  31 +
  32 +       /*
  33 +        * Inform a new master that the layout may have changed while
  34 +        * it was gone.
  35 +        */
  36 +       if (!from_open)
  37 +               drm_sysfs_hotplug_event(dev);
  38
  39         return 0;
  40  }