Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

memory: tegra: Add gr2d and gr3d to DRM IOMMU group

All of the devices making up the Tegra DRM device want to share a single
IOMMU domain. Put them into a single group to allow them to do that.

Signed-off-by: Thierry Reding <treding@nvidia.com>

+19 -12
+6 -4
drivers/memory/tegra/tegra114.c
··· 909 909 { .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 }, 910 910 }; 911 911 912 - static const unsigned int tegra114_group_display[] = { 912 + static const unsigned int tegra114_group_drm[] = { 913 913 TEGRA_SWGROUP_DC, 914 914 TEGRA_SWGROUP_DCB, 915 + TEGRA_SWGROUP_G2, 916 + TEGRA_SWGROUP_NV, 915 917 }; 916 918 917 919 static const struct tegra_smmu_group_soc tegra114_groups[] = { 918 920 { 919 - .name = "display", 920 - .swgroups = tegra114_group_display, 921 - .num_swgroups = ARRAY_SIZE(tegra114_group_display), 921 + .name = "drm", 922 + .swgroups = tegra114_group_drm, 923 + .num_swgroups = ARRAY_SIZE(tegra114_group_drm), 922 924 }, 923 925 }; 924 926
+6 -4
drivers/memory/tegra/tegra124.c
··· 974 974 { .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, 975 975 }; 976 976 977 - static const unsigned int tegra124_group_display[] = { 977 + static const unsigned int tegra124_group_drm[] = { 978 978 TEGRA_SWGROUP_DC, 979 979 TEGRA_SWGROUP_DCB, 980 + TEGRA_SWGROUP_GPU, 981 + TEGRA_SWGROUP_VIC, 980 982 }; 981 983 982 984 static const struct tegra_smmu_group_soc tegra124_groups[] = { 983 985 { 984 - .name = "display", 985 - .swgroups = tegra124_group_display, 986 - .num_swgroups = ARRAY_SIZE(tegra124_group_display), 986 + .name = "drm", 987 + .swgroups = tegra124_group_drm, 988 + .num_swgroups = ARRAY_SIZE(tegra124_group_drm), 987 989 }, 988 990 }; 989 991
+7 -4
drivers/memory/tegra/tegra30.c
··· 931 931 { .name = "isp", .swgroup = TEGRA_SWGROUP_ISP, .reg = 0x258 }, 932 932 }; 933 933 934 - static const unsigned int tegra30_group_display[] = { 934 + static const unsigned int tegra30_group_drm[] = { 935 935 TEGRA_SWGROUP_DC, 936 936 TEGRA_SWGROUP_DCB, 937 + TEGRA_SWGROUP_G2, 938 + TEGRA_SWGROUP_NV, 939 + TEGRA_SWGROUP_NV2, 937 940 }; 938 941 939 942 static const struct tegra_smmu_group_soc tegra30_groups[] = { 940 943 { 941 - .name = "display", 942 - .swgroups = tegra30_group_display, 943 - .num_swgroups = ARRAY_SIZE(tegra30_group_display), 944 + .name = "drm", 945 + .swgroups = tegra30_group_drm, 946 + .num_swgroups = ARRAY_SIZE(tegra30_group_drm), 944 947 }, 945 948 }; 946 949