summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaniel Stone2015-05-25 20:11:52 +0200
committerDaniel Vetter2015-05-26 15:50:42 +0200
commit955f3c334f0fb2b843efad5cc6d3b7e141e9d666 (patch)
treea5950f3239adb485d3d1129b66d4419f0d324843 /include
parentdrm/atomic: Add current-mode blob to CRTC state (diff)
downloadkernel-qcow2-linux-955f3c334f0fb2b843efad5cc6d3b7e141e9d666.tar.gz
kernel-qcow2-linux-955f3c334f0fb2b843efad5cc6d3b7e141e9d666.tar.xz
kernel-qcow2-linux-955f3c334f0fb2b843efad5cc6d3b7e141e9d666.zip
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')
-rw-r--r--include/drm/drm_atomic.h3
-rw-r--r--include/drm/drm_crtc.h1
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
drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
struct drm_display_mode *mode);
int __must_check
+drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
+ struct drm_property_blob *blob);
+int __must_check
drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
struct drm_crtc *crtc);
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 {
struct drm_property *prop_fb_id;
struct drm_property *prop_crtc_id;
struct drm_property *prop_active;
+ struct drm_property *prop_mode_id;
/* DVI-I properties */
struct drm_property *dvi_i_subconnector_property;