Added fix for mozilla#1774271

This commit is contained in:
Martin Stransky 2022-06-17 12:54:46 +02:00
parent cd6ef2bb82
commit 5128ca8e5f
2 changed files with 37 additions and 1 deletions

View File

@ -163,7 +163,7 @@ ExcludeArch: aarch64
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 101.0.1 Version: 101.0.1
Release: 5%{?pre_tag}%{?dist} Release: 6%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -273,6 +273,7 @@ Patch443: D149135.diff
Patch444: D148946.diff Patch444: D148946.diff
Patch445: D149238.diff Patch445: D149238.diff
Patch446: mozilla-1758948.patch Patch446: mozilla-1758948.patch
Patch447: mozilla-1774271.patch
# PGO/LTO patches # PGO/LTO patches
Patch600: pgo.patch Patch600: pgo.patch
@ -545,6 +546,7 @@ This package contains results of tests executed during build.
%patch444 -p1 -b .D148946.diff %patch444 -p1 -b .D148946.diff
%patch445 -p1 -b .D149238.diff %patch445 -p1 -b .D149238.diff
%patch446 -p1 -b .mozbz#1758948 %patch446 -p1 -b .mozbz#1758948
%patch447 -p1 -b .mozbz#1774271
# PGO patches # PGO patches
%if %{build_with_pgo} %if %{build_with_pgo}
@ -1118,6 +1120,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Jun 17 2022 Martin Stransky <stransky@redhat.com>- 101.0.1-6
- Added fix for mozbz#1774271 - Intel/dmabuf export issues.
* Wed Jun 15 2022 Martin Stransky <stransky@redhat.com>- 101.0.1-5 * Wed Jun 15 2022 Martin Stransky <stransky@redhat.com>- 101.0.1-5
- Added fix for mozbz#1758948 (AV1 VA-API playback shuttering) - Added fix for mozbz#1758948 (AV1 VA-API playback shuttering)

31
mozilla-1774271.patch Normal file
View File

@ -0,0 +1,31 @@
changeset: 623945:6117c9ecd16b
tag: tip
parent: 623941:45e313943df5
user: stransky <stransky@redhat.com>
date: Fri Jun 17 12:36:38 2022 +0200
files: gfx/thebes/gfxPlatform.cpp
description:
Bug 1774271 [Linux] Don't use EGL_MESA_image_dma_buf_export in Mesa/Intel due to https://gitlab.freedesktop.org/mesa/mesa/-/issues/6688 r?jgilbert
Depends on https://phabricator.services.mozilla.com/D149238
Differential Revision: https://phabricator.services.mozilla.com/D149608
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2871,6 +2871,12 @@ void gfxPlatform::InitWebGLConfig() {
adapterDriverVendor.Find("radeonsi") != -1) {
gfxVars::SetUseDMABufSurfaceExport(false);
}
+ // Disable EGL_MESA_image_dma_buf_export on mesa/iris due to
+ // https://gitlab.freedesktop.org/mesa/mesa/-/issues/6688
+ if (adapterDriverVendor.Find("mesa") != -1 &&
+ adapterDriverVendor.Find("iris") != -1) {
+ gfxVars::SetUseDMABufSurfaceExport(false);
+ }
}
}