Changeset 59936 in vbox for trunk

Timestamp:

Mar 5, 2016 5:00:20 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: remove sysfs nodes which we were using to notify the driver from user space about a monitor hot-plug event. We can now get IRQ notification instead.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_mode.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -137 +137 @@
     char name[32];
     unsigned crtc_id;
-    /** Device attribute for sysfs file used for receiving mode hints from user
-     * space. */
-    struct device_attribute sysfs_node;
     struct {
         uint16_t width;

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -447 +447 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
-    device_remove_file(connector->dev->dev, &vbox_connector->sysfs_node);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_remove(connector);
@@ -499 +498 @@
 };
 
-ssize_t vbox_connector_write_sysfs(struct device *dev,
-                                   struct device_attribute *pAttr,
-                                   const char *psz, size_t cch)
-{
-    struct vbox_connector *vbox_connector;
-    struct vbox_private *vbox;
-
-    LogFunc(("vboxvideo: %d: dev=%p, pAttr=%p, psz=%s, cch=%llu\n", __LINE__,
-             dev, pAttr, psz, (unsigned long long)cch));
-    vbox_connector = container_of(pAttr, struct vbox_connector,
-                                  sysfs_node);
-    vbox = vbox_connector->base.dev->dev_private;
-    drm_kms_helper_hotplug_event(vbox_connector->base.dev);
-    if (vbox->fbdev)
-        drm_fb_helper_hotplug_event(&vbox->fbdev->helper);
-    return cch;
-}
-
 static int vbox_connector_init(struct drm_device *dev, unsigned cScreen,
                                struct drm_encoder *encoder)
@@ -533 +514 @@
     vbox_connector->crtc_id = cScreen;
 
-    /*
-     * Set up the sysfs file we use for getting video mode hints from user
-     * space.
-     */
-    snprintf(vbox_connector->name, sizeof(vbox_connector->name),
-             "vbox_screen_%u", cScreen);
-    vbox_connector->sysfs_node.attr.name = vbox_connector->name;
-    vbox_connector->sysfs_node.attr.mode = S_IWUSR;
-    vbox_connector->sysfs_node.show      = NULL;
-    vbox_connector->sysfs_node.store     = vbox_connector_write_sysfs;
-    rc = device_create_file(dev->dev, &vbox_connector->sysfs_node);
-    if (rc < 0)
-    {
-        kfree(vbox_connector);
-        return rc;
-    }
     drm_connector_init(dev, connector, &vbox_connector_funcs,
                        DRM_MODE_CONNECTOR_VGA);