diff options
| author | Daniel Stone <daniels@collabora.com> | 2015-03-19 07:33:26 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-23 18:22:31 +0300 |
| commit | 27798365a60eaa61d8d9010466ffd57368b98ba9 (patch) | |
| tree | f03978f2add0fe4ffd4e7e15a10ce590e97d6658 /drivers/gpu/drm/drm_atomic.c | |
| parent | 8f164ce41d1beaebfde99bcbf8bdaafb868eb7ae (diff) | |
| download | linux-27798365a60eaa61d8d9010466ffd57368b98ba9.tar.xz | |
drm: atomic: Allow setting CRTC active property
Before, we would set the property, but also return -EINVAL because of a
broken fallthrough.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index e7af6b89b392..5d3abe3904f0 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -248,11 +248,14 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, struct drm_mode_config *config = &dev->mode_config; /* FIXME: Mode prop is missing, which also controls ->enable. */ - if (property == config->prop_active) { + if (property == config->prop_active) state->active = val; - } else if (crtc->funcs->atomic_set_property) + else if (crtc->funcs->atomic_set_property) return crtc->funcs->atomic_set_property(crtc, state, property, val); - return -EINVAL; + else + return -EINVAL; + + return 0; } EXPORT_SYMBOL(drm_atomic_crtc_set_property); |