diff options
author | Martin Peres <martin.peres@ensi-bourges.fr> | 2011-07-09 18:08:41 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 04:01:23 -0500 |
commit | dd1da8de172057b36860f427777ecfa293bb8f6c (patch) | |
tree | d31ad5ed9528cb74843a58dc084e9bcdbe2e7587 /drivers/gpu/drm/nouveau/nouveau_pm.h | |
parent | 6109183794a711d80c08705d477d2a19b437d5c1 (diff) |
drm/nouveau/pm: make clocks_set return an error code clocks_set can fail.
Reporting an error is better than silently refusing to reclock.
V2: Use the same logic on nv40
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h index 5c87afde82d6..41050feb5b90 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.h +++ b/drivers/gpu/drm/nouveau/nouveau_pm.h | |||
@@ -55,7 +55,7 @@ void nv04_pm_clock_set(struct drm_device *, void *); | |||
55 | /* nv40_pm.c */ | 55 | /* nv40_pm.c */ |
56 | int nv40_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); | 56 | int nv40_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); |
57 | void *nv40_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *); | 57 | void *nv40_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *); |
58 | void nv40_pm_clocks_set(struct drm_device *, void *); | 58 | int nv40_pm_clocks_set(struct drm_device *, void *); |
59 | int nv40_pm_pwm_get(struct drm_device *, struct dcb_gpio_entry *, u32*, u32*); | 59 | int nv40_pm_pwm_get(struct drm_device *, struct dcb_gpio_entry *, u32*, u32*); |
60 | int nv40_pm_pwm_set(struct drm_device *, struct dcb_gpio_entry *, u32, u32); | 60 | int nv40_pm_pwm_set(struct drm_device *, struct dcb_gpio_entry *, u32, u32); |
61 | 61 | ||
@@ -70,7 +70,7 @@ int nv50_pm_pwm_set(struct drm_device *, struct dcb_gpio_entry *, u32, u32); | |||
70 | /* nva3_pm.c */ | 70 | /* nva3_pm.c */ |
71 | int nva3_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); | 71 | int nva3_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); |
72 | void *nva3_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *); | 72 | void *nva3_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *); |
73 | void nva3_pm_clocks_set(struct drm_device *, void *); | 73 | int nva3_pm_clocks_set(struct drm_device *, void *); |
74 | 74 | ||
75 | /* nvc0_pm.c */ | 75 | /* nvc0_pm.c */ |
76 | int nvc0_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); | 76 | int nvc0_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); |