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

gpu: nvgpu: Migrate to upstream ICC

Browse Source 
Transitioning to the Upstream ICC implementation by using
devm_of_icc_get() api which get's interconnect path from the
interconnect property in DT.

Bug 3997304

Signed-off-by: Johnny Liu <johnliu@nvidia.com>
Change-Id: I84dc43e006ecf84ae3260125367fbd36ba35b38a
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2945210
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Johnny Liu
2023-07-25 05:24:01 +00:00
committed by mobile promotions
parent 385baa8eec
commit 088bb16dd9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
View File

@@ -249,9 +249,13 @@ void ga10b_tegra_scale_init(struct device *dev)
if ((struct icc_path *)profile->private_data) if ((struct icc_path *)profile->private_data)
return; return;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
icc_path_handle = devm_of_icc_get(dev, "write");
#else
icc_path_handle = icc_get(dev, TEGRA_ICC_GPU, TEGRA_ICC_PRIMARY); icc_path_handle = icc_get(dev, TEGRA_ICC_GPU, TEGRA_ICC_PRIMARY);
#endif
if (IS_ERR_OR_NULL(icc_path_handle)) { if (IS_ERR_OR_NULL(icc_path_handle)) {
dev_err(dev, "%s unable to get icc path (err=%ld)\n", dev_info(dev, "%s unable to get icc path (err=%ld)\n",
__func__, PTR_ERR(icc_path_handle)); __func__, PTR_ERR(icc_path_handle));
return; return;
} }
@@ -267,7 +271,9 @@ static void ga10b_tegra_scale_exit(struct device *dev)
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
if (profile && profile->private_data) { if (profile && profile->private_data) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
icc_put((struct icc_path *)profile->private_data); icc_put((struct icc_path *)profile->private_data);
#endif
profile->private_data = NULL; profile->private_data = NULL;
} }
#endif #endif