Atomic modesetting: now with modesetting support.
Signed-off-by: Daniel Stone <daniels at collabora.com>
---
drivers/gpu/drm/drm_atomic.c | 35 ++++++++++++++++++++++++++++++++++-
drivers/gpu/drm/drm_crtc.c | 7 +++++++
include/drm/drm_crtc.h | 1 +
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 5d3abe3..9085e04 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -179,6 +179,34 @@ void drm_atomic_state_free(struct drm_atomic_state *state)
EXPORT_SYMBOL(drm_atomic_state_free);
/**
+ * drm_atomic_set_mode_for_crtc - set mode for CRTC
+ * @crtc_state: atomic state object for the CRTC
+ * @mode: mode to use for the plane
+ *
+ * Changing the display mode for a CRTC requires us to grab a reference
+ * to the new mode and drop the reference to the old mode, if there is one.
+ * This function takes care of all these details besides updating the pointer
+ * in the state object itself.
+ */
+static void
+drm_atomic_set_mode_for_crtc(struct drm_crtc_state *crtc_state,
+ struct drm_display_mode *mode)
+{
+ if (mode)
+ drm_mode_reference(mode);
+ if (crtc_state->mode)
+ drm_mode_destroy(crtc_state->crtc->dev, crtc_state->mode);
+ crtc_state->mode = mode;
+
+ if (mode)
+ DRM_DEBUG_ATOMIC("Set [MODE:%d] for CRTC state %p\n",
+ mode->base.id, crtc_state);
+ else
+ DRM_DEBUG_ATOMIC("Set [NOMODE] for CRTC state %p\n",
+ crtc_state);
+}
+
+/**
* drm_atomic_get_crtc_state - get crtc state
* @state: global atomic state object
* @crtc: crtc to get state object for
@@ -247,9 +275,12 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc,
struct drm_device *dev = crtc->dev;
struct drm_mode_config *config = &dev->mode_config;
- /* 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_display_mode *mode = drm_mode_find(dev, val);
+ drm_atomic_set_mode_for_crtc(state, mode);
+ }
else if (crtc->funcs->atomic_set_property)
return crtc->funcs->atomic_set_property(crtc, state, property,
val);
else
@@ -274,6 +305,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) ? state->mode->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 3ef0332..c1b3801 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -683,6 +683,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;
@@ -1429,6 +1430,12 @@ static int drm_mode_create_standard_properties(struct
drm_device *dev)
return -ENOMEM;
dev->mode_config.prop_active = prop;
+ prop = drm_property_create_object(dev, DRM_MODE_PROP_ATOMIC,
+ "MODE_ID", DRM_MODE_OBJECT_MODE);
+ if (!prop)
+ return -ENOMEM;
+ dev->mode_config.prop_mode_id = prop;
+
return 0;
}
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3ab70a7..5c8cb25 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1122,6 +1122,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;
--
2.3.2
