Skip to content
This repository has been archived by the owner on Jun 6, 2018. It is now read-only.

Commit

Permalink
[graphic drivers] adjust all configs
Browse files Browse the repository at this point in the history
  • Loading branch information
@philmmanjaro
philmmanjaro committed Mar 12, 2017
1 parent 5b4b671 commit 96a81d6
Show file tree
Hide file tree
Showing 42 changed files with 58 additions and 670 deletions.
9 changes: 2 additions & 7 deletions pci/graphic_drivers/catalyst/MHWDCONFIG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME="video-catalyst"
INFO="Closed source catalyst drivers for linux."
VERSION="2016.09.03"
VERSION="2017.03.12"
FREEDRIVER="false"
PRIORITY="5"

Expand All @@ -21,21 +21,17 @@ DEPENDS="catalyst-input catalyst-video catalyst-server catalyst-utils"
DEPENDS_64="lib32-catalyst-utils"
DEPKMOD="catalyst"


XORGFILE="/etc/X11/mhwd.d/catalyst.conf"


post_install()
{
MHWD_HEADING "${XORGFILE}"
MHWD_ADD_BACKSPACE "${XORGFILE}"
aticonfig -o "${XORGFILE}" --initial --nobackup &>/dev/null

mhwd-gpu --setgl catalyst --setxorg "${XORGFILE}"
mhwd-gpu --setmod catalyst --setxorg "${XORGFILE}"
}



post_remove()
{
if [ -e "${XORGFILE}" ]; then
Expand All @@ -44,4 +40,3 @@ post_remove()

mhwd-gpu --check
}

16 changes: 2 additions & 14 deletions pci/graphic_drivers/hybrid-intel-ati-bumblebee/MHWDCONFIG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME="video-hybrid-intel-ati-bumblebee"
INFO="Hybrid bumblebee solution for AMD - Open source ati & intel video driver."
VERSION="2016.01.28"
VERSION="2017.03.12"
FREEDRIVER="true"
PRIORITY="6"

Expand All @@ -20,7 +20,6 @@ BLACKLISTEDDEVICEIDS="0be1 8108"
# Conflicts with other mhwd configs
MHWDCONFLICTS="video-intel video-ati"


# Dependencies
if [[ -d /run/openrc ]];then
DEPENDS="bumblebee-openrc primus xf86-video-ati xf86-video-intel"
Expand All @@ -30,13 +29,10 @@ fi
DEPENDS_64="lib32-primus"
DEPKMOD="bbswitch"


XORGFILE="/etc/X11/mhwd.d/intel.conf"
BXORGFILE="/etc/bumblebee/xorg.conf.ati"
MODULESFILE="/etc/modprobe.d/mhwd-bbswitch.conf"



make_bumblebee_xorg_config()
{
MHWD_HEADING "${BXORGFILE}"
Expand All @@ -56,7 +52,6 @@ make_bumblebee_xorg_config()
echo 'EndSection' >> "${BXORGFILE}"
}


post_install()
{
# Create intel xorg configuration with enabled sna acceleration method
Expand All @@ -79,7 +74,7 @@ post_install()

set_bumblebee_driver "radeon"

mhwd-gpu --setgl mesa --setxorg "${XORGFILE}"
mhwd-gpu --setxorg "${XORGFILE}"

if [[ -d /run/openrc ]];then
rc-update add bumblebee default
Expand All @@ -90,8 +85,6 @@ post_install()
fi
}



pre_remove()
{
modprobe -r bbswitch
Expand All @@ -105,8 +98,6 @@ pre_remove()
fi
}



post_remove()
{
if [ -e "${XORGFILE}" ]; then
Expand All @@ -119,10 +110,7 @@ post_remove()
mhwd-gpu --check
}



set_bumblebee_driver()
{
sed -i "/(#)/!s/^[ ]*Driver[ ]*=.*/Driver=$1/g" /etc/bumblebee/bumblebee.conf
}

15 changes: 2 additions & 13 deletions pci/graphic_drivers/hybrid-intel-nouveau-bumblebee/MHWDCONFIG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME="video-hybrid-intel-nouveau-bumblebee"
INFO="Hybrid bumblebee solution for NVIDIA Optimus Technology - Open source nouveau & intel video driver."
VERSION="2016.01.28"
VERSION="2017.03.12"
FREEDRIVER="true"
PRIORITY="6"

