Commit 63a613fd authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent c4c21f22

drivers/memory/tegra/tegra114.c

+6 −4
Original line number Diff line number Diff line
@@ -909,16 +909,18 @@ static const struct tegra_smmu_swgroup tegra114_swgroups[] = { 
	{ .name = "tsec",      .swgroup = TEGRA_SWGROUP_TSEC,      .reg = 0x294 },

};



static const unsigned int tegra114_group_display[] = {

static const unsigned int tegra114_group_drm[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

	TEGRA_SWGROUP_G2,

	TEGRA_SWGROUP_NV,

};



static const struct tegra_smmu_group_soc tegra114_groups[] = {

	{

		.name = "display",

		.swgroups = tegra114_group_display,

		.num_swgroups = ARRAY_SIZE(tegra114_group_display),

		.name = "drm",

		.swgroups = tegra114_group_drm,

		.num_swgroups = ARRAY_SIZE(tegra114_group_drm),

	},

};

drivers/memory/tegra/tegra124.c

+6 −4
Original line number Diff line number Diff line
@@ -974,16 +974,18 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { 
	{ .name = "vi",        .swgroup = TEGRA_SWGROUP_VI,        .reg = 0x280 },

};



static const unsigned int tegra124_group_display[] = {

static const unsigned int tegra124_group_drm[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

	TEGRA_SWGROUP_GPU,

	TEGRA_SWGROUP_VIC,

};



static const struct tegra_smmu_group_soc tegra124_groups[] = {

	{

		.name = "display",

		.swgroups = tegra124_group_display,

		.num_swgroups = ARRAY_SIZE(tegra124_group_display),

		.name = "drm",

		.swgroups = tegra124_group_drm,

		.num_swgroups = ARRAY_SIZE(tegra124_group_drm),

	},

};

drivers/memory/tegra/tegra30.c

+7 −4
Original line number Diff line number Diff line
@@ -931,16 +931,19 @@ static const struct tegra_smmu_swgroup tegra30_swgroups[] = { 
	{ .name = "isp",  .swgroup = TEGRA_SWGROUP_ISP,  .reg = 0x258 },

};



static const unsigned int tegra30_group_display[] = {

static const unsigned int tegra30_group_drm[] = {

	TEGRA_SWGROUP_DC,

	TEGRA_SWGROUP_DCB,

	TEGRA_SWGROUP_G2,

	TEGRA_SWGROUP_NV,

	TEGRA_SWGROUP_NV2,

};



static const struct tegra_smmu_group_soc tegra30_groups[] = {

	{

		.name = "display",

		.swgroups = tegra30_group_display,

		.num_swgroups = ARRAY_SIZE(tegra30_group_display),

		.name = "drm",

		.swgroups = tegra30_group_drm,

		.num_swgroups = ARRAY_SIZE(tegra30_group_drm),

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE