Merge pull request #431 from lrusak/intel

Revert "Merge pull request #136 from lrusak/modesetting"
This commit is contained in:
Christian Hewitt 2016-06-15 11:21:19 +04:00 committed by GitHub
commit c15a3e2131
3 changed files with 3 additions and 6 deletions

View File

@ -1,4 +0,0 @@
Section "Device"
Identifier "Intel Graphics"
Driver "modesetting"
EndSection

View File

@ -165,8 +165,9 @@ post_makeinstall_target() {
mkdir -p $INSTALL/etc/X11
if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then
cp $PROJECT_DIR/$PROJECT/xorg/xorg.conf $INSTALL/etc/X11
elif [ -f $PKG_DIR/config/xorg.conf ]; then
cp $PKG_DIR/config/xorg.conf $INSTALL/etc/X11
fi
cp $PKG_DIR/config/xorg*.conf $INSTALL/etc/X11
if [ ! "$DEVTOOLS" = yes ]; then
rm -rf $INSTALL/usr/bin/cvt

View File

@ -31,7 +31,7 @@ GOTO="end_video"
# check for drivers using the pci substem
LABEL="subsystem_pci"
DRIVER=="i915", ENV{xorg_driver}="modesetting", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@modesetting.service"
DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service"
DRIVER=="amdgpu", ENV{xorg_driver}="amdgpu", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@amdgpu.service"
DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service"
GOTO="end_video"