From: Dave Airlie <airlied@redhat.com>
Date: Tue, 7 Feb 2023 22:04:10 +0000 (+1000)
Subject: ac/radeonsi: add av1 defaults header file from radeonsi
X-Git-Tag: upstream/23.3.3~6924
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=562e890f2c6a1a3b5198f4afdca6a5276cc49a7d;p=platform%2Fupstream%2Fmesa.git

ac/radeonsi: add av1 defaults header file from radeonsi

This just moves this header file so radv can use it.

Acked-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23640>
---

diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_av1_default.h b/src/amd/common/ac_vcn_av1_default.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_vcn_av1_default.h
rename to src/amd/common/ac_vcn_av1_default.h
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index eed8061..c94d735 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -105,6 +105,7 @@ amd_common_files = files(
   'amd_family.c',
   'ac_perfcounter.c',
   'ac_perfcounter.h',
+  'ac_vcn_av1_default.h',
 )
 
 if dep_elf.found()
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 7c7d0ec..a057027 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -89,7 +89,6 @@ files_libradeonsi = files(
   'radeon_vce_52.c',
   'radeon_vcn.h',
   'radeon_vcn.c',
-  'radeon_vcn_av1_default.h',
   'radeon_vcn_dec.c',
   'radeon_vcn_dec.h',
   'radeon_vcn_dec_jpeg.c',
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
index 895cd1f..ee08195 100644
--- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "radeon_vcn_av1_default.h"
+#include "ac_vcn_av1_default.h"
 
 #define FB_BUFFER_OFFSET             0x1000
 #define FB_BUFFER_SIZE               2048