diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-22 09:14:24 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-22 09:14:24 -1000 |
| commit | 0e0f092ef0c474c3996c8e023d1724f4f72132ad (patch) | |
| tree | 75dd885e2d2234fc3175951403fcf9754c617b30 /drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | |
| parent | ef6c5be658f6a70c1256fbd18e18ee0dc24c3386 (diff) | |
| parent | 452f19201f35d20a1a6c9009acbcfa6799163c6a (diff) | |
| download | linux-stericsson-0e0f092ef0c474c3996c8e023d1724f4f72132ad.tar.gz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie.
Small fixes for (mostly Nouveau, some radeon) regressions.
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: use the correct fence implementation for nv50
drm/radeon: add new SI pci id
radeon: add AGPMode 1 quirk for RV250
drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop()
drm/nouveau/bios: fix DCB v1.5 parsing
drm/nouveau: add missing pll_calc calls
drm/nouveau: fix crash with noaccel=1
drm/nv40: allocate ctxprog with kmalloc
drm/nvc0/disp: fix thinko in vblank regression fix..
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c index 5ccce0b17bf3..f6962c9b6c36 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c @@ -79,6 +79,7 @@ nvc0_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return ret; priv->base.pll_set = nvc0_clock_pll_set; + priv->base.pll_calc = nva3_clock_pll_calc; return 0; } |