mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-24 10:11:26 +03:00
drm/tegra: Fix interconnect support for Linux v6.2+
Interconnect support for multimedia engines is disable for Linux v6.2 kernels. Rather than always disabling interconnect support for these kernels, we just need to ensure the necessary upstream kernel patches are in place for Linux v6.2 kernels. Therefore, enable interconnect support for all kernels. Bug 4097374 Change-Id: Ibceb866ba239454a131543cdff90e68007b28942 Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2937758 Reviewed-by: Johnny Liu <johnliu@nvidia.com> Reviewed-by: Sumit Gupta <sumitg@nvidia.com> GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
32221411a4
commit
9f2ed528c8
@@ -785,15 +785,10 @@ static int nvdec_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
nvdec->icc_write = devm_of_icc_get(dev, "write");
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
|
||||
if (IS_ERR(nvdec->icc_write)) {
|
||||
dev_err(&pdev->dev, "failed to get icc write handle\n");
|
||||
return PTR_ERR(nvdec->icc_write);
|
||||
}
|
||||
#else
|
||||
if (IS_ERR(nvdec->icc_write))
|
||||
nvdec->icc_write = NULL;
|
||||
#endif
|
||||
|
||||
platform_set_drvdata(pdev, nvdec);
|
||||
|
||||
|
||||
@@ -651,15 +651,10 @@ static int nvenc_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
|
||||
nvenc->icc_write = devm_of_icc_get(dev, "write");
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
|
||||
if (IS_ERR(nvenc->icc_write)) {
|
||||
dev_err(&pdev->dev, "failed to get icc write handle\n");
|
||||
return PTR_ERR(nvenc->icc_write);
|
||||
}
|
||||
#else
|
||||
if (IS_ERR(nvenc->icc_write))
|
||||
nvenc->icc_write = NULL;
|
||||
#endif
|
||||
|
||||
platform_set_drvdata(pdev, nvenc);
|
||||
|
||||
|
||||
@@ -638,15 +638,10 @@ static int nvjpg_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
|
||||
nvjpg->icc_write = devm_of_icc_get(dev, "write");
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
|
||||
if (IS_ERR(nvjpg->icc_write)) {
|
||||
dev_err(&pdev->dev, "failed to get icc write handle\n");
|
||||
return PTR_ERR(nvjpg->icc_write);
|
||||
}
|
||||
#else
|
||||
if (IS_ERR(nvjpg->icc_write))
|
||||
nvjpg->icc_write = NULL;
|
||||
#endif
|
||||
|
||||
platform_set_drvdata(pdev, nvjpg);
|
||||
|
||||
|
||||
@@ -705,15 +705,10 @@ static int vic_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
vic->icc_write = devm_of_icc_get(dev, "write");
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
|
||||
if (IS_ERR(vic->icc_write)) {
|
||||
dev_err(&pdev->dev, "failed to get icc write handle\n");
|
||||
return PTR_ERR(vic->icc_write);
|
||||
}
|
||||
#else
|
||||
if (IS_ERR(vic->icc_write))
|
||||
vic->icc_write = NULL;
|
||||
#endif
|
||||
|
||||
if (!dev->pm_domain) {
|
||||
vic->rst = devm_reset_control_get(dev, "vic");
|
||||
|
||||
Reference in New Issue
Block a user