Fixes crash during reclocking. Call Trace: pll_calc == NULL calc_pll calc_mclk nv50_pm_clocks_pre nouveau_pm_perflvl_set nouveau_pm_trigger nouveau_pm_profile_set nouveau_pm_set_perflvl dev_attr_store sysfs_write_file vfs_write sys_write system_call_fastpath Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com> --- It's weird nobody noticed this... nva3+ code does not set this hook either, but there's no existing function to wire up... --- drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c index fd181fb..f4147f6 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c @@ -90,6 +90,7 @@ nv50_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return ret; priv->base.pll_set = nv50_clock_pll_set; + priv->base.pll_calc = nv04_clock_pll_calc; return 0; } -- 1.7.12
On Mon, Oct 08, 2012 at 12:49:27AM +0200, Marcin Slusarz wrote:> Fixes crash during reclocking. > Call Trace: > pll_calc == NULL > calc_pll > calc_mclk > nv50_pm_clocks_pre > nouveau_pm_perflvl_set > nouveau_pm_trigger > nouveau_pm_profile_set > nouveau_pm_set_perflvl > dev_attr_store > sysfs_write_file > vfs_write > sys_write > system_call_fastpath > > Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com> > --- > > It's weird nobody noticed this... nva3+ code does not set this hook either, > but there's no existing function to wire up... >And it seems to crash in the same way, see: http://www.phoronix.com/image-viewer.php?id=ubuntu_1210_nouvre&image=ubuntu_nouveau_pointer_lrg BTW, reclocking crashes without this patch: https://gitorious.org/linux-nouveau-pm/linux-nouveau-pm/commit/f3ed9b23ee611891166da9bac792a22844217c7a Applying this patch: https://gitorious.org/linux-nouveau-pm/linux-nouveau-pm/commit/abdd905d2bf362d48c125fd7c556c54c7ae1cbb9 would be good too, because perflvl module option is useless without it. Marcin
Possibly Parallel Threads
- [PATCH] drm/nouveau: add missing pll_calc calls
- [PATCH] drm/nouveau/nv50: Reclock when memory was stolen
- [NOT for merge] Patches that reduce power usage on NV86
- [Bug 66176] New: nouveau.perflvl kernel parameter doesn't work
- [PATCH v2 4/4] drm/nouveau: gpu lockup recovery