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>

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 327ccc71012f4d9ea01cf74918cc53baf5610e13..c7e59b074e6251353bfa5ba9f2cd24c07501b5d5 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -338,6 +338,51 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
 }
 EXPORT_SYMBOL(drm_atomic_set_mode_for_crtc);
 
+/**
+ * drm_atomic_set_mode_prop_for_crtc - set mode for CRTC
+ * @state: the CRTC whose incoming state to update
+ * @blob: pointer to blob property to use for mode
+ *
+ * Set a mode (originating from a blob property) on the desired CRTC state.
+ * This function will take a reference on the blob property for the CRTC state,
+ * and release the reference held on the state's existing mode property, if any
+ * was set.
+ *
+ * RETURNS:
+ * Zero on success, error code on failure. Cannot return -EDEADLK.
+ */
+int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
+                                      struct drm_property_blob *blob)
+{
+       if (blob == state->mode_blob)
+               return 0;
+
+       if (state->mode_blob)
+               drm_property_unreference_blob(state->mode_blob);
+       state->mode_blob = NULL;
+
+       if (blob) {
+               if (blob->length != sizeof(struct drm_mode_modeinfo) ||
+                   drm_mode_convert_umode(&state->mode,
+                                          (const struct drm_mode_modeinfo *)
+                                           blob->data))
+                       return -EINVAL;
+
+               state->mode_blob = drm_property_reference_blob(blob);
+               state->enable = true;
+               DRM_DEBUG_ATOMIC("Set [MODE:%s] for CRTC state %p\n",
+                                state->mode.name, state);
+       } else {
+               memset(&state->mode, 0, sizeof(state->mode));
+               state->enable = false;
+               DRM_DEBUG_ATOMIC("Set [NOMODE] for CRTC state %p\n",
+                                state);
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL(drm_atomic_set_mode_prop_for_crtc);
+
 /**
  * drm_atomic_crtc_set_property - set property on CRTC
  * @crtc: the drm CRTC to set a property on
@@ -360,10 +405,18 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc,
 {
        struct drm_device *dev = crtc->dev;
        struct drm_mode_config *config = &dev->mode_config;
+       int ret;
 
-       /* FIXME: Mode prop is missing, which also controls ->enable. */
        if (property == config->prop_active)
                state->active = val;
+       else if (property == config->prop_mode_id) {
+               struct drm_property_blob *mode =
+                       drm_property_lookup_blob(dev, val);
+               ret = drm_atomic_set_mode_prop_for_crtc(state, mode);
+               if (mode)
+                       drm_property_unreference_blob(mode);
+               return ret;
+       }
        else if (crtc->funcs->atomic_set_property)
                return crtc->funcs->atomic_set_property(crtc, state, property, val);
        else
@@ -388,6 +441,8 @@ int drm_atomic_crtc_get_property(struct drm_crtc *crtc,
 
        if (property == config->prop_active)
                *val = state->active;
+       else if (property == config->prop_mode_id)
+               *val = (state->mode_blob) ? state->mode_blob->base.id : 0;
        else if (crtc->funcs->atomic_get_property)
                return crtc->funcs->atomic_get_property(crtc, state, property, val);
        else

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 098c94e53fdf8c5bb340611eb5fca4d1129fc052..77f87b23a6e754eabd7c43ee06999e69ed0bc554 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -688,6 +688,7 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,
 
        if (drm_core_check_feature(dev, DRIVER_ATOMIC)) {
                drm_object_attach_property(&crtc->base, config->prop_active, 0);
+               drm_object_attach_property(&crtc->base, config->prop_mode_id, 0);
        }
 
        return 0;
@@ -1454,6 +1455,13 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)
                return -ENOMEM;
        dev->mode_config.prop_active = prop;
 
+       prop = drm_property_create(dev,
+                       DRM_MODE_PROP_ATOMIC | DRM_MODE_PROP_BLOB,
+                       "MODE_ID", 0);
+       if (!prop)
+               return -ENOMEM;
+       dev->mode_config.prop_mode_id = prop;
+
        return 0;
 }
 

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 1e8c61f232949548279a663d7cbc1ddf28293eb1..55f46049e4a0e86b730178df5859b8eb7809926e 100644 (file)
--- 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 c54fa4add79254f70929f3a57f4671f57b9ca73f..3b4d8a4a23fb760867fc7d59ede2a3459eac2375 100644 (file)
--- 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;