From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 9 Dec 2021 22:16:40 +0000 (+0000)
Subject: Take further steps to disable neon in qcms.
X-Git-Tag: archive/raspbian/91.4.0esr-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ac36618eb2aea571260fadaa4416a132654fe1f1;p=firefox-esr.git

Take further steps to disable neon in qcms.
---

diff --git a/debian/patches/disable-neon-in-qcms.patch b/debian/patches/disable-neon-in-qcms.patch
index 933022227b2..1446e8a311c 100644
--- a/debian/patches/disable-neon-in-qcms.patch
+++ b/debian/patches/disable-neon-in-qcms.patch
@@ -41,3 +41,54 @@ index b08fc9490b..3f5ad40145 100644
  
  extern bool qcms_supports_iccv4;
  extern bool qcms_supports_neon;
+diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
+index 7987ae2f31..d432ab5e5a 100644
+--- a/gfx/qcms/src/lib.rs
++++ b/gfx/qcms/src/lib.rs
+@@ -62,8 +62,8 @@ pub use transform::DataType;
+ pub use transform::Transform;
+ #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ mod transform_avx;
+-#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))]
+-mod transform_neon;
++//#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))]
++//mod transform_neon;
+ #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+ mod transform_sse2;
+ mod transform_util;
+diff --git a/gfx/qcms/src/transform.rs b/gfx/qcms/src/transform.rs
+index f3d9e8b4c4..b5e5351837 100644
+--- a/gfx/qcms/src/transform.rs
++++ b/gfx/qcms/src/transform.rs
+@@ -21,11 +21,11 @@
+ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))]
++/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))]
+ use crate::transform_neon::{
+     qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon,
+     qcms_transform_data_rgba_out_lut_neon,
+-};
++};*/
+ use crate::{
+     chain::chain_transform,
+     double_to_s15Fixed16Number,
+@@ -1364,7 +1364,7 @@ pub fn transform_create(
+                 }
+             }
+ 
+-            #[cfg(all(target_arch = "arm", feature = "neon"))]
++            /*#[cfg(all(target_arch = "arm", feature = "neon"))]
+             let neon_supported = is_arm_feature_detected!("neon");
+             #[cfg(all(target_arch = "aarch64", feature = "neon"))]
+             let neon_supported = is_aarch64_feature_detected!("neon");
+@@ -1378,7 +1378,7 @@ pub fn transform_create(
+                 } else if in_type == BGRA8 {
+                     transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon)
+                 }
+-            }
++            }*/
+ 
+             if transform.transform_fn.is_none() {
+                 if in_type == RGB8 {
diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
index 7987ae2f317..d432ab5e5a2 100644
--- a/gfx/qcms/src/lib.rs
+++ b/gfx/qcms/src/lib.rs
@@ -62,8 +62,8 @@ pub use transform::DataType;
 pub use transform::Transform;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod transform_avx;
-#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))]
-mod transform_neon;
+//#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))]
+//mod transform_neon;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod transform_sse2;
 mod transform_util;
diff --git a/gfx/qcms/src/transform.rs b/gfx/qcms/src/transform.rs
index f3d9e8b4c4c..b5e53518371 100644
--- a/gfx/qcms/src/transform.rs
+++ b/gfx/qcms/src/transform.rs
@@ -21,11 +21,11 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))]
+/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))]
 use crate::transform_neon::{
     qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon,
     qcms_transform_data_rgba_out_lut_neon,
-};
+};*/
 use crate::{
     chain::chain_transform,
     double_to_s15Fixed16Number,
@@ -1364,7 +1364,7 @@ pub fn transform_create(
                 }
             }
 
-            #[cfg(all(target_arch = "arm", feature = "neon"))]
+            /*#[cfg(all(target_arch = "arm", feature = "neon"))]
             let neon_supported = is_arm_feature_detected!("neon");
             #[cfg(all(target_arch = "aarch64", feature = "neon"))]
             let neon_supported = is_aarch64_feature_detected!("neon");
@@ -1378,7 +1378,7 @@ pub fn transform_create(
                 } else if in_type == BGRA8 {
                     transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon)
                 }
-            }
+            }*/
 
             if transform.transform_fn.is_none() {
                 if in_type == RGB8 {