Merge ~b-stolk/chromium-browser/+git/snap-from-source:fix-expansion into ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-beta

[Bram Stolk]

Fix the usage of DRI_DRIVER_DIR variable.

The build configuration for minigbm was lacking the dri config.
This causes DRI_DRIVER_DIR to be undefined.
In addition, when the dri config is properly included, the
definition will include the quotation marks, making the
STRINGIZE step unnecessary.
To find the correct directory in the snap, we now prefix
DRI_DRIVER_DIR with /snap/chromium/current/gnome-platform

Fixes LP:2004586
Fixes LP:2006646
KIVU-90

can be applied to all hwacc branches.

[Bram Stolk (b-stolk)]

This can be applied to all hwacc branches.

[Nathan Teodosio (nteodosio)]

Copying my response from merge request 437529:

>> The path is incorrect: we should be using /snap/gnome-3-38-2004/current/usr/lib/x86_64-linux-gnu/dri instead.
>
> But we do stage mesa-va-drivers, which provides /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so. We haven't been using the GNOME SDK ones so far for our hwacc improvements.

Furthermore, if we bind mount this, we are as a side-effect overriding the iHD_drv_video.so we ourselves build (as in snapcraft.yaml) by the one that GNOME SDK provides.

review: Needs Fixing

[Bram Stolk (b-stolk)]

NOTE: I still need to test how this affects chromium on intel GPU, though.

Can it still find the video drivers for HW accelerated video?

[Nathan Teodosio (nteodosio)]

I am pointing out that, with the proposed changes, the drivers built
(iHD) and staged (radeonsi) via the va_drivers part would be overridden
by the ones from /snap/gnome-3-38-2004/.

Am 2023/02/23 um 14:59 schrieb Bram Stolk:
> NOTE: I still need to test how this affects chromium on intel GPU, though.
>
> Can it still find the video drivers for HW accelerated video?

[Bram Stolk (b-stolk)]

New version of patch works differently: no layout mapping.

Instead, the correct DRI_DRIVER_DIR is used from the gnome snap.

[Nathan Teodosio (nteodosio)]

I've submitted two builds, one using this merge request and another using mesa-va-drivers path instead. If the latter works I think we should prefer it.

Edit: For the record, I was conflating radeon_dri.so and radeonsi_drv_video.so. So yes we'll go with the one in gnome-platform.

review: Approve

[Nathan Teodosio (nteodosio)]

For the record, I added headers to your patch.

And thanks again!

diff --git a/build/chromium-patches/extra:fix-dri-loading.diff b/build/chromium-patches/extra:fix-dri-loading.diff
new file mode 100644
index 0000000..f4828df
--- /dev/null
+++ b/build/chromium-patches/extra:fix-dri-loading.diff
@@ -0,0 +1,40 @@
+diff -u src/third_party/minigbm/BUILD.gn src2/third_party/minigbm/BUILD.gn
+--- src/third_party/minigbm/BUILD.gn    2023-02-22 10:11:45.378628381 -0800
++++ src2/third_party/minigbm/BUILD.gn   2023-02-08 10:48:28.479158349 -0800
+@@ -80,6 +80,7 @@
+
+     configs -= [ "//build/config/compiler:chromium_code" ]
+     configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/linux/dri" ]
+
+     deps = [ "//build/config/linux/libdrm" ]
+     public_configs = [ ":minigbm_config" ]
+diff -u src/third_party/minigbm/src/amdgpu.c src2/third_party/minigbm/src/amdgpu.c
+--- src/third_party/minigbm/src/amdgpu.c
++++ src2/third_party/minigbm/src/amdgpu.c
+@@ -23,9 +23,11 @@
+ #include "drv_priv.h"
+ #include "util.h"
+ 
+-// clang-format off
+-#define DRI_PATH STRINGIZE(DRI_DRIVER_DIR/radeonsi_dri.so)
+-// clang-format on
++#if !defined(DRI_DRIVER_DIR)
++#	error "DRI_DRIVER_DIR is not defined."
++#else
++#	define DRI_PATH DRI_DRIVER_DIR "/radeonsi_dri.so"
++#endif
+ 
+ #define TILE_TYPE_LINEAR 0
+ /* We decide a modifier and then use DRI to manage allocation */
+diff --git src/build/config/linux/dri/BUILD.gn src2/build/config/linux/dri/BUILD.gn
+index e3a0a83..6e0f7ee 100644
+--- src/build/config/linux/dri/BUILD.gn
++++ src2/build/config/linux/dri/BUILD.gn
+@@ -14,5 +14,5 @@ pkg_config("dri") {
+                                      "dri",
+                                    ],
+                                "string")
+-  defines = [ "DRI_DRIVER_DIR=\"$dri_driver_dir\"" ]
++  defines = [ "DRI_DRIVER_DIR=\"/snap/chromium/current/gnome-platform$dri_driver_dir\"" ]
+ }
diff --git a/build/chromium-patches/series b/build/chromium-patches/series
index 9f7583b..214cc86 100644
--- a/build/chromium-patches/series
+++ b/build/chromium-patches/series
@@ -1,3 +1,4 @@
+extra:fix-dri-loading.diff
 extra:fe38fdb:dynamic-check-nv12.diff
 guide-0.9.1:a45401f:vaapi-flag-ozone-wayland.diff
 guide-0.9.1:b49ca2f:one-copy.diff
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 61e1bb5..a8b18ba 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -25,6 +25,7 @@ apps:
       SPA_PLUGIN_DIR: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/spa-0.2
       PIPEWIRE_CONFIG_NAME: $SNAP/usr/share/pipewire/pipewire.conf
       PIPEWIRE_MODULE_DIR: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pipewire-0.3
+      MINIGBM_DEBUG: 1
     plugs:
       - audio-playback
       - audio-record