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

Commit 2545e4a6 authored by Matt Roper's avatar Matt Roper Committed by Daniel Vetter
Browse files

drm/i915: Add atomic_get_property entrypoint for connectors (v2) 



Even though we only support atomic plane updates at the moment, we still
need to add an .atomic_get_property() entrypoint for connectors before
we allow the driver to flip on the DRIVER_ATOMIC bit.  As soon as that
bit gets set, the DRM core will start adding atomic connector properties
(in addition to the plane properties we care about at the moment), so we
need to be able to handle the new way the DRM core will interact with
us.

For simplicity, we just lookup driver-specific connector properties in
the usual shadow array maintained by the core.  Once we get real atomic
modeset support for crtc's and planes, this code should be re-written to
pull the data out of crtc/connector state structures.

v2: Fix intel_dvo and intel_dsi that I missed on the first pass (Ander)

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c6f95f27

drivers/gpu/drm/i915/intel_atomic.c

+38 −0
Original line number Diff line number Diff line
@@ -162,3 +162,41 @@ int intel_atomic_commit(struct drm_device *dev, 


	return 0;

}



/**

 * intel_connector_atomic_get_property - fetch connector property value

 * @connector: connector to fetch property for

 * @state: state containing the property value

 * @property: property to look up

 * @val: pointer to write property value into

 *

 * The DRM core does not store shadow copies of properties for

 * atomic-capable drivers.  This entrypoint is used to fetch

 * the current value of a driver-specific connector property.

 */

int

intel_connector_atomic_get_property(struct drm_connector *connector,

				    const struct drm_connector_state *state,

				    struct drm_property *property,

				    uint64_t *val)

{

	int i;



	/*

	 * TODO: We only have atomic modeset for planes at the moment, so the

	 * crtc/connector code isn't quite ready yet.  Until it's ready,

	 * continue to look up all property values in the DRM's shadow copy

	 * in obj->properties->values[].

	 *

	 * When the crtc/connector state work matures, this function should

	 * be updated to read the values out of the state structure instead.

	 */

	for (i = 0; i < connector->base.properties->count; i++) {

		if (connector->base.properties->properties[i] == property) {

			*val = connector->base.properties->values[i];

			return 0;

		}

	}



	return -EINVAL;

}

drivers/gpu/drm/i915/intel_crt.c

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
	.destroy = intel_crt_destroy,

	.set_property = intel_crt_set_property,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_get_property = intel_connector_atomic_get_property,

};



static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {

drivers/gpu/drm/i915/intel_dp.c

+1 −0
Original line number Diff line number Diff line
@@ -4402,6 +4402,7 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { 
	.force = intel_dp_force,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = intel_dp_set_property,

	.atomic_get_property = intel_connector_atomic_get_property,

	.destroy = intel_dp_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};

drivers/gpu/drm/i915/intel_dp_mst.c

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { 
	.detect = intel_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = intel_dp_mst_set_property,

	.atomic_get_property = intel_connector_atomic_get_property,

	.destroy = intel_dp_mst_connector_destroy,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};

drivers/gpu/drm/i915/intel_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,10 @@ int intel_atomic_check(struct drm_device *dev, 
int intel_atomic_commit(struct drm_device *dev,

			struct drm_atomic_state *state,

			bool async);

int intel_connector_atomic_get_property(struct drm_connector *connector,

					const struct drm_connector_state *state,

					struct drm_property *property,

					uint64_t *val);



/* intel_atomic_plane.c */

struct intel_plane_state *intel_create_plane_state(struct drm_plane *plane);