search for: tegra_mc

...3 ++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index fe3c44e7e1d1..a2928b4b26fe 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -62,6 +62,27 @@ static const struct of_device_id tegra_mc_of_match[] = { }; MODULE_DEVICE_TABLE(of, tegra_mc_of_match); +int tegra_mc_flush(struct tegra_mc *mc, unsigned int swgroup, bool enable) +{ + int i; + const struct tegra_mc_hr *client; + + if (!mc || !mc->soc->hr_clients || + !mc->soc->ops || !mc->soc->ops->flush) + ret...

...; #include "nouveau_drm.h" > >>>>>>@@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) > >>>>>> reset_control_deassert(gpu->rst); > >>>>>> udelay(10); > >>>>>>+ tegra_mc_flush(gpu->mc, gpu->swgroup, false); > >>>>>>+ udelay(10); > >>>>>>+ > >>>>>> return 0; > >>>>>> err_clamp: > >>>>>>@@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouv...

...a/pmc.h> > >>>> #include "nouveau_drm.h" > >>>>@@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) > >>>> reset_control_deassert(gpu->rst); > >>>> udelay(10); > >>>>+ tegra_mc_flush(gpu->mc, gpu->swgroup, false); > >>>>+ udelay(10); > >>>>+ > >>>> return 0; > >>>> err_clamp: > >>>>@@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) > >>>...

...uveau_drm.h" > > >>>>>>@@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) > > >>>>>> reset_control_deassert(gpu->rst); > > >>>>>> udelay(10); > > >>>>>>+ tegra_mc_flush(gpu->mc, gpu->swgroup, false); > > >>>>>>+ udelay(10); > > >>>>>>+ > > >>>>>> return 0; > > >>>>>> err_clamp: > > >>>>>>@@ -77,6 +82,14 @@ static int nouveau_platfo...

...gt; > >> #include <soc/tegra/pmc.h> > >> #include "nouveau_drm.h" > >>@@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) > >> reset_control_deassert(gpu->rst); > >> udelay(10); > >>+ tegra_mc_flush(gpu->mc, gpu->swgroup, false); > >>+ udelay(10); > >>+ > >> return 0; > >> err_clamp: > >>@@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) > >> { > >> int err; > >>+...

...>>>> #include "nouveau_drm.h" >>>>>> @@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) >>>>>> reset_control_deassert(gpu->rst); >>>>>> udelay(10); >>>>>> + tegra_mc_flush(gpu->mc, gpu->swgroup, false); >>>>>> + udelay(10); >>>>>> + >>>>>> return 0; >>>>>> err_clamp: >>>>>> @@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gp...

...+#include <linux/delay.h> > #include <linux/of.h> > #include <linux/mm.h> > > @@ -959,7 +960,85 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { > { .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, > }; > > +static const struct tegra_mc_hr tegra124_mc_hr[] = { > + {TEGRA_SWGROUP_AFI, 0x200, 0x200, 0}, > + {TEGRA_SWGROUP_AVPC, 0x200, 0x200, 1}, > + {TEGRA_SWGROUP_DC, 0x200, 0x200, 2}, > + {TEGRA_SWGROUP_DCB, 0x200, 0x200, 3}, > + {TEGRA_SWGROUP_HC, 0x200, 0x200, 6}, > + {TE...

Hi, This series includes some pieces of fixes to complete the GK20A power on/off sequences and add the suspend/resume support. The patches 1/11 - 4/11 are based on the linux-next-20141219. The patches 5/11 - 11/11 are based on the branch "linux-3.19" of Ben Skeggs's tree (http://cgit.freedesktop.org/~darktama/nouveau). Thanks, Vince Vince Hsu (4): (linux-next-20141219) ARM:

...gt; > +#include <soc/tegra/mc.h> > #include <soc/tegra/pmc.h> > > #include "nouveau_drm.h" > @@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) > reset_control_deassert(gpu->rst); > udelay(10); > > + tegra_mc_flush(gpu->mc, gpu->swgroup, false); > + udelay(10); > + > return 0; > > err_clamp: > @@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) > { > int err; > > + tegra_mc_flush(gpu->mc, gpu->swgroup, true); &gt...

...include <soc/tegra/pmc.h> >>>> #include "nouveau_drm.h" >>>> @@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) >>>> reset_control_deassert(gpu->rst); >>>> udelay(10); >>>> + tegra_mc_flush(gpu->mc, gpu->swgroup, false); >>>> + udelay(10); >>>> + >>>> return 0; >>>> err_clamp: >>>> @@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) >>>> { >>>>...

...; > > #include <linux/mm.h> > > > > > > @@ -959,7 +960,85 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { > > > { .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, > > > }; > > > > > > +static const struct tegra_mc_hr tegra124_mc_hr[] = { > > > + {TEGRA_SWGROUP_AFI, 0x200, 0x200, 0}, > > > + {TEGRA_SWGROUP_AVPC, 0x200, 0x200, 1}, > > > + {TEGRA_SWGROUP_DC, 0x200, 0x200, 2}, > > > + {TEGRA_SWGROUP_DCB, 0x200, 0x200, 3}, > > > + {TEGRA...

...onsumer.h> #include <soc/tegra/fuse.h> +#include <soc/tegra/mc.h> #include <soc/tegra/pmc.h> #include "nouveau_drm.h" @@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) reset_control_deassert(gpu->rst); udelay(10); + tegra_mc_flush(gpu->mc, gpu->swgroup, false); + udelay(10); + return 0; err_clamp: @@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) { int err; + tegra_mc_flush(gpu->mc, gpu->swgroup, true); + udelay(10); + + err = tegra_powergate_gpu_set_clamp...

...by the Free Software Foundation. */ +#include <linux/delay.h> #include <linux/of.h> #include <linux/mm.h> @@ -959,7 +960,85 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { { .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, }; +static const struct tegra_mc_hr tegra124_mc_hr[] = { + {TEGRA_SWGROUP_AFI, 0x200, 0x200, 0}, + {TEGRA_SWGROUP_AVPC, 0x200, 0x200, 1}, + {TEGRA_SWGROUP_DC, 0x200, 0x200, 2}, + {TEGRA_SWGROUP_DCB, 0x200, 0x200, 3}, + {TEGRA_SWGROUP_HC, 0x200, 0x200, 6}, + {TEGRA_SWGROUP_HDA, 0x200,...

...t; #include <linux/of.h> > > #include <linux/mm.h> > > > > @@ -959,7 +960,85 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { > > { .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, > > }; > > > > +static const struct tegra_mc_hr tegra124_mc_hr[] = { > > + {TEGRA_SWGROUP_AFI, 0x200, 0x200, 0}, > > + {TEGRA_SWGROUP_AVPC, 0x200, 0x200, 1}, > > + {TEGRA_SWGROUP_DC, 0x200, 0x200, 2}, > > + {TEGRA_SWGROUP_DCB, 0x200, 0x200, 3}, > > + {TEGRA_SWGROUP_HC, 0x20...

...gt; >> #include <soc/tegra/pmc.h> >> >> #include "nouveau_drm.h" >> @@ -61,6 +63,9 @@ static int nouveau_platform_power_up(struct nouveau_platform_gpu *gpu) >> reset_control_deassert(gpu->rst); >> udelay(10); >> >> + tegra_mc_flush(gpu->mc, gpu->swgroup, false); >> + udelay(10); >> + >> return 0; >> >> err_clamp: >> @@ -77,6 +82,14 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) >> { >> int err; >> >> + tegra_mc...

...iles changed, 43 insertions(+), 1 deletion(-) > > diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c > index fe3c44e7e1d1..a2928b4b26fe 100644 > --- a/drivers/memory/tegra/mc.c > +++ b/drivers/memory/tegra/mc.c > @@ -62,6 +62,27 @@ static const struct of_device_id tegra_mc_of_match[] = { > }; > MODULE_DEVICE_TABLE(of, tegra_mc_of_match); > > +int tegra_mc_flush(struct tegra_mc *mc, unsigned int swgroup, bool enable) > +{ > + int i; > + const struct tegra_mc_hr *client; > + > + if (!mc || !mc->soc->hr_clients || > + !mc->so...

..., 1 deletion(-) > > > > diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c > > index fe3c44e7e1d1..a2928b4b26fe 100644 > > --- a/drivers/memory/tegra/mc.c > > +++ b/drivers/memory/tegra/mc.c > > @@ -62,6 +62,27 @@ static const struct of_device_id tegra_mc_of_match[] = { > > }; > > MODULE_DEVICE_TABLE(of, tegra_mc_of_match); > > > > +int tegra_mc_flush(struct tegra_mc *mc, unsigned int swgroup, bool enable) > > +{ > > + int i; > > + const struct tegra_mc_hr *client; > > + > > + if (!mc || !mc-...