update to r138, try to update the mesa to the latest version but failed

Author: yangtsao

chromium-patches/001_fix_gpu_sandbox_for_new_mesa.patch.test

@@ -0,0 +1,24 @@
+diff --git a/content/common/gpu_pre_sandbox_hook_linux.cc b/content/common/gpu_pre_sandbox_hook_linux.cc
+index 97f7221cb1a56..519345b8a2202 100644
+--- a/content/common/gpu_pre_sandbox_hook_linux.cc
++++ b/content/common/gpu_pre_sandbox_hook_linux.cc
+@@ -600,6 +600,7 @@ void LoadArmGpuLibraries() {
+ 
+ bool LoadAmdGpuLibraries() {
+   // Preload the amdgpu-dependent libraries.
++#if 0
+   if (nullptr == dlopen("libglapi.so", dlopen_flag)) {
+     LOG(ERROR) << "dlopen(libglapi.so) failed with error: " << dlerror();
+     return false;
+@@ -613,6 +614,11 @@ bool LoadAmdGpuLibraries() {
+     LOG(ERROR) << "dlopen(radeonsi_dri.so) failed with error: " << dlerror();
+     return false;
+   }
++#endif
++	if (nullptr == dlopen("libgallium_dri.so", dlopen_flag)) {
++    LOG(ERROR) << "dlopen(libgallium_dri.so) failed with error: " << dlerror();
++    return false;
++  }
+   return true;
+ }
+ 

make.conf

@@ -7,3 +7,5 @@ USE="${USE} amd-common hevc_codec kvm_nested"
 USE="${USE} scheduler_configuration_performance native_gpu_memory_buffers"
 
 VIDEO_CARDS="radeon amdgpu radeonsi"
+
+#EMERGE_DEFAULT_OPTS="--jobs=32 --load-average=32"

media-libs/arc-cros-gralloc/arc-cros-gralloc.bashrc

@@ -0,0 +1,6 @@
+cros_pre_src_prepare_openapu() {
+  if [ ${PV} == 9999 ]; then
+    return
+  fi
+  eapply ${OPENFYDE_APU_BASHRC_FILESDIR}/001-fix-DRI-FORMAT.patch
+}

media-libs/arc-cros-gralloc/files/001-fix-DRI-FORMAT.patch

@@ -0,0 +1 @@
+../../minigbm/files/001-fix-DRI-FORMAT.patch

media-libs/mesa-amd/DIR_METADATA

@@ -0,0 +1,24 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+buganizer {
+  component_id: 885255  # ChromeOS > Platform > Graphics
+}
+team_email: "chromeos-gfx@google.com"
+
+chromeos {
+  cq {
+    source_test_plans {
+      test_plan_starlark_files {
+        host: "chrome-internal.googlesource.com"
+        project: "chromeos/config-internal"
+        path: "test/plans/v2/ctpv1_compatible/borealis.star"
+      }
+    }
+  }
+}

media-libs/mesa-amd/OWNERS

@@ -0,0 +1 @@
+include chromiumos/platform/graphics:/OWNERS.mesa_amd

media-libs/mesa-amd/README.md

@@ -0,0 +1,54 @@
+### mesa-amd dev and uprev process
+
+mesa-amd follows a traditional [cros_workon](https://chromium.googlesource.com/chromiumos/docs/+/HEAD/developer_guide.md#making-changes-to-packages-whose-source-code-is-checked-into-chromium-os-git-repositories) workflow where changes are made directly to src/third_party/mesa-amd. This is different from the [mesa](https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/HEAD/media-libs/mesa/mesa-9999.ebuild) project, which follows the CROS_WORKON_MANUAL_UPREV workflow.
+
+Working in mesa-amd takes an "upstream first" philosophy, and downstream changes represent technical debt and should be avoided. Commit messages for downstream changes in mesa-amd are [prefixed in a similar fashion](https://chromium.googlesource.com/chromiumos/docs/+/HEAD/kernel_development.md#commit-messages-summary-lines-chromium_upstream_fromlist_backport) as changes in the kernel and elsewhere in Chrome OS.
+
+Refer to the [upstream documentation](https://docs.mesa3d.org/releasing.html#release-schedule) for details about upstream mesa's release schedule. To summarize, approximately every three months is a [feature release](https://docs.mesa3d.org/releasing.html#feature-releases), followed by [stable releases](https://docs.mesa3d.org/releasing.html#stable-releases) approximately every two weeks.
+
+mesa-amd generally tracks upstream feature release branches, with possibly a small number of downstream changes applied on top.
+
+Tags and branches from upstream are automatically synced to the chromiumos mesa mirror. Tags and branch names are synced under upstream/... (for example, [upstream/mesa-21.2.1](https://chromium.googlesource.com/chromiumos/third_party/mesa/+/refs/tags/upstream/mesa-21.2.1) and [upstream/21.1](https://chromium.googlesource.com/chromiumos/third_party/mesa/+/refs/heads/upstream/21.2)).
+
+#### Uprev process
+
+When uprevving to a new release branch, follow the below process to reset the tree to its upstream state.
+```
+ # Create a merge commit that resolves all merge conflicts such that all changes are discarded in favor of those in the new upstream branch
+ git merge upstream/mesa-21.2.1 -X theirs --no-commit
+ git read-tree upstream/mesa-21.2.1
+ # Restore this file to ensure that presubmit checks survive the uprev.
+ git add PRESUBMIT.cfg
+ # Create an appropriate commit message, and add BUG= and TEST= tags appropriately.
+ git commit -m "CHROMIUM: Reset tree to upstream/mesa-21.2.1"
+ # Clean up the index
+ git clean -f
+ git reset --hard HEAD
+ # Confirm that the state of the tree is identical to the upstream state, modulo the PRESUMBIT.cfg that was added.
+ git diff-tree --no-commit-id --name-status upstream/mesa-21.2.1 HEAD
+```
+
+Use `git log --first-parent --pretty='%h %s'` to see the list of changes since the last time the tree was reset, and assess whether downstream patches can be dropped, or if they need to be cherry-picked again. You may need to cherry-pick some long-lived dowstream changes (i.e. CHROMIUM: patches). When you cherry-pick such a patch, edit the commit message to strip old tags such as Change-Id, Reviewed-By, etc., and update the BUG= to reference the bug tracking the uprev effort.
+
+Subsequent stable releases from upstream can be applied by using `git merge` and uploading the merge commit to Gerrit.
+
+
+#### Downstream changes
+The preferred flow to get changes into mesa-amd is to:
+1. Send a change upstream for review
+2. Get it merged upstream
+3. Ensure it is included in the next upstream stable release
+4. `git merge` the next stable release containing the change.
+
+There may be cases where we cannot do this for a particular change, or a change is needed more urgently than this process allows. In such cases, we may upload changes to Gerrit with an appropriate prefix. These prefixes are:
+- UPSTREAM: Indicates that the patch has landed in upstream mesa
+  - This is appropriate when the UPSTREAM change will never land in a subsequent stable release, or we need to land it in Chrome OS more expediently than the upstream stable release process allows for.
+  - Use `git cherry-pick -x` to ensure that the commit message contains the commit hash of the UPSTREAM commit
+- BACKPORT: Same as upstream, but there are conflicts that needed to be addressed
+  - Describe the conflicts and their resolution in the commit message
+- FROMLIST: The patch is under review in an upstream merge request
+  - These should not be merged except for P0/P1 issues. It's strongly preferred to wait for the completion of the review upstream, and then apply the change as UPSTREAM
+  - Owner+Reviewer of this change is responsible to follow up on the upstream review process and ensure that it gets merged in a timely manner.
+  - Include a link to the merge-request in the commit message
+- CHROMIUM: The patch cannot be upstreamed
+  - There must be strong justification for why an upstreamable solution is not viable.

media-libs/mesa-amd/files/001-add-dril.patch

@@ -0,0 +1,70 @@
+diff --git a/meson.build b/meson.build
+index d5dbe95075c..f8f418d2ee0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -895,7 +895,6 @@ if with_platform_android
+     dep_android = [
+       dependency('cutils'),
+       dependency('hardware'),
+-      dependency('log'),
+       dependency('sync'),
+     ]
+     if with_libbacktrace
+diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
+index 8b40e3627fb..70c663c3357 100644
+--- a/src/gallium/targets/dril/dril_target.c
++++ b/src/gallium/targets/dril/dril_target.c
+@@ -361,6 +361,7 @@ init_dri2_configs(int fd)
+    EGLBoolean (*peglGetConfigAttrib)(EGLDisplay, EGLConfig, EGLint, EGLint *) = peglGetProcAddress("eglGetConfigAttrib");
+    const char *(*peglQueryString)(EGLDisplay, EGLint) = peglGetProcAddress("eglQueryString");
+ 
++#if 0
+    struct gbm_device *gbm = NULL;
+    if (fd != -1) {
+       /* try opening GBM for hardware driver info */
+@@ -368,8 +369,9 @@ init_dri2_configs(int fd)
+       if (!gbm)
+          goto out;
+    }
++#endif
+ 
+-   EGLDisplay dpy = peglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, gbm ? gbm : EGL_DEFAULT_DISPLAY, NULL);
++   EGLDisplay dpy = peglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, /*gbm ? gbm :*/ EGL_DEFAULT_DISPLAY, NULL);
+    if (!dpy)
+       goto out_gbm;
+    int maj, min;
+@@ -436,8 +438,10 @@ out_egl:
+    peglTerminate(dpy);
+ 
+ out_gbm:
++#if 0
+    if (gbm)
+       gbm_device_destroy(gbm);
++#endif
+ out:
+    dlclose(egl);
+    if (c)
+@@ -537,6 +541,7 @@ const __DRIdri2Extension drilDRI2Extension = {
+ 
+     /* these are the methods used by the xserver */
+     .createNewScreen            = dril2CreateNewScreen,
++    .createNewScreen2           = drilCreateNewScreen,
+     .createNewDrawable          = drilCreateNewDrawable,
+     .createNewContext           = drilCreateNewContext,
+     .createContextAttribs       = drilCreateContextAttribs,
+diff --git a/src/meson.build b/src/meson.build
+index 61d7d1d40fa..c9d2554fd4c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -138,10 +138,8 @@ endif
+ if with_egl
+   subdir('egl')
+ endif
+-if with_gallium and with_gbm
+-  if with_glx == 'dri' or with_platform_x11 or with_platform_xcb
++if with_gallium
+     subdir('gallium/targets/dril')
+-  endif
+ endif
+ 
+ if with_gbm and with_dri2

media-libs/mesa-amd/files/chromeos-version.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Copyright 2020 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# This script is given one argument: the base of the source directory of
+# the package, and it prints a string on stdout with the numerical version
+# number for said repo.
+
+exec sed -e 's/devel/pre/g' -e 's/-/_/g' "$1/VERSION"

media-libs/mesa-amd/files/drirc

@@ -0,0 +1,9 @@
+<driconf>
+   <device driver="radeonsi">
+      <application name="Default">
+         <!-- Disabled protected content check for secure playback -->
+         <option name="disable_protected_content_check" value="true"/>
+      </application>
+   </device>
+</driconf>
+