[xorg-x11-drv-nvidia] Fix error in nvidia.conf rfbz#4388
commit 3f492e57477d853e143480eb953f84a677a5e357
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 14:09:18 2016 +0000
Fix error in nvidia.conf rfbz#4388
nvidia.conf | 10 +++++++++-
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/nvidia.conf b/nvidia.conf
index 9315780..79a73d4 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -7,5 +7,13 @@ Section "OutputClass"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
Option "PrimaryGPU" "yes"
- ModulePath "@LIBDIR@/xorg/modules"
+ ModulePath "@LIBDIR@/nvidia/xorg"
+EndSection
+
+Section "OutputClass"
+ Identifier "intel"
+ MatchDriver "i915"
+ Driver "modesetting"
+ # Disable glamor as it causes crashes when combined with the nvidia driver's
libEGL.so
+ Option "AccelMethod" "none"
EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 0557b7c..b628594 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -569,6 +569,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Sat Dec 24 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-6
+- Fix error in nvidia.conf rfbz#4388
+
* Sat Dec 24 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-5
- Add xorg-x11-server-Xorg minimum version requires