diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-24 06:30:29 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 06:30:29 +0200 |
| commit | dcd14dd957f02ef679c61325a2221a0574bdcab3 (patch) | |
| tree | 225a38a705ba692065c17b39f04c95fe7258e663 /include/drm/drmP.h | |
| parent | Merge tag 'topic/crc-pmic-2015-07-23' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | drm: gc now dead mode_group code (diff) | |
| download | linux-dcd14dd957f02ef679c61325a2221a0574bdcab3.tar.xz linux-dcd14dd957f02ef679c61325a2221a0574bdcab3.zip | |
Merge tag 'topic/connector-locking-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next
connector hotplug locking cleanup and fixes to make it save against
atomic. Note that because of depencies this is based on top of the
drm-intel-next pull, so that one needs to go in before this one.
I've also thrown in the mode_group removal on top since it's defunct,
never worked really, no one seems to care and the code can be resurrected
easily.
* tag 'topic/connector-locking-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
drm: gc now dead mode_group code
drm: Stop filtering according to mode_group in getresources
drm: Roll out drm_for_each_{plane,crtc,encoder}
drm/cma-helper: Fix locking in drm_fb_cma_debugfs_show
drm: Roll out drm_for_each_connector more
drm: Amend connector list locking rules
drm/radeon: Take all modeset locks for DP MST hotplug
drm/i915: Take all modeset locks for DP MST hotplug
drm: Check locking in drm_for_each_fb
drm/i915: Use drm_for_each_fb in i915_debugfs.c
drm: Check locking in drm_for_each_connector
drm/fbdev-helper: Grab mode_config.mutex in drm_fb_helper_single_add_all_connectors
drm/probe-helper: Grab mode_config.mutex in poll_init/enable
drm: Add modeset object iterators
drm: Simplify drm_for_each_legacy_plane arguments
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3dc7c16c18f2..4717449d6aa9 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -676,7 +676,6 @@ struct drm_minor { /* currently active master for this node. Protected by master_mutex */ struct drm_master *master; - struct drm_mode_group mode_group; }; |