BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -802,8 +802,13 @@ struct snd_soc_component_driver {
|
||||
int probe_order;
|
||||
int remove_order;
|
||||
|
||||
/* signal if the module handling the component cannot be removed */
|
||||
unsigned int ignore_module_refcount:1;
|
||||
/*
|
||||
* signal if the module handling the component should not be removed
|
||||
* if a pcm is open. Setting this would prevent the module
|
||||
* refcount being incremented in probe() but allow it be incremented
|
||||
* when a pcm is opened and decremented when it is closed.
|
||||
*/
|
||||
unsigned int module_get_upon_open:1;
|
||||
|
||||
/* bits */
|
||||
unsigned int idle_bias_on:1;
|
||||
@@ -1083,6 +1088,8 @@ struct snd_soc_card {
|
||||
struct mutex mutex;
|
||||
struct mutex dapm_mutex;
|
||||
|
||||
spinlock_t dpcm_lock;
|
||||
|
||||
bool instantiated;
|
||||
bool topology_shortname_created;
|
||||
|
||||
|
Reference in New Issue
Block a user