mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/atomic: atomic connector properties

Browse source 
Expose the core connector state as properties so it can be updated via
atomic ioctl.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rob Clark 2014-12-18 16:01:54 -05:00 committed by Daniel Vetter
parent 6b4959f43a
commit ae16c597b6
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Documentation/DocBook/drm.tmpl
View file

@ -2572,8 +2572,8 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >Description/Restrictions</td> <td valign="top" >Description/Restrictions</td>
</tr> </tr>
<tr> <tr>
<td rowspan="35" valign="top" >DRM</td> <td rowspan="36" valign="top" >DRM</td>
<td rowspan="4" valign="top" >Generic</td> <td rowspan="5" valign="top" >Connector</td>
<td valign="top" >“EDID”</td> <td valign="top" >“EDID”</td>
<td valign="top" >BLOB | IMMUTABLE</td> <td valign="top" >BLOB | IMMUTABLE</td>
<td valign="top" >0</td> <td valign="top" >0</td>
@ -2602,6 +2602,13 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >Contains tiling information for a connector.</td> <td valign="top" >Contains tiling information for a connector.</td>
</tr> </tr>
<tr> <tr>
<td valign="top" >“CRTC_ID”</td>
<td valign="top" >OBJECT</td>
<td valign="top" >DRM_MODE_OBJECT_CRTC</td>
<td valign="top" >Connector</td>
<td valign="top" >CRTC that connector is attached to (atomic)</td>
</tr>
<tr>
<td rowspan="11" valign="top" >Plane</td> <td rowspan="11" valign="top" >Plane</td>
<td valign="top" >“type”</td> <td valign="top" >“type”</td>
<td valign="top" >ENUM | IMMUTABLE</td> <td valign="top" >ENUM | IMMUTABLE</td>

9
drivers/gpu/drm/drm_atomic.c
View file

@ -627,7 +627,10 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
struct drm_mode_config *config = &dev->mode_config; struct drm_mode_config *config = &dev->mode_config;
if (property == config->dpms_property) { if (property == config->prop_crtc_id) {
struct drm_crtc *crtc = drm_crtc_find(dev, val);
return drm_atomic_set_crtc_for_connector(state, crtc);
} else if (property == config->dpms_property) {
/* setting DPMS property requires special handling, which /* setting DPMS property requires special handling, which
* is done in legacy setprop path for us. Disallow (for * is done in legacy setprop path for us. Disallow (for
* now?) atomic writes to DPMS property: * now?) atomic writes to DPMS property:
@ -665,7 +668,9 @@ int drm_atomic_connector_get_property(struct drm_connector *connector,
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
struct drm_mode_config *config = &dev->mode_config; struct drm_mode_config *config = &dev->mode_config;
if (property == config->dpms_property) { if (property == config->prop_crtc_id) {
*val = (state->crtc) ? state->crtc->base.id : 0;
} else if (property == config->dpms_property) {
*val = connector->dpms; *val = connector->dpms;
} else if (connector->funcs->atomic_get_property) { } else if (connector->funcs->atomic_get_property) {
return connector->funcs->atomic_get_property(connector, return connector->funcs->atomic_get_property(connector,

13
drivers/gpu/drm/drm_crtc.c
View file

@ -831,6 +831,7 @@ int drm_connector_init(struct drm_device *dev,
const struct drm_connector_funcs *funcs, const struct drm_connector_funcs *funcs,
int connector_type) int connector_type)
{ {
struct drm_mode_config *config = &dev->mode_config;
int ret; int ret;
struct ida *connector_ida = struct ida *connector_ida =
&drm_connector_enum_list[connector_type].ida; &drm_connector_enum_list[connector_type].ida;
@ -869,16 +870,20 @@ int drm_connector_init(struct drm_device *dev,
/* We should add connectors at the end to avoid upsetting the connector /* We should add connectors at the end to avoid upsetting the connector
* index too much. */ * index too much. */
list_add_tail(&connector->head, &dev->mode_config.connector_list); list_add_tail(&connector->head, &config->connector_list);
dev->mode_config.num_connector++; config->num_connector++;
if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL) if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
drm_object_attach_property(&connector->base, drm_object_attach_property(&connector->base,
dev->mode_config.edid_property, config->edid_property,
0); 0);
drm_object_attach_property(&connector->base, drm_object_attach_property(&connector->base,
dev->mode_config.dpms_property, 0); config->dpms_property, 0);
if (drm_core_check_feature(dev, DRIVER_ATOMIC)) {
drm_object_attach_property(&connector->base, config->prop_crtc_id, 0);
}
connector->debugfs_entry = NULL; connector->debugfs_entry = NULL;