Changeset 59568 in vbox for trunk/src/VBox/Additions/linux/drm/vbox_mode.c

Timestamp:

Feb 3, 2016 9:33:34 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: further refactor the KMS driver to bring the code closer to the original AST code and (again) to the kernel coding style instead of the VirtualBox style.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (19 diffs)

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

@@ -72 +72 @@
     struct vbox_private *vbox;
     int width, height, cBPP, pitch;
-    unsigned iCrtc;
+    unsigned crtc_id;
     uint16_t fFlags;
 
@@ -80 +80 @@
     width = mode->hdisplay ? mode->hdisplay : 640;
     height = mode->vdisplay ? mode->vdisplay : 480;
-    iCrtc = vbox_crtc->crtc_id;
+    crtc_id = vbox_crtc->crtc_id;
     cBPP = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
@@ -93 +93 @@
     fFlags = VBVA_SCREEN_F_ACTIVE;
     fFlags |= (crtc->enabled ? 0 : VBVA_SCREEN_F_DISABLED);
-    VBoxHGSMIProcessDisplayInfo(&vbox->Ctx, vbox_crtc->crtc_id,
+    VBoxHGSMIProcessDisplayInfo(&vbox->submit_info, vbox_crtc->crtc_id,
                                 crtc->x, crtc->y,
                                 crtc->x * cBPP / 8 + crtc->y * pitch,
                                 pitch, width, height,
-                                vbox_crtc->fBlanked ? 0 : cBPP, fFlags);
-    VBoxHGSMIReportFlagsLocation(&vbox->Ctx, vbox->offHostFlags);
-    VBoxHGSMISendCapsInfo(&vbox->Ctx, VBVACAPS_VIDEO_MODE_HINTS | VBVACAPS_DISABLE_CURSOR_INTEGRATION);
+                                vbox_crtc->blanked ? 0 : cBPP, fFlags);
+    VBoxHGSMIReportFlagsLocation(&vbox->submit_info, vbox->host_flags_offset);
+    VBoxHGSMISendCapsInfo(&vbox->submit_info, VBVACAPS_VIDEO_MODE_HINTS | VBVACAPS_DISABLE_CURSOR_INTEGRATION);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }
@@ -118 +118 @@
      * the first view be the managed memory plus the first command buffer, the
      * second the same plus the second buffer and so on. */
-    p = VBoxHGSMIBufferAlloc(&vbox->Ctx, sizeof(VBVAINFOVIEW), HGSMI_CH_VBVA,
+    p = VBoxHGSMIBufferAlloc(&vbox->submit_info, sizeof(VBVAINFOVIEW), HGSMI_CH_VBVA,
                              VBVA_INFO_VIEW);
     if (p)
@@ -124 +124 @@
         VBVAINFOVIEW *pInfo = (VBVAINFOVIEW *)p;
         pInfo->u32ViewIndex = vbox_crtc->crtc_id;
-        pInfo->u32ViewOffset = vbox_crtc->offFB;
-        pInfo->u32ViewSize =   vbox->vram_size - vbox_crtc->offFB
+        pInfo->u32ViewOffset = vbox_crtc->fb_offset;
+        pInfo->u32ViewSize =   vbox->vram_size - vbox_crtc->fb_offset
                              + vbox_crtc->crtc_id * VBVA_MIN_BUFFER_SIZE;
-        pInfo->u32MaxScreenSize = vbox->vram_size - vbox_crtc->offFB;
-        VBoxHGSMIBufferSubmit(&vbox->Ctx, p);
-        VBoxHGSMIBufferFree(&vbox->Ctx, p);
+        pInfo->u32MaxScreenSize = vbox->vram_size - vbox_crtc->fb_offset;
+        VBoxHGSMIBufferSubmit(&vbox->submit_info, p);
+        VBoxHGSMIBufferFree(&vbox->submit_info, p);
     }
     else
@@ -152 +152 @@
     switch (mode) {
     case DRM_MODE_DPMS_ON:
-        vbox_crtc->fBlanked = false;
+        vbox_crtc->blanked = false;
         break;
     case DRM_MODE_DPMS_STANDBY:
     case DRM_MODE_DPMS_SUSPEND:
     case DRM_MODE_DPMS_OFF:
-        vbox_crtc->fBlanked = true;
+        vbox_crtc->blanked = true;
         break;
     }
@@ -222 +222 @@
 
     /* vbox_set_start_address_crt1(crtc, (u32)gpu_addr); */
-    vbox_crtc->offFB = gpu_addr;
+    vbox_crtc->fb_offset = gpu_addr;
 
     LogFunc(("vboxvideo: %d: vbox_fb=%p, obj=%p, bo=%p, gpu_addr=%u\n",
@@ -413 +413 @@
     LogFunc(("vboxvideo: %d: vbox_connector=%p\n", __LINE__, vbox_connector));
     pVBox = vbox_connector->base.dev->dev_private;
-    rc = VBoxHGSMIGetModeHints(&pVBox->Ctx, pVBox->cCrtcs, pVBox->paVBVAModeHints);
+    rc = VBoxHGSMIGetModeHints(&pVBox->submit_info, pVBox->num_crtcs, pVBox->last_mode_hints);
     AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
-    if (pVBox->paVBVAModeHints[vbox_connector->iCrtc].magic == VBVAMODEHINT_MAGIC)
+    if (pVBox->last_mode_hints[vbox_connector->crtc_id].magic == VBVAMODEHINT_MAGIC)
     {
-        vbox_connector->modeHint.cX = pVBox->paVBVAModeHints[vbox_connector->iCrtc].cx & 0x8fff;
-        vbox_connector->modeHint.cY = pVBox->paVBVAModeHints[vbox_connector->iCrtc].cy & 0x8fff;
-        vbox_connector->modeHint.fDisconnected = !(pVBox->paVBVAModeHints[vbox_connector->iCrtc].fEnabled);
-        LogFunc(("vboxvideo: %d: cX=%u, cY=%u, fDisconnected=%RTbool\n", __LINE__,
-                 (unsigned)vbox_connector->modeHint.cX, (unsigned)vbox_connector->modeHint.cY,
-                 vbox_connector->modeHint.fDisconnected));
+        vbox_connector->mode_hint.width = pVBox->last_mode_hints[vbox_connector->crtc_id].cx & 0x8fff;
+        vbox_connector->mode_hint.height = pVBox->last_mode_hints[vbox_connector->crtc_id].cy & 0x8fff;
+        vbox_connector->mode_hint.disconnected = !(pVBox->last_mode_hints[vbox_connector->crtc_id].fEnabled);
+        LogFunc(("vboxvideo: %d: width=%u, height=%u, disconnected=%RTbool\n", __LINE__,
+                 (unsigned)vbox_connector->mode_hint.width, (unsigned)vbox_connector->mode_hint.height,
+                 vbox_connector->mode_hint.disconnected));
     }
 }
@@ -431 +431 @@
     struct drm_display_mode *pMode = NULL;
     unsigned cModes = 0;
-    int cxPreferred, cyPreferred;
+    int widthPreferred, heightPreferred;
 
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
@@ -437 +437 @@
     vboxUpdateHints(vbox_connector);
     cModes = drm_add_modes_noedid(connector, 2560, 1600);
-    cxPreferred = vbox_connector->modeHint.cX ? vbox_connector->modeHint.cX : 1024;
-    cyPreferred = vbox_connector->modeHint.cY ? vbox_connector->modeHint.cY : 768;
-    pMode = drm_cvt_mode(connector->dev, cxPreferred, cyPreferred, 60, false,
+    widthPreferred = vbox_connector->mode_hint.width ? vbox_connector->mode_hint.width : 1024;
+    heightPreferred = vbox_connector->mode_hint.height ? vbox_connector->mode_hint.height : 768;
+    pMode = drm_cvt_mode(connector->dev, widthPreferred, heightPreferred, 60, false,
                          false, false);
     if (pMode)
@@ -462 +462 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
     vbox_connector = to_vbox_connector(connector);
-    device_remove_file(connector->dev->dev, &vbox_connector->deviceAttribute);
+    device_remove_file(connector->dev->dev, &vbox_connector->sysfs_node);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_remove(connector);
@@ -481 +481 @@
     vbox_connector = to_vbox_connector(connector);
     vboxUpdateHints(vbox_connector);
-    return !vbox_connector->modeHint.fDisconnected;
+    return !vbox_connector->mode_hint.disconnected;
 }
 
@@ -525 +525 @@
              dev, pAttr, psz, (unsigned long long)cch));
     vbox_connector = container_of(pAttr, struct vbox_connector,
-                                  deviceAttribute);
+                                  sysfs_node);
     pVBox = vbox_connector->base.dev->dev_private;
     drm_kms_helper_hotplug_event(vbox_connector->base.dev);
@@ -547 +547 @@
 
     connector = &vbox_connector->base;
-    vbox_connector->iCrtc = cScreen;
+    vbox_connector->crtc_id = cScreen;
 
     /*
@@ -553 +553 @@
      * space.
      */
-    snprintf(vbox_connector->szName, sizeof(vbox_connector->szName),
+    snprintf(vbox_connector->name, sizeof(vbox_connector->name),
              "vbox_screen_%u", cScreen);
-    vbox_connector->deviceAttribute.attr.name = vbox_connector->szName;
-    vbox_connector->deviceAttribute.attr.mode = S_IWUSR;
-    vbox_connector->deviceAttribute.show      = NULL;
-    vbox_connector->deviceAttribute.store     = vbox_connector_write_sysfs;
-    rc = device_create_file(dev->dev, &vbox_connector->deviceAttribute);
+    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)
     {
@@ -638 +638 @@
     /* vbox_cursor_init(dev); */
     LogFunc(("vboxvideo: %d: dev=%p\n", __LINE__, dev));
-    for (i = 0; i < pVBox->cCrtcs; ++i)
+    for (i = 0; i < pVBox->num_crtcs; ++i)
     {
         vbox_crtc_init(dev, i);
@@ -654 +654 @@
 
 
-void VBoxRefreshModes(struct drm_device *dev)
+void vbox_refresh_modes(struct drm_device *dev)
 {
     struct vbox_private *vbox = dev->dev_private;
@@ -702 +702 @@
     if (!handle) {
         /* Hide cursor. */
-        VBoxHGSMIUpdatePointerShape(&vbox->Ctx, 0, 0, 0, 0, 0, NULL, 0);
+        VBoxHGSMIUpdatePointerShape(&vbox->submit_info, 0, 0, 0, 0, 0, NULL, 0);
         return 0;
     }
@@ -733 +733 @@
                                           | VBOX_MOUSE_POINTER_ALPHA;
                         copy_cursor_image(src, dst, width, height, cbMask);
-                        rc = VBoxHGSMIUpdatePointerShape(&vbox->Ctx, fFlags,
+                        rc = VBoxHGSMIUpdatePointerShape(&vbox->submit_info, fFlags,
                                                          hot_x, hot_y, width,
                                                          height, dst, cbData);