xrandr, grub sections and others fixes v0.9.11

Author: wildtruc

CHANGELOG.md

@@ -1,11 +1,25 @@
 ### Change Log
-*( 22/04/13 ) v0.9.10*
+*( 2018/04/24 ) v0.9.11*
+ - Add a options config file editable by nvidia-prime-ui because some users seems to have big trouble with grub config. Options file default sample is send with comment.
+ - options are :
+  - delay: allow to add a user's session delay before launching xrandr command (default 5).
+  - intel_nodelay: start intel user's session without the configured delay (intel usually doesn't need it).
+  - cfg_grub: enable/disable check and config (default 1).
+  - cfg_modeset: enable/disable modeset config (if cfg_grub is set to 1) (default 1).
+  - nv_modeset: set nvidia modeset (grub section) to set (1) or unset (0) (default 1).
+  - font_style: nvidia-prime-ui brighness (dark/bright background.) (default 0)
+ - Rewrote grub config section to be more intuitive. It separatly add modeset and 'nouveau' blacklist. Modeset could be change to 0 or 1 thruough options config file (default is 1).
+ - Review xrandr auto config section to add offline displays at session manager start when nvidia option is set.
+ - Add a report.sample in markdown to fill in issue reports.
+ 
+ 
+*( 2018/04/22 ) v0.9.10*
  - Nvidia-prime-select was untested on multi display. It appeared that actual xrandr detection and sets failed, also display.prime was needed more delay before lauching because of xramdr monitors.xml file sets conflict.
  - Above is fixed (hopefully), there's still a strange wallpaper behaviour diplayed in double on my laptop desktop. Please, report if you have the same issue.
  - Just realize, I forgot to update /etc/modprobe.d to blacklist nouveau driver. Fixed (thanks to Tim).
- - Note: laptop is not my default machine, and I can't figure out all possible issues by my self, or wait, like it actually the case, my PC's mother board to die to disover them.
+ - Note: laptop is not my default machine, and I can't figure out all possible issues by my self, or wait, like it actually the case, my PC's mother board to die to discover them.
 
-*( 18/04/13 ) v0.9.9*
+*( 2018/04/13 ) v0.9.9*
  - Importante change done. Look's more like a complete rewrite.
  - NEW USER: nothing special, just type as superuser or admin : (sudo) make install.
  - OLD USER:

Makefile

@@ -13,6 +13,8 @@ install:
 	install -Dm644 -t $(INSTALL_DIR)/ xorg.nvidia.conf
 	install -Dm644 -t $(INSTALL_DIR)/ xorg.intel.conf
 	install -Dm644 -t $(INSTALL_DIR)/ library.conf
+	install -Dm644 -t $(INSTALL_DIR)/ options.conf
+	install -Dm644 -t $(INSTALL_DIR)/ report.sample
 	install -Dm644 -t $(INSTALL_DIR)/ nvidia-prime.desktop
 	install -Dm644 -t $(INSTALL_DIR)/ nvidia-session.desktop
 	install -Dm644 -t /usr/share/pixmaps/ nvidia-prime.png
@@ -27,6 +29,8 @@ update:
 	install -C -Dm755 -t /usr/sbin/ nvidia-prime-select
 	install -C -Dm644 -t $(INSTALL_DIR)/ xorg.nvidia.conf
 	install -C -Dm644 -t $(INSTALL_DIR)/ xorg.intel.conf
+	install -Dm644 -t $(INSTALL_DIR)/ options.conf
+	install -Dm644 -t $(INSTALL_DIR)/ report.sample
 	install -C -Dm644 -t $(INSTALL_DIR)/ nvidia-prime.desktop
 	install -C -Dm644 -t $(INSTALL_DIR)/ nvidia-session.desktop
 	install -Dm644 -t /usr/share/pixmaps/ nvidia-prime.png
@@ -36,21 +40,10 @@ update:
 	sh ./changelog.sh
 
 uninstall:
-	# new
-#	rm -rf $(INSTALL_DIR)
-#	rm -f /usr/sbin/nvidia-prime-select
-#	rm -f /usr/bin/nvidia-prime-ui
-#	rm -f /usr/share/pixmaps/nvidia-prime.png
-#	rm -f /usr/share/applications/nvidia-prime-ui.desktop
-#	rm -f /usr/share/polkit-1/actions/com.github.pkexec.nvidia-prime-*
-#	rm -f /etc/X11/xorg.conf
-	# old (will be remove in next upload)
-	systemctl disable nvidia-prime.service
 	rm -rf $(INSTALL_DIR)
 	rm -f /usr/sbin/nvidia-prime-select
 	rm -f /usr/bin/nvidia-prime-ui
 	rm -f /usr/share/pixmaps/nvidia-prime.png
 	rm -f /usr/share/applications/nvidia-prime-ui.desktop
