nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvdla: Replace nvhost_syncpt_unit_* API Usage

Browse Source 
Replace the deprecated nvhost_syncpt_unit_interface_init()
function with host1x_syncpt_get_shim_info() in
the NVDLA driver. This change:

1. Adds a local def of struct nvhost_syncpt_interface
2. Implements the functionality in nvdla_sync_syncpt.c
3. Adds necessary include files for IOMMU and DMA mapping

This change ensures the NVDLA driver continues to work
correctly with the host1x driver while removing the
dependency on deprecated functions.

Bug 4921461

Jira HOSTX-5963

Change-Id: I085a24045758a2ecbb026654c3ee57a8dfda9271
Signed-off-by: Mainak Sen <msen@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3320585
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Mitch Harwell <mharwell@nvidia.com>
Reviewed-by: Arvind M <am@nvidia.com>
This commit is contained in:
Mainak Sen
2025-03-17 08:25:30 +00:00
committed by Jon Hunter
parent 0a60f5f169
commit 303edb8a0e
3 changed files with 71 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/tegra/host/nvdla/port/device/nvdla_device_host1x.c
View File

@@ -9,6 +9,7 @@
#include "../../dla_queue.h"
#include "../../nvdla_debug.h"
#include <linux/host1x-next.h>
#include <linux/clk.h>
#include <linux/nvhost.h>
#include <linux/of.h>

1
drivers/video/tegra/host/nvdla/port/nvdla_host_wrapper.h
View File

@@ -20,6 +20,7 @@ struct nvhost_notification {
};
#else
#include <linux/host1x-next.h>
#include <linux/nvhost.h>
#endif /* NVDLA_HAVE_CONFIG_AXI */

75
drivers/video/tegra/host/nvdla/port/sync/nvdla_sync_syncpt.c
View File

@@ -11,6 +11,15 @@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/iommu.h>
#include <linux/dma-mapping.h>
/* Local definition of nvhost_syncpt_interface structure */
struct nvhost_syncpt_interface {
dma_addr_t base;
size_t size;
u32 page_size;
};
struct nvdla_sync_device {
struct platform_device *pdev;
@@ -25,8 +34,13 @@ struct nvdla_sync_context {
struct nvdla_sync_device *nvdla_sync_device_create_syncpoint(
struct platform_device *pdev)
{
int32_t err;
struct nvhost_device_data *pdata = NULL;
struct nvhost_syncpt_interface *syncpt_if = NULL;
struct nvdla_sync_device *device = NULL;
phys_addr_t base;
u32 stride;
u32 num_syncpts;
int32_t err;
if (pdev == NULL)
goto fail;
@@ -38,17 +52,48 @@ struct nvdla_sync_device *nvdla_sync_device_create_syncpoint(
goto fail;
}
err = nvhost_syncpt_unit_interface_init(pdev);
if (err < 0) {
nvdla_dbg_err(pdev, "failed to init syncpt interface. err=%d\n",
err);
/* Replace nvhost_syncpt_unit_interface_init with host1x_syncpt_get_shim_info */
pdata = platform_get_drvdata(pdev);
syncpt_if = devm_kzalloc(&pdev->dev, sizeof(*syncpt_if), GFP_KERNEL);
if (!syncpt_if) {
err = -ENOMEM;
goto free_device;
}
err = host1x_syncpt_get_shim_info(pdata->host1x, &base, &stride, &num_syncpts);
if (err) {
nvdla_dbg_err(pdev, "failed to get syncpt shim info. err=%d\n", err);
goto free_syncpt_if;
}
syncpt_if->base = base;
syncpt_if->size = stride * num_syncpts;
syncpt_if->page_size = stride;
/* If IOMMU is enabled, map it into the device memory */
if (iommu_get_domain_for_dev(&pdev->dev)) {
syncpt_if->base = dma_map_resource(&pdev->dev, base,
syncpt_if->size,
DMA_BIDIRECTIONAL,
DMA_ATTR_SKIP_CPU_SYNC);
if (dma_mapping_error(&pdev->dev, syncpt_if->base)) {
err = -ENOMEM;
goto free_syncpt_if;
}
}
pdata->syncpt_unit_interface = syncpt_if;
dev_info(&pdev->dev,
"syncpt_unit_base %llx syncpt_unit_size %zx size %x\n",
base, syncpt_if->size, syncpt_if->page_size);
device->pdev = pdev;
return device;
free_syncpt_if:
devm_kfree(&pdev->dev, syncpt_if);
free_device:
vfree(device);
fail:
@@ -57,13 +102,31 @@ fail:
void nvdla_sync_device_destroy(struct nvdla_sync_device *device)
{
struct nvhost_syncpt_interface *syncpt_if;
struct nvhost_device_data *pdata;
struct platform_device *pdev;
if (device == NULL)
goto done;
if (device->pdev == NULL)
goto free_device;
nvhost_syncpt_unit_interface_deinit(device->pdev);
pdev = device->pdev;
pdata = platform_get_drvdata(pdev);
syncpt_if = pdata->syncpt_unit_interface;
if (syncpt_if) {
/* Unmap IOMMU resources if needed */
if (iommu_get_domain_for_dev(&pdev->dev)) {
dma_unmap_resource(&pdev->dev, syncpt_if->base, syncpt_if->size,
DMA_BIDIRECTIONAL, DMA_ATTR_SKIP_CPU_SYNC);
}
/* Free the syncpt_if memory */
devm_kfree(&pdev->dev, syncpt_if);
pdata->syncpt_unit_interface = NULL;
}
free_device:
device->pdev = NULL;