Merge #336478 from ~sylvain-pineau/plainbox-provider-checkbox:fix-1717204snap-2018-01-25T1256

1 files changed, 5 insertions, 3 deletions

diff --git a/bin/graphics_env b/bin/graphics_env
index 8c82567..9511560 100755
--- a/bin/graphics_env
+++ b/bin/graphics_env
@@ -19,9 +19,11 @@ if [[ $DRIVER == "amdgpu" || $DRIVER == "radeon" ]]; then
 if [ $INDEX -gt 1 ]; then
 # See https://wiki.archlinux.org/index.php/PRIME
 echo "Setting up PRIME GPU offloading for AMD discrete GPU"
- PROVIDER_ID=`xrandr --listproviders | grep "Sink Output" | awk {'print $4'} | tail -1`
- SINK_ID=`xrandr --listproviders | grep "Source Output" | awk {'print $4'} | tail -1`
- xrandr --setprovideroffloadsink ${PROVIDER_ID} ${SINK_ID}
+ if ! grep -q DRI3 /var/log/Xorg.0.log; then
+ PROVIDER_ID=`xrandr --listproviders | grep "Sink Output" | awk {'print $4'} | tail -1`
+ SINK_ID=`xrandr --listproviders | grep "Source Output" | awk {'print $4'} | tail -1`
+ xrandr --setprovideroffloadsink ${PROVIDER_ID} ${SINK_ID}
+ fi
 export DRI_PRIME=1
 else
 export DRI_PRIME=