From 0cf9af563bcaf4220d7854f89b1fe9e1216cf8c0 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Wed, 12 Aug 2020 13:28:55 +0200
Subject: [PATCH] radeonsi: use radeonsi_clamp_div_by_zero for SPECviewperf13,
 Road Redemption
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes SPECviewperf 13 creo rendering.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2639
Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6259>
(cherry picked from commit a1c2bd6ce8981b34c0cf9333699b0ce75be6cb55)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1dbaef70e33..0573caa8830 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3244,7 +3244,7 @@
         "description": "radeonsi: use radeonsi_clamp_div_by_zero for SPECviewperf13, Road Redemption",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 5cd65ccf18d..b3358104e89 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -667,6 +667,10 @@ TODO: document the other workarounds.
         </application>
         <application name="SPECviewperf13" executable="viewperf">
             <option name="radeonsi_sync_compile" value="true" />
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+        </application>
+        <application name="Road Redemption" executable="RoadRedemption.x86_64">
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
         </application>
     </device>
     <device driver="virtio_gpu">