Expand All @@ -20,7 +20,6 @@ BLACKLISTEDDEVICEIDS="0be1 8108"
# Conflicts with other mhwd configs
MHWDCONFLICTS="video-intel video-nouveau video-hybrid-intel-nvidia-bumblebee"


# Dependencies
if [[ -d /run/openrc ]];then
DEPENDS="bumblebee-openrc xf86-video-nouveau xf86-video-intel"
Expand All @@ -30,13 +29,11 @@ fi
DEPENDS_64="lib32-primus"
DEPKMOD="bbswitch"


XORGFILE="/etc/X11/mhwd.d/intel.conf"
BXORGFILE="/etc/bumblebee/xorg.conf.nouveau"
MODULESFILE="/etc/modprobe.d/mhwd-bbswitch.conf"
MODULESBLACKLIST="/etc/modprobe.d/mhwd-nouveau.conf"


make_bumblebee_xorg_config()
{
MHWD_HEADING "${BXORGFILE}"
Expand All @@ -56,7 +53,6 @@ make_bumblebee_xorg_config()
echo 'EndSection' >> "${BXORGFILE}"
}


post_install()
{
# Create intel xorg configuration with enabled sna acceleration method
Expand Down Expand Up @@ -87,7 +83,7 @@ post_install()

set_bumblebee_driver "nouveau"

mhwd-gpu --setgl mesa --setxorg "${XORGFILE}"
mhwd-gpu --setxorg "${XORGFILE}"

if [[ -d /run/openrc ]];then
rc-update add bumblebee default
Expand All @@ -98,8 +94,6 @@ post_install()
fi
}



pre_remove()
{
modprobe -r bbswitch
Expand All @@ -113,8 +107,6 @@ pre_remove()
fi
}



post_remove()
{
if [ -e "${XORGFILE}" ]; then
Expand All @@ -127,10 +119,7 @@ post_remove()
mhwd-gpu --check
}



set_bumblebee_driver()
{
sed -i "/(#)/!s/^[ ]*Driver[ ]*=.*/Driver=$1/g" /etc/bumblebee/bumblebee.conf
}

18 changes: 2 additions & 16 deletions pci/graphic_drivers/hybrid-intel-nvidia-340xx-bumblebee/MHWDCONFIG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME="video-hybrid-intel-nvidia-340xx-bumblebee"
INFO="Hybrid bumblebee solution for NVIDIA Optimus Technology - Closed source NVIDIA legacy driver & open source intel driver."
VERSION="2016.02.05"
VERSION="2017.03.12"
FREEDRIVER="false"
PRIORITY="7"

Expand All @@ -20,7 +20,6 @@ BLACKLISTEDDEVICEIDS="0be1 8108"
# Conflicts with other mhwd configs
MHWDCONFLICTS="video-intel video-nvidia video-nvidia-304xx video-nvidia-340xx video-hybrid-intel-nvidia-bumblebee video-hybrid-intel-nouveau-bumblebee"


# Dependencies
if [[ -d /run/openrc ]];then
DEPENDS="bumblebee-openrc nvidia-340xx-utils xf86-video-intel"
Expand All @@ -30,14 +29,11 @@ fi
DEPENDS_64="lib32-primus lib32-nvidia-340xx-utils"
DEPKMOD="nvidia-340xx bbswitch"


XORGFILE="/etc/X11/mhwd.d/intel.conf"
BXORGFILE="/etc/bumblebee/xorg.conf.nvidia"
MODULESFILE="/etc/modprobe.d/mhwd-bbswitch.conf"
MODULESBLACKLIST="/etc/modprobe.d/mhwd-nvidia.conf"



make_bumblebee_xorg_config()
{
MHWD_HEADING "${BXORGFILE}"
Expand All @@ -51,7 +47,6 @@ make_bumblebee_xorg_config()
MHWD_ADD_DEVICE_SECTION_FOR_EACH_BUSID "nvidia" "${BXORGFILE}" 10de "VendorName \"NVIDIA Corporation\"|Option \"NoLogo\" \"true\"|Option \"UseEDID\" \"false\"|Option \"ConnectedMonitor\" \"DFP\""
}


