From 97c9e015179b4c6bb4825616960e4806fb6e89d5 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 6 Sep 2023 10:43:35 -0500 Subject: [PATCH] nouveau/mme: SPDX everything For all the Fermi stuff, I've credited Mary because she wrote it before joining Collabora. For everything else, credit Collabora. Acked-by: Mary Guillemard Part-of: --- src/nouveau/mme/meson.build | 19 +------------------ src/nouveau/mme/mme_builder.h | 4 ++++ src/nouveau/mme/mme_fermi.c | 4 ++++ src/nouveau/mme/mme_fermi.h | 4 ++++ src/nouveau/mme/mme_fermi.xml | 24 +++--------------------- src/nouveau/mme/mme_fermi_builder.c | 4 ++++ src/nouveau/mme/mme_fermi_builder.h | 4 ++++ src/nouveau/mme/mme_fermi_dump.c | 4 ++++ src/nouveau/mme/mme_fermi_sim.c | 6 +++++- src/nouveau/mme/mme_fermi_sim.h | 4 ++++ src/nouveau/mme/mme_tu104.c | 4 ++++ src/nouveau/mme/mme_tu104.h | 4 ++++ src/nouveau/mme/mme_tu104.xml | 25 +++---------------------- src/nouveau/mme/mme_tu104_builder.c | 4 ++++ src/nouveau/mme/mme_tu104_builder.h | 4 ++++ src/nouveau/mme/mme_tu104_dump.c | 4 ++++ src/nouveau/mme/mme_tu104_sim.c | 4 ++++ src/nouveau/mme/mme_tu104_sim.h | 4 ++++ src/nouveau/mme/mme_value.h | 4 ++++ src/nouveau/mme/tests/mme_builder_test.cpp | 4 ++++ src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp | 4 ++++ src/nouveau/mme/tests/mme_runner.cpp | 4 ++++ src/nouveau/mme/tests/mme_runner.h | 4 ++++ src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp | 4 ++++ 24 files changed, 92 insertions(+), 62 deletions(-) diff --git a/src/nouveau/mme/meson.build b/src/nouveau/mme/meson.build index 74f853b6..205d7b3 100644 --- a/src/nouveau/mme/meson.build +++ b/src/nouveau/mme/meson.build @@ -1,22 +1,5 @@ # Copyright © 2022 Collabora, Ltd. - -# 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 -# AUTHORS OR COPYRIGHT HOLDERS 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. +# SPDX-License-Identifier: MIT mme_tu104_isa_depend_files = [ 'mme_tu104.xml', diff --git a/src/nouveau/mme/mme_builder.h b/src/nouveau/mme/mme_builder.h index 0646a61..0a5eb32 100644 --- a/src/nouveau/mme/mme_builder.h +++ b/src/nouveau/mme/mme_builder.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #ifndef MME_BUILDER_H #define MME_BUILDER_H diff --git a/src/nouveau/mme/mme_fermi.c b/src/nouveau/mme/mme_fermi.c index eedb5d1..94c080d 100644 --- a/src/nouveau/mme/mme_fermi.c +++ b/src/nouveau/mme/mme_fermi.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #include "mme_fermi.h" #include "mme_fermi_encode.h" diff --git a/src/nouveau/mme/mme_fermi.h b/src/nouveau/mme/mme_fermi.h index a7d2d50..9653e3b 100644 --- a/src/nouveau/mme/mme_fermi.h +++ b/src/nouveau/mme/mme_fermi.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #ifndef MME_FERMI_H #define MME_FERMI_H diff --git a/src/nouveau/mme/mme_fermi.xml b/src/nouveau/mme/mme_fermi.xml index 0854745..13f2ef7 100644 --- a/src/nouveau/mme/mme_fermi.xml +++ b/src/nouveau/mme/mme_fermi.xml @@ -1,26 +1,8 @@ +Copyright © 2022 Mary Guillemard +SPDX-License-Identifier: MIT +--> diff --git a/src/nouveau/mme/mme_fermi_builder.c b/src/nouveau/mme/mme_fermi_builder.c index 9e71674..68ae60d 100644 --- a/src/nouveau/mme/mme_fermi_builder.c +++ b/src/nouveau/mme/mme_fermi_builder.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #include "mme_builder.h" #include diff --git a/src/nouveau/mme/mme_fermi_builder.h b/src/nouveau/mme/mme_fermi_builder.h index 5a7cc7c..b4c15dd 100644 --- a/src/nouveau/mme/mme_fermi_builder.h +++ b/src/nouveau/mme/mme_fermi_builder.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #ifndef MME_BUILDER_H #error "This file must only be included by mme_builder.h" #endif diff --git a/src/nouveau/mme/mme_fermi_dump.c b/src/nouveau/mme/mme_fermi_dump.c index 69bdd9c..fa8bd09 100644 --- a/src/nouveau/mme/mme_fermi_dump.c +++ b/src/nouveau/mme/mme_fermi_dump.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #include "mme_fermi.h" #include "mme_fermi_isa.h" diff --git a/src/nouveau/mme/mme_fermi_sim.c b/src/nouveau/mme/mme_fermi_sim.c index 467f2e5..126143b 100644 --- a/src/nouveau/mme/mme_fermi_sim.c +++ b/src/nouveau/mme/mme_fermi_sim.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #include "mme_fermi_sim.h" #include @@ -368,4 +372,4 @@ void mme_fermi_sim(uint32_t inst_count, const struct mme_fermi_inst *insts, // Handle delay slot at exit assert(sim.ip < inst_count); eval_inst(&sim, &insts[sim.ip]); -} \ No newline at end of file +} diff --git a/src/nouveau/mme/mme_fermi_sim.h b/src/nouveau/mme/mme_fermi_sim.h index e84cbb0..6908086 100644 --- a/src/nouveau/mme/mme_fermi_sim.h +++ b/src/nouveau/mme/mme_fermi_sim.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #ifndef MME_FERMI_SIM_H #define MME_FERMI_SIM_H diff --git a/src/nouveau/mme/mme_tu104.c b/src/nouveau/mme/mme_tu104.c index a8e0cea..5b13e2c 100644 --- a/src/nouveau/mme/mme_tu104.c +++ b/src/nouveau/mme/mme_tu104.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_tu104.h" #include "mme_tu104_encode.h" diff --git a/src/nouveau/mme/mme_tu104.h b/src/nouveau/mme/mme_tu104.h index 8e141eb..1389a38 100644 --- a/src/nouveau/mme/mme_tu104.h +++ b/src/nouveau/mme/mme_tu104.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #ifndef MME_TU104_H #define MME_TU104_H diff --git a/src/nouveau/mme/mme_tu104.xml b/src/nouveau/mme/mme_tu104.xml index c7458be..78c7ef9 100644 --- a/src/nouveau/mme/mme_tu104.xml +++ b/src/nouveau/mme/mme_tu104.xml @@ -1,27 +1,8 @@ - +Copyright © 2022 Collabora Ltd. +SPDX-License-Identifier: MIT +--> diff --git a/src/nouveau/mme/mme_tu104_builder.c b/src/nouveau/mme/mme_tu104_builder.c index 6ff413b..52d1e9a 100644 --- a/src/nouveau/mme/mme_tu104_builder.c +++ b/src/nouveau/mme/mme_tu104_builder.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_builder.h" #include diff --git a/src/nouveau/mme/mme_tu104_builder.h b/src/nouveau/mme/mme_tu104_builder.h index 1cf605b..2605896 100644 --- a/src/nouveau/mme/mme_tu104_builder.h +++ b/src/nouveau/mme/mme_tu104_builder.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #ifndef MME_BUILDER_H #error "This file must only be included by mme_builder.h" #endif diff --git a/src/nouveau/mme/mme_tu104_dump.c b/src/nouveau/mme/mme_tu104_dump.c index 9ce8239..639122f 100644 --- a/src/nouveau/mme/mme_tu104_dump.c +++ b/src/nouveau/mme/mme_tu104_dump.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_tu104.h" #include "mme_tu104_isa.h" diff --git a/src/nouveau/mme/mme_tu104_sim.c b/src/nouveau/mme/mme_tu104_sim.c index d64e068..b7356ce 100644 --- a/src/nouveau/mme/mme_tu104_sim.c +++ b/src/nouveau/mme/mme_tu104_sim.c @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_tu104_sim.h" #include diff --git a/src/nouveau/mme/mme_tu104_sim.h b/src/nouveau/mme/mme_tu104_sim.h index af10ff8..9b03c0c 100644 --- a/src/nouveau/mme/mme_tu104_sim.h +++ b/src/nouveau/mme/mme_tu104_sim.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #ifndef MME_TU104_SIM_H #define MME_TU104_SIM_H diff --git a/src/nouveau/mme/mme_value.h b/src/nouveau/mme/mme_value.h index c369bfd..1a434b9 100644 --- a/src/nouveau/mme/mme_value.h +++ b/src/nouveau/mme/mme_value.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #ifndef MME_VALUE_H #define MME_VALUE_H diff --git a/src/nouveau/mme/tests/mme_builder_test.cpp b/src/nouveau/mme/tests/mme_builder_test.cpp index 513bd89..5cf5114 100644 --- a/src/nouveau/mme/tests/mme_builder_test.cpp +++ b/src/nouveau/mme/tests/mme_builder_test.cpp @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_runner.h" #include "mme_tu104_sim.h" diff --git a/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp b/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp index 8825424..f21fb0a 100644 --- a/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp +++ b/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Mary Guillemard + * SPDX-License-Identifier: MIT + */ #include "mme_runner.h" #include "mme_fermi_sim.h" diff --git a/src/nouveau/mme/tests/mme_runner.cpp b/src/nouveau/mme/tests/mme_runner.cpp index 8dc9926..b9e3193 100644 --- a/src/nouveau/mme/tests/mme_runner.cpp +++ b/src/nouveau/mme/tests/mme_runner.cpp @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_runner.h" #include diff --git a/src/nouveau/mme/tests/mme_runner.h b/src/nouveau/mme/tests/mme_runner.h index e25b107..b2597ae 100644 --- a/src/nouveau/mme/tests/mme_runner.h +++ b/src/nouveau/mme/tests/mme_runner.h @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include #include diff --git a/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp b/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp index 6b1d06e..84b5ef6 100644 --- a/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp +++ b/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp @@ -1,3 +1,7 @@ +/* + * Copyright © 2022 Collabora Ltd. + * SPDX-License-Identifier: MIT + */ #include "mme_runner.h" #include "mme_tu104_sim.h" -- 2.7.4