From 71ac5316068162c8bd760bef26b58f2bd152bae0 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 14 Jan 2025 10:21:36 +0000 Subject: [PATCH] gpu: host1x-nvhost: Prepare for removing nvhost_t194.h Move the function prototypes declared in nvhost_t194.h into nvhost.h so that we can update the necessary drivers and remove nvhost_t194.h completely. Bug 4472097 Change-Id: I1466561cf2ec98b0552bff84c1e45a52a74a3598 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3283337 Reviewed-by: Mikko Perttunen GVS: buildbot_gerritrpt --- include/linux/nvhost.h | 10 +++++++++- include/linux/nvhost_t194.h | 13 ++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h index 3a4d9fbc..8054cca3 100644 --- a/include/linux/nvhost.h +++ b/include/linux/nvhost.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* SPDX-FileCopyrightText: Copyright (c) 2009-2024 NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. */ +/* SPDX-FileCopyrightText: Copyright (c) 2009-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #ifndef __LINUX_NVHOST_H #define __LINUX_NVHOST_H @@ -222,6 +222,14 @@ int nvhost_syncpt_is_expired_ext(struct platform_device *dev, u32 id, dma_addr_t nvhost_syncpt_address(struct platform_device *engine_pdev, u32 id); int nvhost_syncpt_unit_interface_init(struct platform_device *pdev); void nvhost_syncpt_unit_interface_deinit(struct platform_device *pdev); +int nvhost_syncpt_unit_interface_get_aperture( + struct platform_device *host_pdev, + phys_addr_t *base, + size_t *size); +u32 nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id); +u32 nvhost_syncpt_unit_interface_get_byte_offset_ext( + struct platform_device *host_pdev, + u32 syncpt_id); /* public host1x interrupt management APIs */ int nvhost_intr_register_notifier(struct platform_device *pdev, diff --git a/include/linux/nvhost_t194.h b/include/linux/nvhost_t194.h index 34837b9d..3812e827 100644 --- a/include/linux/nvhost_t194.h +++ b/include/linux/nvhost_t194.h @@ -1,20 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2017-2024, NVIDIA Corporation. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #ifndef __LINUX_NVHOST_T194_H__ #define __LINUX_NVHOST_T194_H__ -int nvhost_syncpt_unit_interface_get_aperture( - struct platform_device *host_pdev, - phys_addr_t *base, - size_t *size); - -u32 nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id); - -u32 nvhost_syncpt_unit_interface_get_byte_offset_ext( - struct platform_device *host_pdev, - u32 syncpt_id); +#include #endif /* __LINUX_NVHOST_T194_H__ */