diff options
author | 2016-03-14 09:42:34 +1000 | |
---|---|---|
committer | 2016-03-14 09:46:02 +1000 | |
commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /include/drm | |
parent | Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
parent | Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-i... (diff) | |
download | linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.tar.gz linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.tar.bz2 linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.zip |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8c7fb3d0f9d0..7fad193dc645 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1168,6 +1168,7 @@ struct drm_connector { struct drm_mode_object base; char *name; + int connector_id; int connector_type; int connector_type_id; bool interlace_allowed; @@ -2049,6 +2050,7 @@ struct drm_mode_config { struct list_head fb_list; int num_connector; + struct ida connector_ida; struct list_head connector_list; int num_encoder; struct list_head encoder_list; @@ -2213,7 +2215,11 @@ int drm_connector_register(struct drm_connector *connector); void drm_connector_unregister(struct drm_connector *connector); extern void drm_connector_cleanup(struct drm_connector *connector); -extern unsigned int drm_connector_index(struct drm_connector *connector); +static inline unsigned drm_connector_index(struct drm_connector *connector) +{ + return connector->connector_id; +} + /* helper to unplug all connectors from sysfs for device */ extern void drm_connector_unplug_all(struct drm_device *dev); |