From 9f2ed528c84c9dd893cc6d857004ee80f586b847 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Mon, 17 Jul 2023 10:57:05 +0100 Subject: [PATCH] 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 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2937758 Reviewed-by: Johnny Liu Reviewed-by: Sumit Gupta GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/nvdec.c | 5 ----- drivers/gpu/drm/tegra/nvenc.c | 5 ----- drivers/gpu/drm/tegra/nvjpg.c | 5 ----- drivers/gpu/drm/tegra/vic.c | 5 ----- 4 files changed, 20 deletions(-) diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index 4228e5ad..02fa2dc4 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -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); diff --git a/drivers/gpu/drm/tegra/nvenc.c b/drivers/gpu/drm/tegra/nvenc.c index 19218825..b24955d3 100644 --- a/drivers/gpu/drm/tegra/nvenc.c +++ b/drivers/gpu/drm/tegra/nvenc.c @@ -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); diff --git a/drivers/gpu/drm/tegra/nvjpg.c b/drivers/gpu/drm/tegra/nvjpg.c index e95d9d10..eb476c71 100644 --- a/drivers/gpu/drm/tegra/nvjpg.c +++ b/drivers/gpu/drm/tegra/nvjpg.c @@ -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); diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 04592994..dca653e6 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -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");