From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Apr 2019 05:51:49 +0000 (+1000)
Subject: BackMerge v5.1-rc5 into drm-next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f06ddb53096b;p=android-x86%2Fkernel.git

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>
---

f06ddb53096b4cddad2c530125a78a3c2a1d28a4
diff --cc sound/hda/hdac_component.c
index 13915fdc6a54,1ea51e3b942a..dfe7e755f594
--- a/sound/hda/hdac_component.c
+++ b/sound/hda/hdac_component.c
@@@ -90,14 -89,13 +92,16 @@@ void snd_hdac_display_power(struct hdac
  		}
  	} else {
  		if (bus->display_power_active) {
 +			unsigned long cookie = bus->display_power_active;
 +
  			if (acomp->ops->put_power)
 -				acomp->ops->put_power(acomp->dev);
 -			bus->display_power_active = false;
 +				acomp->ops->put_power(acomp->dev, cookie);
 +
 +			bus->display_power_active = 0;
  		}
  	}
+  unlock:
+ 	mutex_unlock(&bus->lock);
  }
  EXPORT_SYMBOL_GPL(snd_hdac_display_power);