-	rm -f /usr/lib/systemd/system/nvidia-prime.service
 	rm -f /usr/share/polkit-1/actions/com.github.pkexec.nvidia-prime-*
-	rm -f /etc/X11/xinit/xinitrc.d/nvidia
+#	rm -f /etc/X11/xorg.conf

README.md

@@ -37,6 +37,9 @@ Big mistake in repos upload :s. Forgot to send library.conf with last upgrade. M
 ### 2018-04-22
 Multi display issue, see **CHANGELOG.md**.
 
+### 2018-04-24
+Added options config file, report.sample and some fixes to grub and xrandr sections. See **CHANGELOG.md**.
+
 --------------
 
 # Usage

nvidia-prime-select

@@ -38,36 +38,55 @@ nv_drv_32='/usr/lib/nvidia'
 nv_drv_64='/usr/lib64/nvidia'
 nv_xorg_path='/usr/lib64/nvidia/xorg'
 ## check any custom dirs for nvidia librairies linking
-if [ -s $install_dir/library.conf ]; then
+if [[ -s $install_dir/library.conf ]]; then
 	## TODO Here special distro library config could take place.
 	## test library conf content before loading.
 	if [ $(cat $install_dir/library.conf| sed -En "s/^(.*)='(.*)'$/\2/g;p"| grep -c .) -gt 0 ]; then
 		. $install_dir/library.conf
 	fi
 fi
