forked from rpms/kernel
		
	Linux v4.8-rc2-348-g6040e57
This commit is contained in:
		
							parent
							
								
									a5acca3c59
								
							
						
					
					
						commit
						d51e15e2b7
					
				| @ -1,64 +0,0 @@ | ||||
| From 74f829a6e44fe217b6161f8935524fc807be0648 Mon Sep 17 00:00:00 2001 | ||||
| From: Chris Wilson <chris@chris-wilson.co.uk> | ||||
| Date: Sat, 9 Jul 2016 11:01:20 +0100 | ||||
| Subject: [PATCH] drm/i915: Acquire audio powerwell for HD-Audio registers | ||||
| 
 | ||||
| On Haswell/Broadwell, the HD-Audio block is inside the HDMI/display | ||||
| power well and so the sna-hda audio codec acquires the display power | ||||
| well while it is operational. However, Skylake separates the powerwells | ||||
| again, but yet we still need the audio powerwell to setup the registers. | ||||
| (But then the hardware uses those registers even while powered off???) | ||||
| 
 | ||||
| v2: Grab both rpm wakelock and audio wakelock | ||||
| 
 | ||||
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96214 | ||||
| Fixes: 03b135cebc47 "ALSA: hda - remove dependency on i915 power well for SKL") | ||||
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> | ||||
| Cc: Libin Yang <libin.yang@intel.com> | ||||
| Cc: Takashi Iwai <tiwai@suse.de> | ||||
| Cc: Marius Vlad <marius.c.vlad@intel.com> | ||||
| ---
 | ||||
|  drivers/gpu/drm/i915/intel_audio.c | 6 ++++++ | ||||
|  1 file changed, 6 insertions(+) | ||||
| 
 | ||||
| diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
 | ||||
| index 5d5f6bc10e85..948a7a52e3f8 100644
 | ||||
| --- a/drivers/gpu/drm/i915/intel_audio.c
 | ||||
| +++ b/drivers/gpu/drm/i915/intel_audio.c
 | ||||
| @@ -600,6 +600,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 | ||||
|  	if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv)) | ||||
|  		return; | ||||
|   | ||||
| +	i915_audio_component_get_power(dev);
 | ||||
| +
 | ||||
|  	/* | ||||
|  	 * Enable/disable generating the codec wake signal, overriding the | ||||
|  	 * internal logic to generate the codec wake to controller. | ||||
| @@ -615,6 +617,8 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
 | ||||
|  		I915_WRITE(HSW_AUD_CHICKENBIT, tmp); | ||||
|  		usleep_range(1000, 1500); | ||||
|  	} | ||||
| +
 | ||||
| +	i915_audio_component_put_power(dev);
 | ||||
|  } | ||||
|   | ||||
|  /* Get CDCLK in kHz  */ | ||||
| @@ -648,6 +652,7 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
 | ||||
|  	    !IS_HASWELL(dev_priv)) | ||||
|  		return 0; | ||||
|   | ||||
| +	i915_audio_component_get_power(dev);
 | ||||
|  	mutex_lock(&dev_priv->av_mutex); | ||||
|  	/* 1. get the pipe */ | ||||
|  	intel_encoder = dev_priv->dig_port_map[port]; | ||||
| @@ -698,6 +703,7 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
 | ||||
|   | ||||
|   unlock: | ||||
|  	mutex_unlock(&dev_priv->av_mutex); | ||||
| +	i915_audio_component_put_power(dev);
 | ||||
|  	return err; | ||||
|  } | ||||
|   | ||||
| -- 
 | ||||
| 2.8.1 | ||||
| 
 | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| 3408fef7448ce7d3c926978ee1a511e7707bffba | ||||
| 6040e57658eee6eb1315a26119101ca832d1f854 | ||||
|  | ||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 2 | ||||
| # The git snapshot level | ||||
| %define gitrev 3 | ||||
| %define gitrev 4 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -599,9 +599,6 @@ Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch | ||||
| #CVE-2016-3134 rhbz 1317383 1317384 | ||||
| Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch | ||||
| 
 | ||||
| # https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/ | ||||
| Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch | ||||
| 
 | ||||
| #rhbz 1200901 (There should be something better upstream at some point) | ||||
| Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch | ||||
| 
 | ||||
| @ -2142,6 +2139,9 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Fri Aug 19 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc2.git4.1 | ||||
| - Linux v4.8-rc2-348-g6040e57 | ||||
| 
 | ||||
| * Fri Aug 19 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc2.git3.1 | ||||
| - Linux v4.8-rc2-232-g3408fef | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user