diff options
author | Daniel Stone <daniels@collabora.com> | 2015-03-19 00:33:25 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-23 11:22:31 -0400 |
commit | 8f164ce41d1beaebfde99bcbf8bdaafb868eb7ae (patch) | |
tree | ec5eb5f7ea1daf262cb7c2489f89aa49addbd7a7 | |
parent | 5a27528ade3f5714e565db3c0dd35b6b3f7c1f31 (diff) |
drm: atomic: Expose CRTC active property
Active was here, and we allowed users to set it, but not to get it as
well.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index a6caaae40b9e..e7af6b89b392 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
@@ -266,9 +266,17 @@ int drm_atomic_crtc_get_property(struct drm_crtc *crtc, | |||
266 | const struct drm_crtc_state *state, | 266 | const struct drm_crtc_state *state, |
267 | struct drm_property *property, uint64_t *val) | 267 | struct drm_property *property, uint64_t *val) |
268 | { | 268 | { |
269 | if (crtc->funcs->atomic_get_property) | 269 | struct drm_device *dev = crtc->dev; |
270 | struct drm_mode_config *config = &dev->mode_config; | ||
271 | |||
272 | if (property == config->prop_active) | ||
273 | *val = state->active; | ||
274 | else if (crtc->funcs->atomic_get_property) | ||
270 | return crtc->funcs->atomic_get_property(crtc, state, property, val); | 275 | return crtc->funcs->atomic_get_property(crtc, state, property, val); |
271 | return -EINVAL; | 276 | else |
277 | return -EINVAL; | ||
278 | |||
279 | return 0; | ||
272 | } | 280 | } |
273 | 281 | ||
274 | /** | 282 | /** |