From 919a717ba4c734821db8d9eb7ac77eaca8ca5987 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 6 Sep 2023 10:38:28 -0500
Subject: [PATCH] nouveau/nil: SPDX everything

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25085>
---
 src/nouveau/nil/meson.build     | 19 +------------------
 src/nouveau/nil/nil_format.c    |  4 ++++
 src/nouveau/nil/nil_format.h    |  4 ++++
 src/nouveau/nil/nil_image.c     |  4 ++++
 src/nouveau/nil/nil_image.h     |  4 ++++
 src/nouveau/nil/nil_image_tic.c |  4 ++++
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/nouveau/nil/meson.build b/src/nouveau/nil/meson.build
index b5bcc292e8c..227f22ce92c 100644
--- a/src/nouveau/nil/meson.build
+++ b/src/nouveau/nil/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
 
 libnil_files = files(
   'nil_format.c',
diff --git a/src/nouveau/nil/nil_format.c b/src/nouveau/nil/nil_format.c
index 5b70456b6b9..31f44c3ebe5 100644
--- a/src/nouveau/nil/nil_format.c
+++ b/src/nouveau/nil/nil_format.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright © 2022 Collabora Ltd.
+ * SPDX-License-Identifier: MIT
+ */
 #include "nil_format.h"
 
 #include "nouveau_device.h"
diff --git a/src/nouveau/nil/nil_format.h b/src/nouveau/nil/nil_format.h
index f0ecc3c885f..96cbaccd756 100644
--- a/src/nouveau/nil/nil_format.h
+++ b/src/nouveau/nil/nil_format.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright © 2022 Collabora Ltd.
+ * SPDX-License-Identifier: MIT
+ */
 #ifndef NIL_FORMAT_H
 #define NIL_FORMAT_H
 
diff --git a/src/nouveau/nil/nil_image.c b/src/nouveau/nil/nil_image.c
index ccc36aeb0ef..bc8b840ea6a 100644
--- a/src/nouveau/nil/nil_image.c
+++ b/src/nouveau/nil/nil_image.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright © 2022 Collabora Ltd.
+ * SPDX-License-Identifier: MIT
+ */
 #include "nil_image.h"
 
 #include "util/u_math.h"
diff --git a/src/nouveau/nil/nil_image.h b/src/nouveau/nil/nil_image.h
index 87f03408d74..0c7a70787dc 100644
--- a/src/nouveau/nil/nil_image.h
+++ b/src/nouveau/nil/nil_image.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright © 2022 Collabora Ltd.
+ * SPDX-License-Identifier: MIT
+ */
 #ifndef NIL_IMAGE_H
 #define NIL_IMAGE_H
 
diff --git a/src/nouveau/nil/nil_image_tic.c b/src/nouveau/nil/nil_image_tic.c
index 63b5d6a9dd9..27b6d1f8245 100644
--- a/src/nouveau/nil/nil_image_tic.c
+++ b/src/nouveau/nil/nil_image_tic.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright © 2022 Collabora Ltd.
+ * SPDX-License-Identifier: MIT
+ */
 #include "nil_image.h"
 
 #include "nil_format.h"