Module: Mesa Branch: main Commit: e895c7ba56c761918deab659d67201cf5dce0650 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e895c7ba56c761918deab659d67201cf5dce0650
Author: Dave Airlie <[email protected]> Date: Thu Mar 16 13:31:56 2023 +1000 radeonsi/ac: move some vcn defines to common Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Acked-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21980> --- src/amd/common/ac_vcn.h | 42 +++++++++++++++++++++++++++++++ src/gallium/drivers/radeonsi/radeon_vcn.h | 13 +--------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/amd/common/ac_vcn.h b/src/amd/common/ac_vcn.h new file mode 100644 index 00000000000..a5a73b4bbae --- /dev/null +++ b/src/amd/common/ac_vcn.h @@ -0,0 +1,42 @@ +/* + * Copyright © 2022 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS + * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + */ + +#ifndef AC_VCN_H +#define AC_VCN_H + +#define RADEON_VCN_ENGINE_INFO (0x30000001) +#define RADEON_VCN_SIGNATURE (0x30000002) +#define RADEON_VCN_ENGINE_TYPE_ENCODE (0x00000002) +#define RADEON_VCN_ENGINE_TYPE_DECODE (0x00000003) + +#define RADEON_VCN_ENGINE_INFO_SIZE (0x00000010) +#define RADEON_VCN_SIGNATURE_SIZE (0x00000010) + +struct rvcn_sq_var { + unsigned int *ib_total_size_in_dw; + unsigned int *ib_checksum; +}; + +#endif diff --git a/src/gallium/drivers/radeonsi/radeon_vcn.h b/src/gallium/drivers/radeonsi/radeon_vcn.h index f27e039bfdc..c78effc0eee 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn.h +++ b/src/gallium/drivers/radeonsi/radeon_vcn.h @@ -28,18 +28,7 @@ #include "radeon_video.h" -#define RADEON_VCN_ENGINE_INFO (0x30000001) -#define RADEON_VCN_SIGNATURE (0x30000002) -#define RADEON_VCN_ENGINE_TYPE_ENCODE (0x00000002) -#define RADEON_VCN_ENGINE_TYPE_DECODE (0x00000003) - -#define RADEON_VCN_ENGINE_INFO_SIZE (0x00000010) -#define RADEON_VCN_SIGNATURE_SIZE (0x00000010) - -struct rvcn_sq_var { - unsigned int *ib_total_size_in_dw; - unsigned int *ib_checksum; -}; +#include "ac_vcn.h" void rvcn_sq_header(struct radeon_cmdbuf *cs, struct rvcn_sq_var *sq,
