Changeset 59947 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Mar 7, 2016 6:59:38 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: change back the spin-locking in the fbdev emulation code to match what is done in the ast driver, and switch over the rest, which is used to synchronise access to the virtual hardware, to use a mutex instead of a spin-lock.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_fb.c (modified) (4 diffs)
• vbox_main.c (modified) (3 diffs)
• vbox_mode.c (modified) (4 diffs)

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

@@ -117 +117 @@
     } ttm;
 
-    spinlock_t dev_lock;
+    struct mutex hw_mutex;
     bool isr_installed;
     struct work_struct hotplug_work;
@@ -171 +171 @@
     struct ttm_bo_kmap_obj mapping;
     int x1, y1, x2, y2; /* dirty rect */
+    spinlock_t dirty_lock;
 };
 

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

@@ -131 +131 @@
     x2 = x + width - 1;
     y2 = y + height - 1;
-    spin_lock_irqsave(&vbox->dev_lock, flags);
+    spin_lock_irqsave(&fbdev->dirty_lock, flags);
 
     if (fbdev->y1 < y)
@@ -147 +147 @@
         fbdev->y1 = y;
         fbdev->y2 = y2;
-        spin_unlock_irqrestore(&vbox->dev_lock, flags);
+        spin_unlock_irqrestore(&fbdev->dirty_lock, flags);
         LogFunc(("vboxvideo: %d\n", __LINE__));
         return;
@@ -154 +154 @@
     fbdev->x1 = fbdev->y1 = INT_MAX;
     fbdev->x2 = fbdev->y2 = 0;
-    spin_unlock_irqrestore(&vbox->dev_lock, flags);
+    spin_unlock_irqrestore(&fbdev->dirty_lock, flags);
 
     if (!bo->kmap.virtual) {
@@ -418 +418 @@
 
     vbox->fbdev = fbdev;
+    spin_lock_init(&fbdev->dirty_lock);
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     fbdev->helper.funcs = &vbox_fb_helper_funcs;

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

@@ -117 +117 @@
              num_rects, vbox));
     vbox_enable_accel(vbox);
-    spin_lock_irqsave(&vbox->dev_lock, flags);
+    mutex_lock(&vbox->hw_mutex);
     for (i = 0; i < num_rects; ++i)
     {
@@ -147 +147 @@
         }
     }
-    spin_unlock_irqrestore(&vbox->dev_lock, flags);
+    mutex_unlock(&vbox->hw_mutex);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }
@@ -348 +348 @@
     vbox->dev = dev;
 
-    spin_lock_init(&vbox->dev_lock);
+    mutex_init(&vbox->hw_mutex);
     /* I hope this won't interfere with the memory manager. */
     vbox->vram = pci_iomap(dev->pdev, 0, 0);

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

@@ -146 +146 @@
     struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
     struct vbox_private *vbox = crtc->dev->dev_private;
-    unsigned long flags;
 
     LogFunc(("vboxvideo: %d: vbox_crtc=%p, mode=%d\n", __LINE__, vbox_crtc,
@@ -160 +159 @@
         break;
     }
-    spin_lock_irqsave(&vbox->dev_lock, flags);
+    mutex_lock(&vbox->hw_mutex);
     vbox_do_modeset(crtc, &crtc->hwmode);
-    spin_unlock_irqrestore(&vbox->dev_lock, flags);
+    mutex_unlock(&vbox->hw_mutex);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }
@@ -249 +248 @@
 {
     struct vbox_private *vbox = crtc->dev->dev_private;
-    unsigned long flags;
     int rc = 0;
 
     LogFunc(("vboxvideo: %d: vbox=%p\n", __LINE__, vbox));
     vbox_crtc_mode_set_base(crtc, x, y, old_fb);
-    spin_lock_irqsave(&vbox->dev_lock, flags);
+    mutex_lock(&vbox->hw_mutex);
     rc = vbox_set_view(crtc);
     if (!rc)
         vbox_do_modeset(crtc, mode);
-    spin_unlock_irqrestore(&vbox->dev_lock, flags);
+    mutex_unlock(&vbox->hw_mutex);
     LogFunc(("vboxvideo: %d\n", __LINE__));
     return rc;
@@ -567 +565 @@
     struct vbox_private *vbox = dev->dev_private;
     struct drm_crtc *crtci;
-    unsigned long flags;
-
-    LogFunc(("vboxvideo: %d\n", __LINE__));
-    spin_lock_irqsave(&vbox->dev_lock, flags);
+
+    LogFunc(("vboxvideo: %d\n", __LINE__));
+    mutex_lock(&vbox->hw_mutex);
     list_for_each_entry(crtci, &dev->mode_config.crtc_list, head)
         vbox_do_modeset(crtci, &crtci->hwmode);
-    spin_unlock_irqrestore(&vbox->dev_lock, flags);
+    mutex_unlock(&vbox->hw_mutex);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }