Changeset d0b124c


Ignore:
Timestamp:
01/09/14 06:51:41 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
4f9718b
Parents:
da1c3b0
Message:

Fix the issues with vboxvideo on 10.x.

By disabling AIGLX specifically, the vboxvideo driver works again. I have added
checks to our Xorg startup routine, which will probe if running in VirtualBox? and copy
the necessary xorg.conf file to /etc/X11/xorg.conf

Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • overlays/install-overlay/root/cardDetect/XF86Config.virtualbox

    r1620346 rd0b124c  
     1# Xorg.conf file generated for PC-BSD 
     2 
     3Section "ServerLayout" 
     4    Identifier     "XFree86 Configured" 
     5    Screen      0  "Screen0" 0 0 
     6    InputDevice    "Mouse0" "CorePointer" 
     7    InputDevice    "Keyboard0" "CoreKeyboard" 
     8    Option         "Clone" "off" 
     9    Option         "AIGLX" "false" 
     10EndSection 
     11 
     12Section "Module" 
     13    Load           "ddc" 
     14    Load           "dbe" 
     15    Load           "dri" 
     16    Load           "dri2" 
     17    Load           "extmod" 
     18    Load           "glx" 
     19EndSection 
     20 
     21Section "InputDevice" 
     22    Identifier     "Keyboard0" 
     23    Driver         "keyboard" 
     24    Option         "XkbModel" "pc105" 
     25    Option         "XkbLayout" "us" 
     26    Option         "XkbVariant" "" 
     27EndSection 
     28 
     29Section "InputDevice" 
     30    Identifier     "Mouse0" 
     31    Driver         "vboxmouse" 
     32EndSection 
     33 
    134Section "Monitor" 
    2         Identifier      "Monitor0" 
    3         HorizSync       30 - 60 
    4         VertRefresh     50.0 - 100.0 
    5         Option          "DPMS" 
     35    Identifier     "Monitor0" 
     36    VendorName     "Generic Monitor" 
     37    ModelName      "Generic" 
     38 
     39EndSection 
     40 
     41Section "Screen" 
     42        Identifier "Screen0" 
     43        Device     "Card0" 
     44        Monitor    "Monitor0" 
    645EndSection 
    746 
    847Section "Device" 
    948        Identifier      "Card0" 
    10         Driver          "vesa" 
     49        Driver          "vboxvideo" 
     50        VendorName "InnoTek Systemberatung GmbG" 
     51        BoardName "VirtualBox Graphics Adapter" 
     52        BusID "PCI:0:2:0" 
    1153EndSection 
  • overlays/install-overlay/root/functions.sh

    r341f22e rd0b124c  
    7676start_xorg() 
    7777{ 
     78  # First check if we are running as a VirtualBox guest 
     79  pciconf -lv | grep -q "VirtualBox" 
     80  if [ $? -eq 0 ] ; then cp /root/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi 
     81 
    7882  # Run X Now 
    7983  startx 
  • src-qt4/pc-xgui/resources/bin/rundetect.sh

    r341f22e rd0b124c  
    148148 
    149149  if [ "${ATTEMPT}" = "0" ] ; then 
     150 
     151    # First check if we are running as a VirtualBox guest 
     152    pciconf -lv | grep -q "VirtualBox" 
     153    if [ $? -eq 0 ] ; then cp ${PROGDIR}/cardDetect/xorg.conf.virtualbox /etc/X11/xorg.conf; fi 
     154 
    150155    # Check if we are supposed to run in vesa mode 
    151156    xvesa="NO" 
  • src-qt4/port-files/pkg-plist

    rd9c3c05 rd0b124c  
    411411share/pcbsd/xorg-gui/cardDetect/XF86Config.intel 
    412412share/pcbsd/xorg-gui/cardDetect/XF86Config.vmware 
     413share/pcbsd/xorg-gui/cardDetect/xorg.conf.virtualbox 
    413414share/pcbsd/xorg-gui/conf/xorg.conf.basic 
    414415share/pcbsd/xorg-gui/conf/.fluxbox/init 
Note: See TracChangeset for help on using the changeset viewer.