OERV-BSP/kernel-starfive-jh7110
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BackMerge tag 'v4.15-rc4' into drm-next

Browse Source 
Linux 4.15-rc4

Daniel requested it to fix some messy conflicts.
This commit is contained in:
Dave Airlie
2017-12-19 21:37:24 +10:00
parent a942b3c2cd 1291a0d504
commit 6b7dcb536e
1216 changed files with 10317 additions and 8118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/drm/drm_mode_config.h
View File

@@ -27,6 +27,7 @@
#include <linux/types.h>
#include <linux/idr.h>
#include <linux/workqueue.h>
#include <linux/llist.h>
#include <drm/drm_modeset_lock.h>
@@ -393,7 +394,7 @@ struct drm_mode_config {
/**
* @connector_list_lock: Protects @num_connector and
* @connector_list.
* @connector_list and @connector_free_list.
*/
spinlock_t connector_list_lock;
/**
@@ -413,6 +414,21 @@ struct drm_mode_config {
* &struct drm_connector_list_iter to walk this list.
*/
struct list_head connector_list;
/**
* @connector_free_list:
*
* List of connector objects linked with &drm_connector.free_head.
* Protected by @connector_list_lock. Used by
* drm_for_each_connector_iter() and
* &struct drm_connector_list_iter to savely free connectors using
* @connector_free_work.
*/
struct llist_head connector_free_list;
/**
* @connector_free_work: Work to clean up @connector_free_list.
*/
struct work_struct connector_free_work;
/**
* @num_encoder:
*