diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-16 01:25:25 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:26:49 -0400 |
commit | 855a95e4fc2ac6b758145ca7d6a0c95b66a57ef8 (patch) | |
tree | a8536a4799ee31a97186d44c6bdb5fa90f6e3919 /drivers/gpu/drm/nouveau/nv04_crtc.c | |
parent | f9aafdd30ef8356f0a3690bf9bdd9c6e51b7705c (diff) |
drm/nouveau: make the behaviour of get_pll_limits() consistent
This replaces all the pll_types definitions for ones that match the types
used in the tables in recent VBIOS versions.
get_pll_limits() will now accept either type or register value as input
across all limits table versions, and will store the actual register ID
that a PLL type refers to in the returned structure.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_crtc.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv04_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index 1f0f978d8e9d..ef480281afec 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c | |||
@@ -109,7 +109,7 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod | |||
109 | struct nouveau_pll_vals *pv = ®p->pllvals; | 109 | struct nouveau_pll_vals *pv = ®p->pllvals; |
110 | struct pll_lims pll_lim; | 110 | struct pll_lims pll_lim; |
111 | 111 | ||
112 | if (get_pll_limits(dev, nv_crtc->index ? VPLL2 : VPLL1, &pll_lim)) | 112 | if (get_pll_limits(dev, nv_crtc->index ? PLL_VPLL1 : PLL_VPLL0, &pll_lim)) |
113 | return; | 113 | return; |
114 | 114 | ||
115 | /* NM2 == 0 is used to determine single stage mode on two stage plls */ | 115 | /* NM2 == 0 is used to determine single stage mode on two stage plls */ |