head 1.2; access; symbols netbsd-11-0-RC5:1.1.1.2.2.1 netbsd-11-0-RC4:1.1.1.2 netbsd-11-0-RC3:1.1.1.2 netbsd-11-0-RC2:1.1.1.2 netbsd-11-0-RC1:1.1.1.2 netbsd-11:1.1.1.2.0.2 netbsd-11-base:1.1.1.2 libdrm-2-4-124:1.1.1.2 netbsd-10-1-RELEASE:1.1.1.1 libdrm-2-4-122:1.1.1.2 netbsd-10-0-RELEASE:1.1.1.1 netbsd-10-0-RC6:1.1.1.1 netbsd-10-0-RC5:1.1.1.1 netbsd-10-0-RC4:1.1.1.1 netbsd-10-0-RC3:1.1.1.1 netbsd-10-0-RC2:1.1.1.1 netbsd-10-0-RC1:1.1.1.1 netbsd-10:1.1.1.1.0.2 netbsd-10-base:1.1.1.1 libdrm-2-4-114:1.1.1.1 xorg:1.1.1; locks; strict; comment @ * @; 1.2 date 2026.06.10.05.27.44; author mrg; state dead; branches; next 1.1; commitid OkSNQummCTEKcdJG; 1.1 date 2022.11.12.02.04.42; author mrg; state Exp; branches 1.1.1.1; next ; commitid fMjFZZt1HqTR3m1E; 1.1.1.1 date 2022.11.12.02.04.42; author mrg; state Exp; branches; next 1.1.1.2; commitid fMjFZZt1HqTR3m1E; 1.1.1.2 date 2024.07.04.09.21.32; author mrg; state Exp; branches 1.1.1.2.2.1; next ; commitid yumHpHqYfO9ZbvgF; 1.1.1.2.2.1 date 2026.06.15.19.01.18; author martin; state dead; branches; next ; commitid k60aEdEWX1t2xVJG; desc @@ 1.2 log @merge libdrm 2.4.134 @ text @/* * 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, sublicense, * 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 above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * 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 NONINFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. * */ #ifndef _shader_code_h_ #define _shader_code_h_ #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #endif enum amdgpu_test_gfx_version { AMDGPU_TEST_GFX_V9 = 0, AMDGPU_TEST_GFX_V10, AMDGPU_TEST_GFX_V11, AMDGPU_TEST_GFX_MAX, }; enum cs_type { CS_BUFFERCLEAR = 0, CS_BUFFERCOPY, CS_HANG, CS_HANG_SLOW, }; enum ps_type { PS_CONST, PS_TEX, PS_HANG, PS_HANG_SLOW }; enum vs_type { VS_RECTPOSTEXFAST, }; struct reg_info { uint32_t reg_offset; ///< Memory mapped register offset uint32_t reg_value; ///< register value }; #include "shader_code_hang.h" #include "shader_code_gfx9.h" #include "shader_code_gfx10.h" #include "shader_code_gfx11.h" struct shader_test_cs_shader { const uint32_t *shader; uint32_t shader_size; const struct reg_info *sh_reg; uint32_t num_sh_reg; const struct reg_info *context_reg; uint32_t num_context_reg; }; struct shader_test_ps_shader { const uint32_t *shader; unsigned shader_size; const uint32_t patchinfo_code_size; const uint32_t *patchinfo_code; const uint32_t *patchinfo_code_offset; const struct reg_info *sh_reg; const uint32_t num_sh_reg; const struct reg_info *context_reg; const uint32_t num_context_reg; }; struct shader_test_vs_shader { const uint32_t *shader; uint32_t shader_size; const struct reg_info *sh_reg; uint32_t num_sh_reg; const struct reg_info *context_reg; uint32_t num_context_reg; }; static const struct shader_test_cs_shader shader_test_cs[AMDGPU_TEST_GFX_MAX][2] = { // gfx9, cs_bufferclear {{bufferclear_cs_shader_gfx9, sizeof(bufferclear_cs_shader_gfx9), bufferclear_cs_shader_registers_gfx9, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx9)}, // gfx9, cs_buffercopy {buffercopy_cs_shader_gfx9, sizeof(buffercopy_cs_shader_gfx9), bufferclear_cs_shader_registers_gfx9, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx9)}}, // gfx10, cs_bufferclear {{bufferclear_cs_shader_gfx10, sizeof(bufferclear_cs_shader_gfx10), bufferclear_cs_shader_registers_gfx9, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx9)}, // gfx10, cs_buffercopy {buffercopy_cs_shader_gfx10, sizeof(bufferclear_cs_shader_gfx10), bufferclear_cs_shader_registers_gfx9, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx9)}}, // gfx11, cs_bufferclear {{bufferclear_cs_shader_gfx11, sizeof(bufferclear_cs_shader_gfx11), bufferclear_cs_shader_registers_gfx11, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx11)}, // gfx11, cs_buffercopy {buffercopy_cs_shader_gfx11, sizeof(bufferclear_cs_shader_gfx11), bufferclear_cs_shader_registers_gfx11, ARRAY_SIZE(bufferclear_cs_shader_registers_gfx11)}}, }; #define SHADER_PS_INFO(_ps, _n) \ {ps_##_ps##_shader_gfx##_n, sizeof(ps_##_ps##_shader_gfx##_n), \ ps_##_ps##_shader_patchinfo_code_size_gfx##_n, \ ps_##_ps##_shader_patchinfo_code_gfx##_n, \ ps_##_ps##_shader_patchinfo_offset_gfx##_n, \ ps_##_ps##_sh_registers_gfx##_n, ps_##_ps##_num_sh_registers_gfx##_n, \ ps_##_ps##_context_registers_gfx##_n, ps_##_ps##_num_context_registers_gfx##_n} static const struct shader_test_ps_shader shader_test_ps[AMDGPU_TEST_GFX_MAX][2] = { {SHADER_PS_INFO(const, 9), SHADER_PS_INFO(tex, 9)}, {SHADER_PS_INFO(const, 10), SHADER_PS_INFO(tex, 10)}, {SHADER_PS_INFO(const, 11), SHADER_PS_INFO(tex, 11)}, }; #define SHADER_VS_INFO(_vs, _n) \ {vs_##_vs##_shader_gfx##_n, sizeof(vs_##_vs##_shader_gfx##_n), \ vs_##_vs##_sh_registers_gfx##_n, vs_##_vs##_num_sh_registers_gfx##_n, \ vs_##_vs##_context_registers_gfx##_n, vs_##_vs##_num_context_registers_gfx##_n} static const struct shader_test_vs_shader shader_test_vs[AMDGPU_TEST_GFX_MAX][1] = { {SHADER_VS_INFO(RectPosTexFast, 9)}, {SHADER_VS_INFO(RectPosTexFast, 10)}, {SHADER_VS_INFO(RectPosTexFast, 11)}, }; struct shader_test_gfx_info { const uint32_t *preamble_cache; uint32_t size_preamble_cache; const uint32_t *cached_cmd; uint32_t size_cached_cmd; uint32_t sh_reg_base; uint32_t context_reg_base; }; #define SHADER_TEST_GFX_INFO(_n) \ preamblecache_gfx##_n, sizeof(preamblecache_gfx##_n), \ cached_cmd_gfx##_n, sizeof(cached_cmd_gfx##_n), \ sh_reg_base_gfx##_n, context_reg_base_gfx##_n static struct shader_test_gfx_info shader_test_gfx_info[AMDGPU_TEST_GFX_MAX] = { {SHADER_TEST_GFX_INFO(9),}, {SHADER_TEST_GFX_INFO(10),}, {SHADER_TEST_GFX_INFO(11),}, }; #endif @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of libdrm-2.4.114 @ text @@ 1.1.1.2 log @initial import of libdrm-2.4.122 @ text @d78 1 a78 1 uint32_t patchinfo_code_size; d82 1 a82 1 uint32_t num_sh_reg; d84 1 a84 1 uint32_t num_context_reg; d114 1 a114 1 &(ps_##_ps##_shader_patchinfo_code_gfx##_n)[0][0][0], \ @ 1.1.1.2.2.1 log @Pull up the following revisions, requested by mrg in ticket #310: external/mit/libdrm/dist/amdgpu/amdgpu_userq.c up to 1.2 external/mit/libdrm/dist/tests/amdgpu/amdgpu_test.c delete external/mit/libdrm/dist/tests/amdgpu/amdgpu_test.h delete external/mit/libdrm/dist/tests/amdgpu/basic_tests.c delete external/mit/libdrm/dist/tests/amdgpu/bo_tests.c delete external/mit/libdrm/dist/tests/amdgpu/cp_dma_tests.c delete external/mit/libdrm/dist/tests/amdgpu/cs_tests.c delete external/mit/libdrm/dist/tests/amdgpu/deadlock_tests.c delete external/mit/libdrm/dist/tests/amdgpu/decode_messages.h delete external/mit/libdrm/dist/tests/amdgpu/frame.h delete external/mit/libdrm/dist/tests/amdgpu/hotunplug_tests.c delete external/mit/libdrm/dist/tests/amdgpu/jpeg_tests.c delete external/mit/libdrm/dist/tests/amdgpu/ras_tests.c delete external/mit/libdrm/dist/tests/amdgpu/security_tests.c delete external/mit/libdrm/dist/tests/amdgpu/shader_code.h delete external/mit/libdrm/dist/tests/amdgpu/shader_code_gfx10.h delete external/mit/libdrm/dist/tests/amdgpu/shader_code_gfx11.h delete external/mit/libdrm/dist/tests/amdgpu/shader_code_gfx9.h delete external/mit/libdrm/dist/tests/amdgpu/shader_code_hang.h delete external/mit/libdrm/dist/tests/amdgpu/shader_test_util.c delete external/mit/libdrm/dist/tests/amdgpu/syncobj_tests.c delete external/mit/libdrm/dist/tests/amdgpu/uvd_enc_tests.c delete external/mit/libdrm/dist/tests/amdgpu/uve_ib.h delete external/mit/libdrm/dist/tests/amdgpu/vce_ib.h delete external/mit/libdrm/dist/tests/amdgpu/vce_tests.c delete external/mit/libdrm/dist/tests/amdgpu/vcn_tests.c delete external/mit/libdrm/dist/tests/amdgpu/vm_tests.c delete external/mit/libdrm/dist/.gitlab-ci.yml up to 1.1.1.5 external/mit/libdrm/dist/README.rst up to 1.1.1.3 external/mit/libdrm/dist/gen_table_fourcc.py up to 1.1.1.4 external/mit/libdrm/dist/meson.build up to 1.1.1.14 external/mit/libdrm/dist/meson_options.txt up to 1.1.1.4 external/mit/libdrm/dist/util_math.h up to 1.4 external/mit/libdrm/dist/xf86drm.c up to 1.35 external/mit/libdrm/dist/xf86drm.h up to 1.18 external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt up to 1.1.1.6 external/mit/libdrm/dist/amdgpu/amdgpu.h up to 1.6 external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c up to 1.1.1.4 external/mit/libdrm/dist/amdgpu/amdgpu_bo.c up to 1.8 external/mit/libdrm/dist/amdgpu/amdgpu_device.c up to 1.1.1.10 external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c up to 1.1.1.7 external/mit/libdrm/dist/amdgpu/amdgpu_internal.h up to 1.1.1.7 external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c up to 1.6 external/mit/libdrm/dist/amdgpu/meson.build up to 1.1.1.9 external/mit/libdrm/dist/data/amdgpu.ids up to 1.1.1.13 external/mit/libdrm/dist/etnaviv/meson.build up to 1.1.1.9 external/mit/libdrm/dist/exynos/meson.build up to 1.1.1.9 external/mit/libdrm/dist/freedreno/meson.build up to 1.1.1.9 external/mit/libdrm/dist/include/drm/amdgpu_drm.h up to 1.1.1.14 external/mit/libdrm/dist/include/drm/drm.h up to 1.16 external/mit/libdrm/dist/include/drm/drm_fourcc.h up to 1.1.1.11 external/mit/libdrm/dist/include/drm/drm_mode.h up to 1.1.1.16 external/mit/libdrm/dist/include/drm/virtgpu_drm.h up to 1.1.1.4 external/mit/libdrm/dist/intel/meson.build up to 1.1.1.9 external/mit/libdrm/dist/man/drm-kms.7.rst up to 1.1.1.3 external/mit/libdrm/dist/man/drm-memory.7.rst up to 1.1.1.3 external/mit/libdrm/dist/man/drm.7.rst up to 1.1.1.3 external/mit/libdrm/dist/man/drmAvailable.3.rst up to 1.1.1.2 external/mit/libdrm/dist/man/drmHandleEvent.3.rst up to 1.1.1.2 external/mit/libdrm/dist/man/drmModeGetResources.3.rst up to 1.1.1.2 external/mit/libdrm/dist/nouveau/meson.build up to 1.1.1.9 external/mit/libdrm/dist/omap/meson.build up to 1.1.1.9 external/mit/libdrm/dist/omap/omap_drm.c up to 1.1.1.9 external/mit/libdrm/dist/radeon/meson.build up to 1.1.1.9 external/mit/libdrm/dist/tegra/meson.build up to 1.1.1.9 external/mit/libdrm/dist/tests/drmdevice.c up to 1.1.1.6 external/mit/libdrm/dist/tests/amdgpu/meson.build up to 1.1.1.9 external/mit/libdrm/dist/tests/modetest/buffers.c up to 1.1.1.11 external/mit/libdrm/dist/tests/modetest/buffers.h up to 1.1.1.5 external/mit/libdrm/dist/tests/modetest/modetest.c up to 1.21 external/mit/libdrm/dist/tests/util/pattern.c up to 1.1.1.9 external/mit/libdrm/dist/tests/util/pattern.h up to 1.1.1.4 Import libdrm 2.4.134. @ text @@