diff options
| author | Daniel Stone <daniels@collabora.com> | 2015-05-25 14:11:52 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-26 09:50:42 -0400 |
| commit | 955f3c334f0fb2b843efad5cc6d3b7e141e9d666 (patch) | |
| tree | a5950f3239adb485d3d1129b66d4419f0d324843 /include/drm | |
| parent | 99cf4a29fa24461bbfe22125967188a18383eb5c (diff) | |
drm/atomic: Add MODE_ID property
Atomic modesetting: now with modesetting support.
v2: Moved drm_atomic_set_mode_prop_for_crtc from previous patch; removed
state->active fiddling, documented return code. Changed property
type to DRM_MODE_PROP_BLOB.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Tested-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_atomic.h | 3 | ||||
| -rw-r--r-- | include/drm/drm_crtc.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 1e8c61f23294..55f46049e4a0 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h | |||
| @@ -113,6 +113,9 @@ int __must_check | |||
| 113 | drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, | 113 | drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, |
| 114 | struct drm_display_mode *mode); | 114 | struct drm_display_mode *mode); |
| 115 | int __must_check | 115 | int __must_check |
| 116 | drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state, | ||
| 117 | struct drm_property_blob *blob); | ||
| 118 | int __must_check | ||
| 116 | drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, | 119 | drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, |
| 117 | struct drm_crtc *crtc); | 120 | struct drm_crtc *crtc); |
| 118 | void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state, | 121 | void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state, |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index c54fa4add792..3b4d8a4a23fb 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
| @@ -1146,6 +1146,7 @@ struct drm_mode_config { | |||
| 1146 | struct drm_property *prop_fb_id; | 1146 | struct drm_property *prop_fb_id; |
| 1147 | struct drm_property *prop_crtc_id; | 1147 | struct drm_property *prop_crtc_id; |
| 1148 | struct drm_property *prop_active; | 1148 | struct drm_property *prop_active; |
| 1149 | struct drm_property *prop_mode_id; | ||
| 1149 | 1150 | ||
| 1150 | /* DVI-I properties */ | 1151 | /* DVI-I properties */ |
| 1151 | struct drm_property *dvi_i_subconnector_property; | 1152 | struct drm_property *dvi_i_subconnector_property; |
