diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_drv.c b/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
index 469e9ab8300..dac37a42898 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
@@ -3,7 +3,8 @@
  * A GEM style (optionally CMA backed) device manager for ZynQ based
  * OpenCL accelerators.
  *
- * Copyright (C) 2016-2021 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Authors:
  *    Sonal Santan <sonal.santan@xilinx.com>
diff --git a/src/runtime_src/core/pcie/driver/aws/kernel/mgmt/mgmt-core.h b/src/runtime_src/core/pcie/driver/aws/kernel/mgmt/mgmt-core.h
index a892779e83e..28d2af21ef1 100644
--- a/src/runtime_src/core/pcie/driver/aws/kernel/mgmt/mgmt-core.h
+++ b/src/runtime_src/core/pcie/driver/aws/kernel/mgmt/mgmt-core.h
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2017-2018, Xilinx Inc
+ *  Copyright (C) 2017-2022, Xilinx Inc
+ *  Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by the Free Software Foundation;
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_request.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_request.c
index 09e5743d2ad..eb9aba47340 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_request.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_request.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-present,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is licensed under both the BSD-style license (found in the
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_st_c2h.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_st_c2h.c
index e8e4e55a6b4..b3b693c8118 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_st_c2h.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/qdma_st_c2h.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-present,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is free software; you can redistribute it and/or modify it
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/xdev.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/xdev.c
index a615cc63e69..8688476ded6 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/xdev.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma/xdev.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-present,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is free software; you can redistribute it and/or modify it
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/libqdma_export.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/libqdma_export.c
index cbddba623cf..a0de64484de 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/libqdma_export.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/libqdma_export.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-2020,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is free software; you can redistribute it and/or modify it
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/qdma_st_c2h.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/qdma_st_c2h.c
index a364d3ddeef..b7e00134e09 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/qdma_st_c2h.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/qdma_st_c2h.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-2020,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is free software; you can redistribute it and/or modify it
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/xdev.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/xdev.c
index 45bf4283810..a626d108616 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/xdev.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma4/xdev.c
@@ -1,7 +1,8 @@
 /*
  * This file is part of the Xilinx DMA IP Core driver for Linux
  *
- * Copyright (c) 2017-2020,  Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * This source code is free software; you can redistribute it and/or modify it
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c b/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c
index 2f9728e8249..d3414a709cd 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c
@@ -1,7 +1,9 @@
 /*
  * Simple Driver for Management PF
  *
- * Copyright (C) 2017-2020 Xilinx, Inc.
+ * Copyright (C) 2017-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Code borrowed from Xilinx SDAccel XDMA driver
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c
index d8cf1e17cde..244f9279e20 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c
index 9d977438c15..d9121ca851a 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c
index cafb36d16c3..2a7a40ef4ba 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/fmgr.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/fmgr.c
index 75a886bcfbd..359756735d7 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/fmgr.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/fmgr.c
@@ -1,7 +1,9 @@
 /*
  * FPGA Manager bindings for XRT driver
  *
- * Copyright (C) 2019 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2019-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Sonal Santan
  *          Jan Stephan <j.stephan@hzdr.de>
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c
index 0c029daebaa..b9481dcb4c0 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma.c
index 265d953f0db..22162253d54 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2016-2018 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Lizhi.Hou@Xilinx.com
  *          Jan Stephan <j.stephan@hzdr.de>
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma4.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma4.c
index 4b98530e4df..42f7ca622bb 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma4.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma4.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020- Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Lizhi.Hou@Xilinx.com
  *          Jan Stephan <j.stephan@hzdr.de>
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c
index b60450c25e7..2df7a5a9c91 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c
index 31fe78669d1..d4f5e25281a 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c
index d4b929e4ee4..0c5d2ce67e8 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c
index bae4882b6b7..0e26f97dab9 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2020-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Chien-Wei Lan <chienwei@xilinx.com>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/ulite.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/ulite.c
index 42ddff3c16c..ef87359abd7 100755
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/ulite.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/ulite.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2006 Peter Korsgaard <jacmet@sunsite.dk>
  * Copyright (C) 2007 Secret Lab Technologies Ltd.
  * Copyright (C) 2020 Chien-Wei Lan <chienwei@xilinx.com>
+ * Copyright (c) 2024, Advanced Micro Devices, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -338,13 +339,13 @@ static void ulite_shutdown(struct uart_port *port)
 	mutex_unlock(&pdata->lock);
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 1, 0)) || defined(RHEL_9_2_GE)
-static void ulite_set_termios(struct uart_port *port, struct ktermios *termios,
-			      const struct ktermios *old)
-#else
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 1, 0)) || defined(RHEL_9_2_GE)
+static void ulite_set_termios(struct uart_port *port, struct ktermios *termios,
+			      const struct ktermios *old)
+#else
 static void ulite_set_termios(struct uart_port *port, struct ktermios *termios,
 			      struct ktermios *old)
-#endif
+#endif
 {
 	unsigned long flags;
 	unsigned int baud;
@@ -554,39 +555,39 @@ static int ulite_probe(struct platform_device *pdev)
 	return ret;
 }
 
-/*
- * Sometime in Kernel version 6.5+ the platform_driver probe function will have
- * its return code changed from `int` to `void`. This is to enforce the notion
- * that the returned error code does nothing.
- * For now, older drivers should handle the error within this function and return
- * anything. Once the conversion of the return type is complete we must update
- * the return type from int to void and change all instances of `return 0` to
- * `return`.
- * https://elixir.bootlin.com/linux/latest/source/include/linux/platform_device.h#L211
- */
+/*
+ * Sometime in Kernel version 6.5+ the platform_driver probe function will have
+ * its return code changed from `int` to `void`. This is to enforce the notion
+ * that the returned error code does nothing.
+ * For now, older drivers should handle the error within this function and return
+ * anything. Once the conversion of the return type is complete we must update
+ * the return type from int to void and change all instances of `return 0` to
+ * `return`.
+ * https://elixir.bootlin.com/linux/latest/source/include/linux/platform_device.h#L211
+ */
 static int ulite_remove(struct platform_device *pdev)
 {
 	struct uart_port *port = platform_get_drvdata(pdev);
 	struct uartlite_data *pdata;
 
 	if (!port)
-		return 0;
+		return 0;
 
 	sysfs_remove_group(&pdev->dev.kobj, &ulite_attr_group);
 
 	pdata = port->private_data;
 	if (!pdata)
-		return 0;
+		return 0;
 
 	atomic_set(&pdata->console_opened, 0);
 	if (pdata->thread)
 		kthread_stop(pdata->thread);
 
-	uart_remove_one_port(pdata->xcl_ulite_driver, port);
+	uart_remove_one_port(pdata->xcl_ulite_driver, port);
 	platform_set_drvdata(pdev, NULL);
 	port->mapbase = 0;
 
-	return 0;
+	return 0;
 }
 
 struct xocl_drv_private ulite_priv = {
@@ -630,4 +631,4 @@ void __exit xocl_fini_ulite(void)
 {
 	platform_driver_unregister(&ulite_platform_driver);
 	uart_unregister_driver(&xcl_ulite_driver);
-}
+}
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xiic.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xiic.c
index a7a447b73a6..0fde8efc8ff 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xiic.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xiic.c
@@ -1,6 +1,7 @@
 /**
  *  Copyright (C) 2017 Xilinx, Inc. All rights reserved.
  *  Copyright (c) 2009-2010 Intel Corporation
+ *  Copyright (c) 2024, Advanced Micro Devices, Inc.
  *
  *  I2C driver module
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c
index 34e1dacca11..49b895d6980 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2016-2019 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors:
  *    Sonal Santan <sonal.santan@xilinx.com>
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h
index 396e3e3ecf9..d2e1b24596d 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2016-2018 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors:
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
index a933b7fa74c..617a1d49be9 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
@@ -1,7 +1,9 @@
 /*
  * A GEM style device manager for PCIe based OpenCL accelerators.
  *
- * Copyright (C) 2016-2021 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Jan Stephan <j.stephan@hzdr.de>
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c
index d3a547a1e82..7b4a872fdcc 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2016-2020 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Lizhi.Hou@xilinx.com
  *
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h
index b4d2c50f4b0..0479f8fdf2f 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2016-2021 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2016-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Authors: Lizhi.Hou@Xilinx.com
  *          Jan Stephan <j.stephan@hzdr.de>
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
index 2ba47a4b160..e4b8e44481a 100644
--- a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
+++ b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
@@ -1,5 +1,7 @@
 /**
- * Copyright (C) 2019-2021 Xilinx, Inc
+ * Copyright (C) 2019-2022, Xilinx Inc
+ * Copyright (C) 2022-present Advanced Micro Devices, Inc.
+ * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
  * not use this file except in compliance with the License. A copy of the
diff --git a/src/xma/include/app/xmabuffers.h b/src/xma/include/app/xmabuffers.h
index 0b69ce46e51..bc24bd99541 100644
--- a/src/xma/include/app/xmabuffers.h
+++ b/src/xma/include/app/xmabuffers.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/include/lib/xma_utils.hpp b/src/xma/include/lib/xma_utils.hpp
index 7c3a1329543..f98ec7918e9 100644
--- a/src/xma/include/lib/xma_utils.hpp
+++ b/src/xma/include/lib/xma_utils.hpp
@@ -1,5 +1,6 @@
 /**
- * Copyright (C) 2019 Xilinx, Inc
+ * Copyright (C) 2019-2022 Xilinx, Inc
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
  * not use this file except in compliance with the License. A copy of the
diff --git a/src/xma/src/xmaapi/xma_utils.cpp b/src/xma/src/xmaapi/xma_utils.cpp
index 33ad9eddeeb..0ab2d6a27c5 100644
--- a/src/xma/src/xmaapi/xma_utils.cpp
+++ b/src/xma/src/xmaapi/xma_utils.cpp
@@ -1,5 +1,6 @@
 /**
- * Copyright (C) 2019 Xilinx, Inc
+ * Copyright (C) 2019-2022 Xilinx, Inc. All rights reserved.
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
  * not use this file except in compliance with the License. A copy of the
diff --git a/src/xma/src/xmaapi/xmaadmin.cpp b/src/xma/src/xmaapi/xmaadmin.cpp
index d547b539eaf..3a1815bda18 100644
--- a/src/xma/src/xmaapi/xmaadmin.cpp
+++ b/src/xma/src/xmaapi/xmaadmin.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/src/xmaapi/xmadecoder.cpp b/src/xma/src/xmaapi/xmadecoder.cpp
index b152035bcfd..00e6bb8382f 100644
--- a/src/xma/src/xmaapi/xmadecoder.cpp
+++ b/src/xma/src/xmaapi/xmadecoder.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/src/xmaapi/xmaencoder.cpp b/src/xma/src/xmaapi/xmaencoder.cpp
index 8fed1bb0ec7..aec6a82b0f5 100644
--- a/src/xma/src/xmaapi/xmaencoder.cpp
+++ b/src/xma/src/xmaapi/xmaencoder.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/src/xmaapi/xmafilter.cpp b/src/xma/src/xmaapi/xmafilter.cpp
index d7f3f2abbef..195f9c26890 100644
--- a/src/xma/src/xmaapi/xmafilter.cpp
+++ b/src/xma/src/xmaapi/xmafilter.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/src/xmaapi/xmakernel.cpp b/src/xma/src/xmaapi/xmakernel.cpp
index 4ca65d1dec3..b3e38652ae1 100644
--- a/src/xma/src/xmaapi/xmakernel.cpp
+++ b/src/xma/src/xmaapi/xmakernel.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/src/xmaapi/xmascaler.cpp b/src/xma/src/xmaapi/xmascaler.cpp
index 0ea7abeb3e2..5b08a7d01bf 100644
--- a/src/xma/src/xmaapi/xmascaler.cpp
+++ b/src/xma/src/xmaapi/xmascaler.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/src/xma/xma_legacy/include/app/xmabuffers.h b/src/xma/xma_legacy/include/app/xmabuffers.h
index 670bef7e896..354eb1fdc07 100644
--- a/src/xma/xma_legacy/include/app/xmabuffers.h
+++ b/src/xma/xma_legacy/include/app/xmabuffers.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2018, Xilinx Inc - All rights reserved
+ * Copyright (C) 2018-2022, Xilinx Inc - All rights reserved
+ * Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
  * Xilinx SDAccel Media Accelerator API
  *
  * Licensed under the Apache License, Version 2.0 (the "License"). You may