mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
c6f95f2793
commit
2545e4a6c8
11 changed files with 51 additions and 0 deletions
|
@ -162,3 +162,41 @@ int intel_atomic_commit(struct drm_device *dev,
|
||||||
|
|
||||||
return 0;
|
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;
|
||||||
|
}
|
||||||
|
|
|
@ -794,6 +794,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
|
||||||
.destroy = intel_crt_destroy,
|
.destroy = intel_crt_destroy,
|
||||||
.set_property = intel_crt_set_property,
|
.set_property = intel_crt_set_property,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.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 = {
|
static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
|
||||||
|
|
|
@ -4402,6 +4402,7 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = {
|
||||||
.force = intel_dp_force,
|
.force = intel_dp_force,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.set_property = intel_dp_set_property,
|
.set_property = intel_dp_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.destroy = intel_dp_connector_destroy,
|
.destroy = intel_dp_connector_destroy,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
|
@ -314,6 +314,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
|
||||||
.detect = intel_dp_mst_detect,
|
.detect = intel_dp_mst_detect,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.set_property = intel_dp_mst_set_property,
|
.set_property = intel_dp_mst_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.destroy = intel_dp_mst_connector_destroy,
|
.destroy = intel_dp_mst_connector_destroy,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1254,6 +1254,10 @@ int intel_atomic_check(struct drm_device *dev,
|
||||||
int intel_atomic_commit(struct drm_device *dev,
|
int intel_atomic_commit(struct drm_device *dev,
|
||||||
struct drm_atomic_state *state,
|
struct drm_atomic_state *state,
|
||||||
bool async);
|
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 */
|
/* intel_atomic_plane.c */
|
||||||
struct intel_plane_state *intel_create_plane_state(struct drm_plane *plane);
|
struct intel_plane_state *intel_create_plane_state(struct drm_plane *plane);
|
||||||
|
|
|
@ -786,6 +786,7 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
||||||
.detect = intel_dsi_detect,
|
.detect = intel_dsi_detect,
|
||||||
.destroy = intel_dsi_destroy,
|
.destroy = intel_dsi_destroy,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -391,6 +391,7 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = {
|
||||||
.detect = intel_dvo_detect,
|
.detect = intel_dvo_detect,
|
||||||
.destroy = intel_dvo_destroy,
|
.destroy = intel_dvo_destroy,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1615,6 +1615,7 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
|
||||||
.force = intel_hdmi_force,
|
.force = intel_hdmi_force,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.set_property = intel_hdmi_set_property,
|
.set_property = intel_hdmi_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.destroy = intel_hdmi_destroy,
|
.destroy = intel_hdmi_destroy,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
|
@ -532,6 +532,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = {
|
||||||
.detect = intel_lvds_detect,
|
.detect = intel_lvds_detect,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.set_property = intel_lvds_set_property,
|
.set_property = intel_lvds_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.destroy = intel_lvds_destroy,
|
.destroy = intel_lvds_destroy,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2191,6 +2191,7 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
|
||||||
.detect = intel_sdvo_detect,
|
.detect = intel_sdvo_detect,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.set_property = intel_sdvo_set_property,
|
.set_property = intel_sdvo_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.destroy = intel_sdvo_destroy,
|
.destroy = intel_sdvo_destroy,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1513,6 +1513,7 @@ static const struct drm_connector_funcs intel_tv_connector_funcs = {
|
||||||
.detect = intel_tv_detect,
|
.detect = intel_tv_detect,
|
||||||
.destroy = intel_tv_destroy,
|
.destroy = intel_tv_destroy,
|
||||||
.set_property = intel_tv_set_property,
|
.set_property = intel_tv_set_property,
|
||||||
|
.atomic_get_property = intel_connector_atomic_get_property,
|
||||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue