Changeset 47480 in vbox

Timestamp:

Jul 30, 2013 6:47:16 PM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: synchronising local tree with repository, currently not buildable.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• files_vboxvideo_drv (modified) (1 diff)
• vboxvideo.h (modified) (2 diffs)
• vboxvideo_crtc.c (modified) (3 diffs)
• vboxvideo_device.c (modified) (4 diffs)
• vboxvideo_drv.h (modified) (1 diff)
• vboxvideo_mode.h (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -55 +55 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_drv.c=>vboxvideo_drv.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_drv.h=>vboxvideo_drv.h \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_fbdev.c=>vboxvideo_fbdev.c \
+    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_framebuffer.c=>vboxvideo_framebuffer.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_kms.c=>vboxvideo_kms.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vboxvideo_mode.h=>vboxvideo_mode.h \

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

@@ -47 +47 @@
 
 #include "vboxvideo_mode.h"
+#include <VBox/VBoxVideoGuest.h>
 #include "drm/drmP.h"
 
@@ -61 +62 @@
     struct pci_dev     *pdev;
     unsigned long       flags;
-    /** @todo move this into flags */
+    HGSMIGUESTCOMMANDCONTEXT Ctx;
     bool                fAnyX;
+    bool                fHaveHGSMI;
+    size_t              offViewInfo;
+    size_t              offCommandBuffers;
 
     drm_local_map_t    *framebuffer;

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

@@ -51 +51 @@
 #include "drm/drm_crtc_helper.h"
 
+/** Set a graphics mode.  Poke any required values into registers, do an HGSMI
+ * mode set and tell the host we support advanced graphics functions.
+ */
+static void vboxvideo_do_modeset(struct drm_crtc *crtc)
+{
+    struct vboxvideo_crtc   *vboxvideo_crtc = to_vboxvideo_crtc(crtc);
+    struct vboxvideo_device *gdev = crtc->dev->dev_private;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+    int pitch = crtc->fb.pitch;
+#else
+    int pitch = crtc->fb.pitches[0];
+#endif
+
+    if (vboxvideo_crtc->crtc_id == 0)
+        VBoxVideoSetModeRegisters(vboxvideo_crtc->last_width,
+                                  vboxvideo_crtc->last_height,
+                                  pitch,
+                                  crtc->fb.bits_per_pixel, 0,
+                                  vboxvideo_crtc->last_x,
+                                  vboxvideo_crtc->last_y);
+    if (gdev->fHaveHGSMI)
+    {
+        uint16_t fFlags = VBVA_SCREEN_F_ACTIVE;
+        fFlags |= (vboxvideo_crtc->enabled ? 0 : VBVA_SCREEN_F_DISABLED);
+        VBoxHGSMIProcessDisplayInfo(&gdev->Ctx, vboxvideo_crtc->crtc_id,
+                                    vboxvideo_crtc->last_x,
+                                    vboxvideo_crtc->last_y,
+                                        vboxvideo_crtc->last_x
+                                      * crtc->fb.bits_per_pixel
+                                    + vboxvideo_crtc->last_y * pitch,
+                                    pitch,
+                                    vboxvideo_crtc->last_width,
+                                    vboxvideo_crtc->last_height,
+                                    crtc->fb.bits_per_pixel, fFlags);
+    }
+}
+
+
 static void vboxvideo_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
     struct vboxvideo_crtc *vboxvideo_crtc = to_vboxvideo_crtc(crtc);
-    struct drm_device *dev = crtc->dev;
-    struct vboxvideo_device *gdev = dev->dev_private;
 
     if (mode == vboxvideo_crtc->last_dpms) /* Don't do unnecesary mode changes. */
@@ -163 +199 @@
     .mode_fixup = vboxvideo_crtc_mode_fixup,
     .mode_set = vboxvideo_crtc_mode_set,
-    /*
-    .mode_set_base = vboxvideo_crtc_set_base,
-    */
     .prepare = vboxvideo_crtc_prepare,
     .commit = vboxvideo_crtc_commit,
@@ -187 +220 @@
 
     vboxvideo_crtc->crtc_id = index;
+    if (gdev->fHaveHGSMI)
+    {
+        vboxvideo_crtc->offCommandBuffer =   gdev->offViewInfo
+                                           - (index + 1) * VBVA_MIN_BUFFER_SIZE;
+        VBoxVBVASetupBufferContext(&vboxvideo_crtc->VbvaCtx,
+                                   vboxvideo_crtc->offCommandBuffer,
+                                   VBVA_MIN_BUFFER_SIZE);
+    }
     vboxvideo_crtc->last_dpms = VBOXVIDEO_DPMS_CLEARED;
     gdev->mode_info.crtcs[index] = vboxvideo_crtc;

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

@@ -55 +55 @@
     unsigned size;
     int ret;
+    int rc = VINF_SUCCESS;
+    uint32_t offVRAMBaseMapping, offGuestHeapMemory, cbGuestHeapMemory;
+    void *pvGuestHeapMemory;
 
     /* set accessible VRAM */
@@ -71 +74 @@
         _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING,
         &gdev->framebuffer);
+    if (!pVBox->fHaveHGSMI)
+        return 0;
+    VBoxHGSMIGetBaseMappingInfo(gdev->mc.vram_size, &offVRAMBaseMapping,
+                                NULL, &offGuestHeapMemory, &cbGuestHeapMemory,
+                                NULL);
+    pvGuestHeapMemory =   ((uint8_t *)gdev->framebuffer->handle)
+                        + offVRAMBaseMapping + offGuestHeapMemory;
+    rc = VBoxHGSMISetupGuestContext(&gdev->Ctx, pvGuestHeapMemory,
+                                    cbGuestHeapMemory,
+                                    offVRAMBaseMapping + offGuestHeapMemory);
+    if (RT_FAILURE(rc))
+    {
+        gdev->fHaveHGSMI = false;
+        return 0;
+    }
+    gdev->offViewInfo = offVRAMBaseMapping;
     return 0;
 }
@@ -80 +99 @@
     if (gdev->mc.vram_base)
         release_region(gdev->mc.vram_base, gdev->mc.vram_size);
+}
+
+static int vboxvideo_command_buffers_init(struct vboxvideo_device *gdev)
+{
+    unsigned i;
+    gdev->offCommandBuffers =   gdev->offViewInfo
+                              - gdev->num_crtc * VBVA_MIN_BUFFER_SIZE;
+    for (i = 0; i < gdev->num_crtc; ++i)
+    {
+        gdev->offCommandBuffers -= VBVA_MIN_BUFFER_SIZE;
+        VBoxVBVASetupBufferContext(&pVBox->aVbvaCtx[i],
+                                   pVBox->aoffVBVABuffer[i],
+                                   VBVA_MIN_BUFFER_SIZE);
+    }
+    TRACE_LOG("Maximum framebuffer size: %lu (0x%lx)\n",
+              (unsigned long) pVBox->cbFBMax,
+              (unsigned long) pVBox->cbFBMax);
+    rc = VBoxHGSMISendViewInfo(&pVBox->guestCtx, pVBox->cScreens,
+                               vboxFillViewInfo, (void *)pVBox);
+    if (RT_FAILURE(rc))
+    {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to send the view information to the host, rc=%d\n", rc);
+        return FALSE;
+    }
+    return TRUE;
+
 }
 
@@ -98 +143 @@
      *        stuff.
      */
+    gdev->fHaveHGSMI = VBoxHGSMIIsSupported();
     ret = vboxvideo_vram_init(gdev);
     if (ret)
         return ret;
-
+    if (!gdev->fHaveHGSMI)
+        return 0;
+    gdev->num_crtc = VBoxHGSMIGetMonitorCount(&gdev->Ctx);
+    ret = vboxvideo_command_buffers_init(gdev);
+    if (ret)
+    {
+        gdev->fHaveHGSMI = false;
+        return ret;
+    }
     return 0;
 }

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

@@ -68 +68 @@
 #define MB (1024 * 1024)
 
-#define VBOXVIDEOFB_CONN_LIMIT VBOX_VIDEO_MAX_SCREENS
+#define VBOXVIDEOFB_CONN_LIMIT VBOX_VIDEO_MAX_SCREENS°°
 
 /* vboxvideo_crtc.c */

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

@@ -69 +69 @@
     struct drm_crtc   base;
     int               crtc_id;
+    size_t            offCommandBuffer;
+    struct VBVABUFFERCONTEXT VbvaCtx;
     int               last_dpms;
+    int               last_hdisplay;
+    int               last_vdisplay;
+    int               last_x;
+    int               last_y;
     bool              enabled;
 };
@@ -76 +82 @@
 {
     bool                    mode_config_initialized;
-    struct vboxvideo_crtc  *crtcs[1]; /* FIXME: how many CRTCs? */
+    struct vboxvideo_crtc  *crtcs[VBOX_VIDEO_MAX_SCREENS];
     /* pointer to fbdev info structure */
     struct vboxvideo_fbdev *gfbdev;