Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 955f3c33 authored by Daniel Stone's avatar Daniel Stone Committed by Daniel Vetter
Browse files

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: default avatarDaniel Stone <daniels@collabora.com>
Tested-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 99cf4a29

drivers/gpu/drm/drm_atomic.c

+56 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/drm_crtc.c

+8 −0
Original line number Diff line number Diff line
@@ -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;

}

include/drm/drm_atomic.h

+3 −0
Original line number Diff line number Diff line
@@ -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,

include/drm/drm_crtc.h

+1 −0
Original line number Diff line number Diff line
@@ -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;