From c8a0c93fc18f0187525f80d78286163c06527bd5 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Fri, 26 Jan 2024 16:24:46 +0000 Subject: [PATCH] drivers: Drop '-next' from driver names The OOT variants of the host1x and tegra-drm drivers originally had a '-next' suffix in the name to differentiate these from the upstream versions. Now that the OOT drivers are installed under the 'updates' directory, the '-next' suffix can be dropped because 'kmod' will prioritise loading the variant in 'updates' over those built from the kernel tree. Bug 4410785 Change-Id: I29287ddb935b681a5ee8a3326428eba82715da76 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3065465 (cherry picked from commit eee13a1edbb6cbf60cd43a408783cab2cd4da3f2) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3063836 Reviewed-by: svcacv Reviewed-by: Brad Griffis GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/Makefile | 8 ++++---- drivers/gpu/host1x/Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile index dc5d6bf4..4ac56fd8 100644 --- a/drivers/gpu/drm/tegra/Makefile +++ b/drivers/gpu/drm/tegra/Makefile @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only -# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved. ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG ccflags-y += -I$(srctree.nvidia-oot)/drivers/gpu/drm/tegra/include ccflags-y += -I$(srctree.hwpm)/include -tegra-drm-next-y := \ +tegra-drm-y := \ drm.o \ uapi.o \ submit.o \ @@ -37,6 +37,6 @@ tegra-drm-next-y := \ ofa.o \ virt.o -tegra-drm-next-y += trace.o +tegra-drm-y += trace.o -obj-m := tegra-drm-next.o +obj-m := tegra-drm.o diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile index 07026c55..91361405 100644 --- a/drivers/gpu/host1x/Makefile +++ b/drivers/gpu/host1x/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved. -host1x-next-y = \ +host1x-y = \ bus.o \ syncpt.o \ dev.o \ @@ -21,7 +21,7 @@ host1x-next-y = \ hw/host1x07.o \ hw/host1x08.o -host1x-next-$(CONFIG_IOMMU_API) += \ +host1x-$(CONFIG_IOMMU_API) += \ context.o -obj-m := host1x-next.o +obj-m := host1x.o