Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v6.0.14 2022-12-02T16:43:16+00:00 2022-12-02T16:43:16+00:00 Robin Murphy robin.murphy@arm.com 2022-10-20T14:23:40+00:00 urn:sha1:aa8928fcdd934a00e605105de2b5b31d4b372436 [ Upstream commit c2418f911a31a266af4fbaca998dc73d3676475a ] Since commit c7e3ca515e78 ("iommu/tegra: gart: Do not register with bus") quite some time ago, the GART driver has effectively disabled itself to avoid issues with the GPU driver expecting it to work in ways that it doesn't. As of commit 57365a04c921 ("iommu: Move bus setup to IOMMU device registration") that bodge no longer works, but really the GPU driver should be responsible for its own behaviour anyway. Make the workaround explicit. Reported-by: Jon Hunter <jonathanh@nvidia.com> Suggested-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org> 2022-07-12T06:50:05+00:00 Dave Airlie airlied@redhat.com 2022-07-12T05:50:41+00:00 urn:sha1:8daecf611258d252b3107132d0143752b2e186fc drm/tegra: Changes for v5.20-rc1 The bulk of these changes adds support for context isolation for the various supported host1x engines, as well as support for the hardware found on the new Tegra234 SoC generation. There's also a couple of fixes and cleanups. To round things off, the device tree bindings are converted to the new json-schema format that allows DTBs to be validated. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thierry Reding <thierry.reding@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220708181136.673789-1-thierry.reding@gmail.com 2022-07-08T15:54:42+00:00 Lv Ruyi lv.ruyi@zte.com.cn 2022-04-21T08:45:42+00:00 urn:sha1:135f4c551d51065ee2d0677bf5344a89767e9d9b Use the devm_platform_ioremap_resource() helper instead of calling platform_get_resource() and devm_ioremap_resource() separately. Make the code simpler without functional changes. Reported-by: Zeal Robot <zealci@zte.com.cn> Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T15:01:15+00:00 Robin Murphy robin.murphy@arm.com 2022-04-11T19:49:10+00:00 urn:sha1:7ac1a36a9823a573ad23ece58007a74b8089fe16 Even though the IOVA API never actually needed it, iova.h is still carrying an include of dma-mapping.h, now solely for the sake of not breaking tegra-drm. Fix that properly. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:49:48+00:00 Dmitry Osipenko dmitry.osipenko@collabora.com 2022-06-28T22:42:39+00:00 urn:sha1:c7860cbee9989882d2908682526a5ef617523cfe The code assumes that Tegra GEM is permanently vmapped, which is not true for the scattered buffers. After converting Tegra video decoder driver to V4L API, we're now getting a BUG_ON from dma-buf core on playing video using libvdpau-tegra on T30+ because tegra_gem_prime_vmap() sets vaddr to NULL. Older pre-V4L video decoder driver wasn't vmapping dma-bufs. Fix it by actually vmapping the exported GEMs. Cc: stable@vger.kernel.org Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:39:19+00:00 YueHaibing yuehaibing@huawei.com 2022-03-05T12:32:00+00:00 urn:sha1:b5d5288a46876f6767950449aea310f71ac86277 drivers/gpu/drm/tegra/vic.c:326:12: error: ‘vic_runtime_suspend’ defined but not used [-Werror=unused-function] static int vic_runtime_suspend(struct device *dev) ^~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/tegra/vic.c:292:12: error: ‘vic_runtime_resume’ defined but not used [-Werror=unused-function] static int vic_runtime_resume(struct device *dev) ^~~~~~~~~~~~~~~~~~ Mark it as __maybe_unused. Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:27:53+00:00 Mikko Perttunen mperttunen@nvidia.com 2022-06-27T14:20:08+00:00 urn:sha1:9550669c197510b9f994102280da7fc0ab468d05 Add Tegra234 support for VIC. It is backwards compatible with Tegra194. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:27:52+00:00 Mikko Perttunen mperttunen@nvidia.com 2022-06-27T14:19:54+00:00 urn:sha1:bf0297ac77f3c3187a79a612082ce7ddb64c1e4b Implement the get_streamid_offset and can_use_memory_ctx callbacks required for supporting context isolation. Since old firmware on VIC cannot support context isolation without hacks that we don't want to implement, check the firmware binary to see if context isolation should be enabled. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:27:52+00:00 Mikko Perttunen mperttunen@nvidia.com 2022-06-27T14:19:53+00:00 urn:sha1:e09db97889ec647ad373f7a7422c83099c6120c5 For engines that support context isolation, allocate a context when opening a channel, and set up stream ID offset and context fields when submitting a job. As of this commit, the stream ID offset and fallback stream ID are not used when context isolation is disabled. However, with upcoming patches that enable a full featured job opcode sequence, these will be necessary. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> 2022-07-08T14:27:52+00:00 Mikko Perttunen mperttunen@nvidia.com 2022-06-27T14:19:52+00:00 urn:sha1:88c0292f023da4e4753a271430a36a66e6fb974f NVDEC's TRANSCFG register is at a different offset than VIC. This becomes a problem now when context isolation is enabled and the reset value of the register is no longer sufficient. Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>