-## FIXME
+## default options (have to be manual set/reset in options.conf of by nvidia-prime-ui)
+delay=5
+intel_nodelay=1
+cfg_grub=1
+cfg_modeset=1
+nv_modeset=0
+
+if [[ -s $install_dir/options.conf ]]; then
+	. $install_dir/options.conf
+fi
+current_display=$(xrandr --current| grep "connected"| grep "[0-9]\{3,4\}[x]"| sed -n "s/\ (.*$//p")
+connected_display=( "$(xrandr --current| grep -w "connected"| sed -En "s|^(.*)\ (\(.*)$|\1|p")" )
+
+## FIXME ?
 ## grub section have to be filtered in case of distros specifics.
 grub_config(){
-	## look at /proc/version to detect distro variant.
-	boot_key='/boot/vmlinuz-'$(uname -r)
-	if [ $(cat /boot/grub2/grub.cfg| egrep -c "^.*$boot_key.*nvidia-drm.modeset=1.*$") -eq 0 ]; then
-		if [ $(cat /boot/grub2/grub.cfg| egrep -c "^.*$boot_key.*blacklist=nouveau.*$") -eq 0 ]; then
-			blacklist=' nouveau.modeset=0 rd.driver.blacklist=nouveau'
-		fi
-		modset='nvidia-drm.modeset=1'$blacklist
-		## add nouveau blacklist to modeproe.d conigs list.
-		if ! [[ -s /etc/modprobe.d/blacklist-nouveau.conf ]]; then
-			echo "blacklist nouveau" > /etc/modprobe.d/blacklist-nouveau.conf
+	if [ $cfg_grub -gt 0 ]; then
+		## look at /proc/version to detect distro variant.
+		boot_key='/boot/vmlinuz-'$(uname -r)
+		modeset_check=$(cat /boot/grub2/grub.cfg| egrep -c "^.*$boot_key.*nvidia-drm.modeset=.*$")
+		if [ $(cat /boot/grub2/grub.cfg| egrep -c "^.*$boot_key.*nvidia-drm.modeset=$nv_modeset.*$") -eq 0 ]; then
+			if [ $(cat /boot/grub2/grub.cfg| egrep -c "^.*$boot_key.*blacklist=nouveau.*$") -eq 0 ]; then
+				blacklist=' nouveau.modeset=0 rd.driver.blacklist=nouveau'
+			fi
+			if [ $cfg_modeset -gt 0 ]; then					
+				modset='nvidia-drm.modeset='$nv_modeset$blacklist
+			else
+				modset=$blacklist
+			fi
+			## add nouveau blacklist to modeproe.d configs list.
+			if ! [[ -s /etc/modprobe.d/blacklist-nouveau.conf ]]; then
+				echo "blacklist nouveau" > /etc/modprobe.d/blacklist-nouveau.conf
+			fi
+			if [ $modeset_check -gt 0 ]; then
+				sed -Eni -e "s|(linux.*$boot_key.*ro) (nvidia-drm.modeset=[0-9])(.*)$|\1 $modset\3|g;p" /boot/grub2/grub.cfg
+			else
+				sed -Eni -e "s|(linux.*$boot_key.*ro)(.*)$|\1 $modset \2|g;p" /boot/grub2/grub.cfg
+			fi
+			reboot_text='Grub has been modified for Nvidia Prime modesetting.\nPLease reboot the system for changes to take effect.'
 		fi
-		sed -Eni -e "s|(linux.*$boot_key.*ro)(.*)$|\1 $modset \2|g;p" /boot/grub2/grub.cfg
-		reboot_text='Grub has been modified for Nvidia Prime modesetting.\nPLease reboot the system for changes to take effect.'
 	fi
 }
-## First of all, configure grub for modesetting and blacklist all nouveau drivers.
-grub_config
-current_display=$(xrandr --current| grep "connected"| grep "[0-9]\{3,4\}[x]"| sed -n "s/\ (.*$//p")
-connected_display=( "$(xrandr --current| grep -w "connected"| sed -En "s|^(.*)\ (\(.*)$|\1|p")" )
-
 bus_id_query(){
 	## detect and config pci ids.
 	bus_vga_list=$(lspci | grep VGA| awk '{print $1" "$5}'| sed -En "s|^.([0-9])\:.([0-9])\.([0-9])\ (.*)$|bus_\L\4=\1:\2:\3|p")
@@ -88,23 +107,10 @@ clean_files() {
 		fi
 	done
 }
-
 xrandr_outputs(){
 	## xrandr have to be set as user wishes to give to script proper xrandr sets.
 	## This is mandatory.
 #	conf=nvidia
-	unset scrn
-	unset def 
-	if [[ $conf == nvidia ]]; then
-		xrandr_source='NVIDIA-0'
-		xrandr_sink='modesetting'
-	fi
-	if [[ $conf == nvidia ]]; then
-		xrandr_init="xrandr --setprovideroutputsource $xrandr_sink $xrandr_source --auto --output VGA-0 --off"
-	else
-		xrandr_init=''
-	fi
-	echo -e "#! /bin/bash\n\n#sleep 5\n$xrandr_init" > $install_dir/xinitrc.prime
 	ifs=$IFS
 	IFS=$(echo -en "\n\b")
 	for _dsp in ${connected_display[@]}; do
@@ -144,17 +150,29 @@ xrandr_outputs(){
 		else
 			disable_output=' --output '$connected_output' --off'
 			_outputs+=($disable_output)
+			_disabled+=($disable_output)
 		fi
 	done
 	if [[ $conf == nvidia ]]; then
 		if [ $(echo -e "${_outputs[*]}"| grep -c "VGA") -eq 0 ]; then
 			disable_output='--output VGA-0 --off'
 			_outputs+=($disable_output)
+			_disabled+=($disable_output)
 		fi
 	fi
 	IFS=$ifs
 	xrandr_config="xrandr${_outputs[*]}"
-	
+	if [[ $conf == nvidia ]]; then
+		xrandr_source='NVIDIA-0'
+		xrandr_sink='modesetting'
+	fi
+	if [[ $conf == nvidia ]]; then
+#		xrandr_init="xrandr --setprovideroutputsource $xrandr_sink $xrandr_source --auto --output VGA-0 --off"
+		xrandr_init="xrandr --setprovideroutputsource $xrandr_sink $xrandr_source --auto ${_disabled[*]}"
+	else
+		xrandr_init=''
+	fi
+	echo -e "#! /bin/bash\n\n#sleep $delay\n$xrandr_init" > $install_dir/xinitrc.prime
 	echo -e "#! /bin/bash\n\nsleep $delay\n$xrandr_config\n" > $install_dir/display.prime
 	if [ $(stat -c %a $install_dir/display.prime) -ne 755 ]; then
 		chmod 755 $install_dir/display.prime
@@ -163,7 +181,6 @@ xrandr_outputs(){
 		chmod 755 $install_dir/xinitrc.prime
 	fi
 }
-
 session_manager(){
 	home=/home/$(ls -l "$(pwd)"| cut -d' ' -f3 | sed -n "2p")	
 	## configure each session manager if deteed: gdm kdm sddm lightdm
@@ -278,7 +295,7 @@ display_config(){
 }
 go_for_nvidia(){
 	clean_files
-	delay=5
+#	delay=5
 	ctrl_key=nvidia
 	display_config
 	abi_crtl
@@ -290,7 +307,7 @@ go_for_nvidia(){
 }
 go_for_intel(){
 	clean_files
-	delay=5
+	if [ $intel_nodelay -eq 1 ]; then delay=0; else delay=5; fi
 	ctrl_key=intel
 	display_config
 }
@@ -301,6 +318,8 @@ go_default(){
 		printf '/usr/lib' > $nvidia32_lib_file
 	fi
 }
+## configure grub for modesetting and blacklist all nouveau drivers.
+grub_config
 bus_id_query
 current=$(file -p /etc/X11/xorg.conf| sed -En "s|^.*xorg.(.*).conf$|\1|p")
 if [[ -s /var/log/Xorg.0.log ]]; then
@@ -310,7 +329,7 @@ case $1 in
 	default ) go_default ;;
 	nvidia ) go_for_nvidia ;;
 	intel ) go_for_intel ;;
-	test) xrandr_outputs; exit 0;;
+#	test) xrandr_outputs; exit 0;;
 	*|help )
 		printf "Usage:\t$(basename $0 ) intel|nvidia|default\n\n"
 		printf "\tintel\t\tSwitch to Intel GPU.\n"

nvidia-prime-ui

@@ -22,11 +22,21 @@
 ## TODO
 # indiquer la précédence de monitor.xml généré par l'ui de xrandr.
 
-
-# color setup TODO < color.conf
+vn='<span weight=\"normal\">'
+vb='<span weight=\"bold\">'
+if [[ -s /etc/nvidia-prime/options.conf ]]; then
+	. /etc/nvidia-prime/options.conf
+	if [ $font_style -gt 0 ]; then
+	## clear background
+		vn='<span color=\"#00A400\" weight=\"normal\">'
+		vb='<span color=\"#00A400\" weight=\"bold\">'
+	else
+	## dark background
+		vn='<span color=\"#005400\" weight=\"normal\">'
+		vb='<span color=\"#005400\" weight=\"bold\">'
+	fi
+fi
 end='</span>'
-vn='<span color=\"#005400\" weight=\"normal\">'
-vb='<span color=\"#005400\" weight=\"bold\">'
 j='<span color=\"#FF6800\">'
 rBB='<span color=\"#FF3300\" font=\"20\">'
 ## prime_setup
@@ -37,6 +47,7 @@ menu_prime_01="Set Prime to Intel device"
 menu_prime_02="Set Prime to Nvidia device"
 menu_prime_03="Edit Libraries config file"
 menu_prime_04="Edit current Xorg config file"
+menu_prime_05="Edit options config file"
 # ref
 m_prime_01="intel"
 m_prime_02="nvidia"
@@ -46,7 +57,20 @@ wrn_prime_02="\nYou may now restart the user session to take effect."
 # nvidia-prime-select path and files
 xorg_path=/etc/nvidia-prime
 lib_conf=/etc/nvidia-prime/library.conf
+opt_conf=/etc/nvidia-prime/options.conf
 ## su cmd is currently manages by polkit
+## setup color, grub, user's xrandr options.
+edit_options(){
+	edit_options_conf=$(zenity --width=500 --height=400 --title="options conf editor" --icon-name=nvidia-prime \
+	--text-info --editable --filename="$opt_conf" --checkbox="Confirm to overwrite" \
+	--text="$vb\\Edit nvidia-prime-select and GUI options.$end")
+	if [ $? = 0 ]; then
+		pkexec sh -c "echo -e \"$edit_options_conf\" > $opt_conf"
+		notify-send -t 5000 -u low  "Options data saved."
+	fi
+	bash -c nvidia-prime-ui
+	exit 0
+}
 edit_conf(){
 	edit_lib_conf=$(zenity --width=500 --height=400 --title="libraries conf editor" --icon-name=nvidia-prime \
 	--text-info --editable --filename="$lib_conf" --checkbox="Confirm to overwrite" \
@@ -75,15 +99,20 @@ edit_xorg(){
 }
 setup_prime(){
 	if [[ -s $HOME/.config/monitors.xml ]]; then
-		prev_conf="\n\nNotice$vn: Display looks already configured by$j xrandr$end session tool UI.\nUI settings take precedence over$j nvidia-prime-select$end auto set.$end"
+		prev_conf="\n\nNotice$vn: Display looks already configured by$j xrandr$end session tool UI.\nUI settings take precedence over$j nvidia-prime-select$end auto set.\nBe aware it could create conflicts at session restart (blank screen).$end"
 	fi
 	xrandr_msg="$vb\n\nCheck your display settings before restart.$end"
 	zenity --height=100 --title="nvidia-prime-select setup" --question --no-wrap \
 	--icon-name=nvidia-prime --text="$vb$(printf "$wrn_prime_01$wrn_prime_02" "$_prime")$prev_conf$xrandr_msg$end" \
 	--cancel-label='Cancel' --ok-label='Setup'
-	if [ $? = 1 ]; then $0; fi
-	pkexec /usr/sbin/nvidia-prime-select $_pset
-	notif_msg=$(printf "Session will restart with %s hardware.\nPlease restart your session." "$_pset")
+	if [ $? = 0 ]; then
+		pkexec /usr/sbin/nvidia-prime-select $_pset
+		notif_msg=$(printf "Session will restart with %s hardware.\nPlease restart your session." "$_pset")
+	else
+		bash -c nvidia-prime-ui
+		exit 0
+	fi
+	
 }
 #root_id
 unset setup_list setup_option _pset
@@ -92,6 +121,7 @@ setup_option=(
 "$menu_prime_02;$m_prime_02;/etc/X11/xorg.conf"
 "$menu_prime_03;;"
 "$menu_prime_04;;"
+"$menu_prime_05;;"
 )
 n=1
 for p_set in "${setup_option[@]}"; do
@@ -111,8 +141,8 @@ else
 	prime_msg="$prime_msg_01\nNo device is currently set."
 fi
 
-menu_prime=$(zenity --width=340  --list --radiolist --hide-header \
---title="Zenvidia prime setup" --text "$vb$prime_msg$end" \
+menu_prime=$(zenity --width=340 --list --radiolist --hide-header \
+--title="nvidia-prime-select" --text "$vb$prime_msg$end" \
 --column "1" --column "2" --column "3" --separator=";" --hide-column=2 \
 "${setup_list[@]}" --ok-label='Select' --cancel-label='Exit')
 if [ $? = 1 ]; then exit 0; fi
@@ -121,7 +151,10 @@ case $menu_prime in
 	"2") _pset="nvidia"; _prime="$m_prime_02" ;;
 	"3") edit_conf ;;
 	"4") edit_xorg ;;
+	"5") edit_options ;;
 esac
 setup_prime
-notify-send -t 5000 -u low --icon=nvidia-prime "Nvidia-prime setup applied." "$notif_msg."
+if [[ $notif_msg != '' ]]; then
+	notify-send -t 5000 -u low --icon=nvidia-prime "Nvidia-prime setup applied." "$notif_msg."
+fi
 exit 0

nvidia-prime-ui.desktop

@@ -5,5 +5,5 @@ Name=nvidia-prime
 Comment=NVIDIA Prime switcher
 Exec=nvidia-prime-ui
 Icon=nvidia-prime.png
-Categories=Application;Settings;
+Categories=Application;System;Settings;
 

options.conf

@@ -0,0 +1,13 @@
+## give some delay at user's session start from 0 to ?.
+## (could solve conflict with session monitors.xml file).
+delay=5
+## avoid delaying for intel session display (delay>0, no delay>1).
+intel_nodelay=1
+## allow/disallow grub check and config. check>1, don't check>0.
+cfg_grub=1
+## allow/disallow modeset config in grub. config>1, not config>0.
+cfg_modeset=1
+## nvidia modeset variable. Define and set>1, define and not set>0.
+nv_modeset=1
+## set nvidia-prime-ui's display fonts style. Clear>1, Dark>0.
+font_style=1

report.sample

@@ -0,0 +1,20 @@
+### Main:
+**distro**: `cat /proc/version`. Help to get distro name and get a tip for possible per distro auto conf.
+
+**session-manager**:
+
+**grub.cfg**: default menuentry 'linux/linux16' whole line. As su or sudo -S prompt, `cat /boot/grub2/grub.cfg| grep "linux.*$(uname -r)"`.
+
+**xrandr providers**: `xrandr --listproviders`, respectively under intel, then nvidia device (if can be started).
+ - intel:
+ - nvidia:
+
+**xrandr displays**: `xrandr --query`
+ - intel:
+ - nvidia:
+
+### Optional:
+**xorg log**: `cat /var/log/Xorg.0.log`
+
+**lsmod**: to get intel, nvidia, bbswitch (if any) loaded modules. `lsmod | grep "nvidia\|bbswitch\|intel"`
+