post_install()
{
# Create intel xorg configuration with enabled sna acceleration method
Expand All @@ -67,7 +62,6 @@ post_install()
MHWD_HEADING "${MODULESFILE}"
echo "options bbswitch load_state=0 unload_state=0" >> "${MODULESFILE}"


MHWD_HEADING "${MODULESBLACKLIST}"
echo "blacklist nouveau" >> "${MODULESBLACKLIST}"
echo "blacklist nvidia" >> "${MODULESBLACKLIST}"
Expand All @@ -88,12 +82,11 @@ post_install()
rmmod -f drm
fi


modprobe bbswitch

set_bumblebee_driver "nvidia"

mhwd-gpu --setgl mesa --setxorg "${XORGFILE}"
mhwd-gpu --setxorg "${XORGFILE}"

if [[ -d /run/openrc ]];then
rc-update add bumblebee default
Expand All @@ -104,8 +97,6 @@ post_install()
fi
}



pre_remove()
{
modprobe -r bbswitch
Expand All @@ -119,8 +110,6 @@ pre_remove()
fi
}



post_remove()
{
if [ -e "${XORGFILE}" ]; then
Expand All @@ -136,10 +125,7 @@ post_remove()
mhwd-gpu --check
}



set_bumblebee_driver()
{
sed -i "/(#)/!s/^[ ]*Driver[ ]*=.*/Driver=$1/g" /etc/bumblebee/bumblebee.conf
}

17 changes: 2 additions & 15 deletions pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

NAME="video-hybrid-intel-nvidia-bumblebee"
INFO="Hybrid bumblebee solution for NVIDIA Optimus Technology - Closed source NVIDIA driver & open source intel driver."
VERSION="2016.02.05"
VERSION="2017.03.12"
FREEDRIVER="false"
PRIORITY="8"

Expand All @@ -20,7 +20,6 @@ BLACKLISTEDDEVICEIDS="0be1 8108"
# Conflicts with other mhwd configs
MHWDCONFLICTS="video-intel video-nvidia video-nvidia-304xx video-nvidia-340xx video-hybrid-intel-nvidia-340xx-bumblebee video-hybrid-intel-nouveau-bumblebee"


# Dependencies
if [[ -d /run/openrc ]];then
DEPENDS="bumblebee-openrc nvidia-utils xf86-video-intel"
Expand All @@ -30,14 +29,11 @@ fi
DEPENDS_64="lib32-primus lib32-nvidia-utils"
DEPKMOD="nvidia bbswitch"


XORGFILE="/etc/X11/mhwd.d/intel.conf"
BXORGFILE="/etc/bumblebee/xorg.conf.nvidia"
MODULESFILE="/etc/modprobe.d/mhwd-bbswitch.conf"
MODULESBLACKLIST="/etc/modprobe.d/mhwd-nvidia.conf"



make_bumblebee_xorg_config()
{
MHWD_HEADING "${BXORGFILE}"
Expand All @@ -51,7 +47,6 @@ make_bumblebee_xorg_config()
MHWD_ADD_DEVICE_SECTION_FOR_EACH_BUSID "nvidia" "${BXORGFILE}" 10de "VendorName \"NVIDIA Corporation\"|Option \"NoLogo\" \"true\"|Option \"UseEDID\" \"false\"|Option \"ConnectedMonitor\" \"DFP\""
}


post_install()
{
# Create intel xorg configuration with enabled sna acceleration method
Expand Down Expand Up @@ -88,12 +83,11 @@ post_install()
rmmod -f drm
fi


modprobe bbswitch

set_bumblebee_driver "nvidia"

mhwd-gpu --setgl mesa --setxorg "${XORGFILE}"
mhwd-gpu --setxorg "${XORGFILE}"

if [[ -d /run/openrc ]];then
rc-update add bumblebee default
Expand All @@ -104,8 +98,6 @@ post_install()
fi
}



pre_remove()
{
modprobe -r bbswitch
Expand All @@ -119,8 +111,6 @@ pre_remove()
fi
}



post_remove()
{
if [ -e "${XORGFILE}" ]; then
Expand All @@ -136,10 +126,7 @@ post_remove()
mhwd-gpu --check
}



set_bumblebee_driver()
{
sed -i "/(#)/!s/^[ ]*Driver[ ]*=.*/Driver=$1/g" /etc/bumblebee/bumblebee.conf
}

Loading

0 comments on commit 96a81d6

Please sign in to comment.