diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /drivers/gpu/drm/drm_crtc.c | |
| parent | 05e882f890038c702a4f15d385135d03cf74ad48 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 94a768871734..8fab7890a363 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
| @@ -2294,7 +2294,12 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, | |||
| 2294 | } | 2294 | } |
| 2295 | } | 2295 | } |
| 2296 | 2296 | ||
| 2297 | if (connector->funcs->set_property) | 2297 | /* Do DPMS ourselves */ |
| 2298 | if (property == connector->dev->mode_config.dpms_property) { | ||
| 2299 | if (connector->funcs->dpms) | ||
| 2300 | (*connector->funcs->dpms)(connector, (int) out_resp->value); | ||
| 2301 | ret = 0; | ||
| 2302 | } else if (connector->funcs->set_property) | ||
| 2298 | ret = connector->funcs->set_property(connector, property, out_resp->value); | 2303 | ret = connector->funcs->set_property(connector, property, out_resp->value); |
| 2299 | 2304 | ||
| 2300 | /* store the property value if succesful */ | 2305 | /* store the property value if succesful */ |