diff options
| author | Thomas Hellstrom | 2019-05-07 11:07:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-09 09:17:22 +0200 |
| commit | 3a20515c3c44b13d4851f408cc4d5e1ac32688f1 (patch) | |
| tree | ad7d2418ba093f9a8d74e5a6e31e7d51e173410d /drivers/gpu/drm/vmwgfx | |
| parent | drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages() (diff) | |
| download | kernel-qcow2-linux-3a20515c3c44b13d4851f408cc4d5e1ac32688f1.tar.gz kernel-qcow2-linux-3a20515c3c44b13d4851f408cc4d5e1ac32688f1.tar.xz kernel-qcow2-linux-3a20515c3c44b13d4851f408cc4d5e1ac32688f1.zip | |
drm/vmwgfx: Don't send drm sysfs hotplug events on initial master set
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: <stable@vger.kernel.org>
Fixes: 5ea1734827bb ("drm/vmwgfx: Send a hotplug event at master_set")
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index c72b942f2bdf..82ae68716696 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1291,7 +1291,13 @@ static int vmw_master_set(struct drm_device *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; } |