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 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

host: isp: Deprecate nvhost syncpt unit interface API

Browse Source 
Deprecate the nvhost_syncpt_unit_interface_init API and implement
equivalent functionality in the ISP driver.

Bug 4921461

Change-Id: Ic8a2753b8ac5d6d32fa3fd07e7f2170ce4059c5e
Signed-off-by: Akihiro Mizusawa <amizusawa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3300669
Reviewed-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: FNU Raunak <fraunak@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Chinniah Poosapadi <cpoosapadi@nvidia.com>
This commit is contained in:
Akihiro Mizusawa
2025-02-11 23:45:46 +00:00
committed by Jon Hunter
parent cb4fd77199
commit f97366843c
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/video/tegra/host/isp/isp5.c
View File

@@ -10,6 +10,7 @@
* which is mutually exclusive with host1x-next.h. * which is mutually exclusive with host1x-next.h.
*/ */
#include <linux/host1x-next.h> #include <linux/host1x-next.h>
#include <linux/iommu.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/device.h> #include <linux/device.h>
@@ -48,6 +49,9 @@
struct host_isp5 { struct host_isp5 {
struct platform_device *pdev; struct platform_device *pdev;
struct clk *clk; struct clk *clk;
dma_addr_t syncpt_base;
size_t syncpt_size;
uint32_t syncpt_stride;
}; };
static int isp5_alloc_syncpt(struct platform_device *pdev, static int isp5_alloc_syncpt(struct platform_device *pdev,
@@ -125,6 +129,8 @@ static int isp5_get_syncpt_gos_backing(struct platform_device *pdev,
uint32_t index = GOS_INDEX_INVALID; uint32_t index = GOS_INDEX_INVALID;
uint32_t offset = 0; uint32_t offset = 0;
dma_addr_t addr; dma_addr_t addr;
struct nvhost_device_data *pdata;
struct host_isp5 *isp5;
if (id == 0) { if (id == 0) {
dev_err(&pdev->dev, "%s: syncpt id is invalid\n", __func__); dev_err(&pdev->dev, "%s: syncpt id is invalid\n", __func__);
@@ -136,13 +142,16 @@ static int isp5_get_syncpt_gos_backing(struct platform_device *pdev,
return -EINVAL; return -EINVAL;
} }
addr = nvhost_syncpt_address(pdev, id); pdata = platform_get_drvdata(pdev);
isp5 = pdata->private_data;
addr = isp5->syncpt_base + isp5->syncpt_stride * id;
*syncpt_addr = addr; *syncpt_addr = addr;
*gos_index = index; *gos_index = index;
*gos_offset = offset; *gos_offset = offset;
dev_dbg(&pdev->dev, "%s: id=%u addr=0x%llx gos_idx=%u gos_offset=%u\n", dev_info(&pdev->dev, "%s: id=%u addr=0x%llx gos_idx=%u gos_offset=%u\n",
__func__, id, addr, index, offset); __func__, id, addr, index, offset);
return 0; return 0;
@@ -254,6 +263,9 @@ static int isp5_probe(struct platform_device *pdev)
struct nvhost_device_data *pdata; struct nvhost_device_data *pdata;
struct host_isp5 *isp5; struct host_isp5 *isp5;
int err = 0; int err = 0;
phys_addr_t base;
uint32_t stride;
uint32_t num_syncpts;
err = isp5_priv_early_probe(pdev); err = isp5_priv_early_probe(pdev);
if (err) if (err)
@@ -282,10 +294,25 @@ static int isp5_probe(struct platform_device *pdev)
goto error; goto error;
} }
err = nvhost_syncpt_unit_interface_init(pdev); err = host1x_syncpt_get_shim_info(pdata->host1x, &base, &stride, &num_syncpts);
if (err) if (err)
goto error; goto error;
isp5->syncpt_stride = stride;
isp5->syncpt_size = stride * num_syncpts;
if (iommu_get_domain_for_dev(&pdev->dev)) {
isp5->syncpt_base = dma_map_resource(&pdev->dev, base,
isp5->syncpt_size, DMA_BIDIRECTIONAL,
DMA_ATTR_SKIP_CPU_SYNC);
if (dma_mapping_error(&pdev->dev, isp5->syncpt_base)) {
err = -ENOMEM;
goto error;
}
} else {
isp5->syncpt_base = base;
}
err = isp5_priv_late_probe(pdev); err = isp5_priv_late_probe(pdev);
if (err) if (err)
goto error; goto error;