nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 17:55:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev-main-dla3.13.0' into dev-main

Browse Source 
Jira DLA-6481
see https://git-master.nvidia.com/r/c/linux-nvidia/+/2845208
for merge info

Signed-off-by: Ken Adams <kadams@nvidia.com>
Change-Id: I5be460a545291bb63c1185aab4638c012368b1a1
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2845341
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: Maxim Grigoriev (SW-GPU) <maximg@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Maxim Grigoriev (SW-GPU) <maximg@nvidia.com>
This commit is contained in:
Ken Adams
2023-01-17 21:35:15 +00:00
committed by Laxman Dewangan
parent 49361a4f9a
commit aeed9dba62
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/tegra/host/nvdla/nvdla.c
View File

@@ -593,7 +593,7 @@ out:
} }
/* Free utilization rate memory */ /* Free utilization rate memory */
void nvdla_free_utilization_rate_memory(struct platform_device *pdev) static void nvdla_free_utilization_rate_memory(struct platform_device *pdev)
{ {
struct nvhost_device_data *pdata = platform_get_drvdata(pdev); struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
struct nvdla_device *nvdla_dev = pdata->private_data; struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -609,7 +609,7 @@ void nvdla_free_utilization_rate_memory(struct platform_device *pdev)
} }
/* Allocate memory to store the resource utilization rate */ /* Allocate memory to store the resource utilization rate */
int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev) static int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev)
{ {
struct nvhost_device_data *pdata = platform_get_drvdata(pdev); struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
struct nvdla_device *nvdla_dev = pdata->private_data; struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -629,7 +629,7 @@ int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev)
} }
/* Free window size memory */ /* Free window size memory */
void nvdla_free_window_size_memory(struct platform_device *pdev) static void nvdla_free_window_size_memory(struct platform_device *pdev)
{ {
struct nvhost_device_data *pdata = platform_get_drvdata(pdev); struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
struct nvdla_device *nvdla_dev = pdata->private_data; struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -645,7 +645,7 @@ void nvdla_free_window_size_memory(struct platform_device *pdev)
} }
/* Allocate memory to store the window size for which the utilization rate is computed */ /* Allocate memory to store the window size for which the utilization rate is computed */
int nvdla_alloc_window_size_memory(struct platform_device *pdev) static int nvdla_alloc_window_size_memory(struct platform_device *pdev)
{ {
struct nvhost_device_data *pdata = platform_get_drvdata(pdev); struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
struct nvdla_device *nvdla_dev = pdata->private_data; struct nvdla_device *nvdla_dev = pdata->private_data;

4
drivers/video/tegra/host/nvdla/nvdla_t194.h
View File

@@ -13,7 +13,7 @@
#include "nvdla_cg_regs.h" #include "nvdla_cg_regs.h"
#include "dla_t19x_fw_version.h" #include "dla_t19x_fw_version.h"
struct nvhost_device_data t19_nvdla0_info = { static struct nvhost_device_data t19_nvdla0_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",
.class = NV_DLA0_CLASS_ID, .class = NV_DLA0_CLASS_ID,
.clocks = { .clocks = {
@@ -49,7 +49,7 @@ struct nvhost_device_data t19_nvdla0_info = {
.firmware_not_in_subdir = true, .firmware_not_in_subdir = true,
}; };
struct nvhost_device_data t19_nvdla1_info = { static struct nvhost_device_data t19_nvdla1_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",
.class = NV_DLA1_CLASS_ID, .class = NV_DLA1_CLASS_ID,
.clocks = { .clocks = {

4
drivers/video/tegra/host/nvdla/nvdla_t234.h
View File

@@ -13,7 +13,7 @@
#include "nvdla_cg_regs.h" #include "nvdla_cg_regs.h"
#include "dla_t23x_fw_version.h" #include "dla_t23x_fw_version.h"
struct nvhost_device_data t23x_nvdla0_info = { static struct nvhost_device_data t23x_nvdla0_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",
.class = NV_DLA0_CLASS_ID, .class = NV_DLA0_CLASS_ID,
.clocks = { .clocks = {
@@ -44,7 +44,7 @@ struct nvhost_device_data t23x_nvdla0_info = {
.firmware_not_in_subdir = true, .firmware_not_in_subdir = true,
}; };
struct nvhost_device_data t23x_nvdla1_info = { static struct nvhost_device_data t23x_nvdla1_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",
.class = NV_DLA1_CLASS_ID, .class = NV_DLA1_CLASS_ID,
.clocks = { .clocks = {