From 7e3518f04e8deb878bc8760176c608128de022a3 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 8 Jun 2016 00:50:30 -0700
Subject: [PATCH] Revert "Merge pull request #136 from lrusak/modesetting"

This reverts commit fee76beb720901d4ae7f754f0ff8bf611e0ede1a, reversing
changes made to 3d9d79b89aeac76a287d7f903cd2ca40aab57e49.
---
 packages/x11/xserver/xorg-server/config/xorg-modesetting.conf | 4 ----
 packages/x11/xserver/xorg-server/package.mk                   | 3 ++-
 packages/x11/xserver/xorg-server/udev.d/97-xorg.rules         | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 packages/x11/xserver/xorg-server/config/xorg-modesetting.conf

diff --git a/packages/x11/xserver/xorg-server/config/xorg-modesetting.conf b/packages/x11/xserver/xorg-server/config/xorg-modesetting.conf
deleted file mode 100644
index 80cc388dc8..0000000000
--- a/packages/x11/xserver/xorg-server/config/xorg-modesetting.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-Section "Device"
-    Identifier  "Intel Graphics"
-    Driver      "modesetting"
-EndSection
diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk
index 885d367d5b..c7e9e17957 100644
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@@ -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
diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
index e88b79dc01..dac8dc9d46 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -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"