All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
@ 2017-07-06 21:03 Rodrigo Vivi
  2017-07-06 23:06 ` ✓ Fi.CI.BAT: success for " Patchwork
  2017-08-16 23:46 ` [PATCH] " Pandiyan, Dhinakaran
  0 siblings, 2 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2017-07-06 21:03 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Sanyog Kale, Dhinakaran Pandiyan, Rodrigo Vivi

Starting on CNL, we need to enable Audio Pin Buffer.

By the spec it seems that this is part of audio programming,
so let's give them the hability to set/unset this as needed.

v2: With a hook so audio driver can control it.
v3: Put back reg definition lost on v2.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Sanyog Kale <sanyog.r.kale@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h    |  3 +++
 drivers/gpu/drm/i915/intel_audio.c | 16 ++++++++++++++++
 include/drm/i915_component.h       |  6 ++++++
 3 files changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 64cc674..aab38da 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2643,6 +2643,9 @@ enum skl_disp_power_wells {
 #define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
 #define I915_HDMI_LPE_AUDIO_SIZE	0x1000
 
+#define AUDIO_PIN_BUF_CTL		_MMIO(0x48414)
+#define AUDIO_PIN_BUF_ENABLE		(1 << 31)
+
 /* DisplayPort Audio w/ LPE */
 #define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
 #define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index d805b6e..0c83254 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -865,6 +865,21 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
 	return ret;
 }
 
+static void i915_audio_component_pin_buf(struct device *kdev, bool enable)
+{
+	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
+
+	if (!IS_CANNONLAKE(dev_priv))
+		return;
+
+	if (enable)
+		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) |
+			   AUDIO_PIN_BUF_ENABLE);
+	else
+		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) &
+			   ~AUDIO_PIN_BUF_ENABLE);
+}
+
 static const struct i915_audio_component_ops i915_audio_component_ops = {
 	.owner		= THIS_MODULE,
 	.get_power	= i915_audio_component_get_power,
@@ -873,6 +888,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
 	.get_cdclk_freq	= i915_audio_component_get_cdclk_freq,
 	.sync_audio_rate = i915_audio_component_sync_audio_rate,
 	.get_eld	= i915_audio_component_get_eld,
+	.pin_buf	= i915_audio_component_pin_buf,
 };
 
 static int i915_audio_component_bind(struct device *i915_kdev,
diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index 545c6e0..b8875d4 100644
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -79,6 +79,12 @@ struct i915_audio_component_ops {
 	 */
 	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
 		       unsigned char *buf, int max_bytes);
+	/**
+	 * @pin_buf: Enable or disable pin buffer.
+	 *
+	 * Allow audio driver the toggle pin buffer.
+	 */
+	void (*pin_buf)(struct device *, bool enable);
 };
 
 /**
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/cnl: Enable Audio Pin Buffer.
  2017-07-06 21:03 [PATCH] drm/i915/cnl: Enable Audio Pin Buffer Rodrigo Vivi
@ 2017-07-06 23:06 ` Patchwork
  2017-08-16 23:46 ` [PATCH] " Pandiyan, Dhinakaran
  1 sibling, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-07-06 23:06 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

== Series Details ==

Series: drm/i915/cnl: Enable Audio Pin Buffer.
URL   : https://patchwork.freedesktop.org/series/26954/
State : success

== Summary ==

Series 26954v1 drm/i915/cnl: Enable Audio Pin Buffer.
https://patchwork.freedesktop.org/api/1.0/series/26954/revisions/1/mbox/

Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-kbl-7560u) fdo#100125 +1
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                skip       -> PASS       (fi-ivb-3520m) fdo#101048 +3
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-pnv-d510) fdo#101597 +1
        Subgroup suspend-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-byt-j1900) fdo#101705

fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#101048 https://bugs.freedesktop.org/show_bug.cgi?id=101048
fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705

fi-bdw-5557u     total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:450s
fi-bdw-gvtdvm    total:279  pass:265  dwarn:0   dfail:0   fail:0   skip:14  time:427s
fi-blb-e6850     total:279  pass:224  dwarn:1   dfail:0   fail:0   skip:54  time:352s
fi-bsw-n3050     total:279  pass:243  dwarn:0   dfail:0   fail:0   skip:36  time:523s
fi-bxt-j4205     total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:513s
fi-byt-j1900     total:279  pass:254  dwarn:1   dfail:0   fail:0   skip:24  time:489s
fi-byt-n2820     total:279  pass:250  dwarn:1   dfail:0   fail:0   skip:28  time:487s
fi-glk-2a        total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:590s
fi-hsw-4770      total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:437s
fi-hsw-4770r     total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:416s
fi-ilk-650       total:279  pass:229  dwarn:0   dfail:0   fail:0   skip:50  time:421s
fi-ivb-3520m     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:489s
fi-ivb-3770      total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:481s
fi-kbl-7500u     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:459s
fi-kbl-7560u     total:279  pass:268  dwarn:1   dfail:0   fail:0   skip:10  time:576s
fi-kbl-r         total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:582s
fi-pnv-d510      total:279  pass:223  dwarn:1   dfail:0   fail:0   skip:55  time:562s
fi-skl-6260u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:456s
fi-skl-6700hq    total:279  pass:262  dwarn:0   dfail:0   fail:0   skip:17  time:582s
fi-skl-6700k     total:279  pass:257  dwarn:4   dfail:0   fail:0   skip:18  time:468s
fi-skl-6770hq    total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:482s
fi-skl-gvtdvm    total:279  pass:266  dwarn:0   dfail:0   fail:0   skip:13  time:437s
fi-snb-2520m     total:279  pass:251  dwarn:0   dfail:0   fail:0   skip:28  time:540s
fi-snb-2600      total:279  pass:250  dwarn:0   dfail:0   fail:0   skip:29  time:404s

2132c198e6afd4ed75e89eee86c40c7def49c1dc drm-tip: 2017y-07m-06d-20h-24m-04s UTC integration manifest
35df82f4 drm/i915/cnl: Enable Audio Pin Buffer.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5134/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2017-07-06 21:03 [PATCH] drm/i915/cnl: Enable Audio Pin Buffer Rodrigo Vivi
  2017-07-06 23:06 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-08-16 23:46 ` Pandiyan, Dhinakaran
  2017-08-17  3:56   ` Sanyog Kale
  1 sibling, 1 reply; 9+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-08-16 23:46 UTC (permalink / raw)
  To: Vivi, Rodrigo; +Cc: Nikula, Jani, intel-gfx, Kale, Sanyog R

On Thu, 2017-07-06 at 14:03 -0700, Rodrigo Vivi wrote:
> Starting on CNL, we need to enable Audio Pin Buffer.
> 
> By the spec it seems that this is part of audio programming,

I am not very clear where the pin buffer enabling/disabling step falls
in the audio programming sequence. From what I understand, audio codec
enable/disable is controlled by i915, if pin buffer enable/disable is
part of that, then we don't need a call back. It's difficult to know
where this function is going to be used without seeing the audio driver
patch that makes of use of this.

> so let's give them the hability to set/unset this as needed.

typo s/hability/ability
> 
> v2: With a hook so audio driver can control it.
> v3: Put back reg definition lost on v2.
> 
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
>  drivers/gpu/drm/i915/intel_audio.c | 16 ++++++++++++++++
>  include/drm/i915_component.h       |  6 ++++++
>  3 files changed, 25 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 64cc674..aab38da 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2643,6 +2643,9 @@ enum skl_disp_power_wells {
>  #define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
>  #define I915_HDMI_LPE_AUDIO_SIZE	0x1000
>  
> +#define AUDIO_PIN_BUF_CTL		_MMIO(0x48414)
> +#define AUDIO_PIN_BUF_ENABLE		(1 << 31)
> +
>  /* DisplayPort Audio w/ LPE */
>  #define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
>  #define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index d805b6e..0c83254 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -865,6 +865,21 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
>  	return ret;
>  }
>  
> +static void i915_audio_component_pin_buf(struct device *kdev, bool enable)
> +{

Does it matter whether the audio codec is enabled or disabled when this
call comes in? i.e., do we need some sort of check here? Or do we assume
the audio driver knows exactly when to enable or disable pin buffer?



> +	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> +
> +	if (!IS_CANNONLAKE(dev_priv))

Should this be a INTEL_GEN() < 10 since the register is gen10+? I am not
particular about either of the options.

> +		return;
> +
> +	if (enable)
> +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) |
> +			   AUDIO_PIN_BUF_ENABLE);
> +	else
> +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) &
> +			   ~AUDIO_PIN_BUF_ENABLE);
> +}
> +
>  static const struct i915_audio_component_ops i915_audio_component_ops = {
>  	.owner		= THIS_MODULE,
>  	.get_power	= i915_audio_component_get_power,
> @@ -873,6 +888,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
>  	.get_cdclk_freq	= i915_audio_component_get_cdclk_freq,
>  	.sync_audio_rate = i915_audio_component_sync_audio_rate,
>  	.get_eld	= i915_audio_component_get_eld,
> +	.pin_buf	= i915_audio_component_pin_buf,
>  };
>  
>  static int i915_audio_component_bind(struct device *i915_kdev,
> diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
> index 545c6e0..b8875d4 100644
> --- a/include/drm/i915_component.h
> +++ b/include/drm/i915_component.h
> @@ -79,6 +79,12 @@ struct i915_audio_component_ops {
>  	 */
>  	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
>  		       unsigned char *buf, int max_bytes);
> +	/**
> +	 * @pin_buf: Enable or disable pin buffer.
> +	 *
> +	 * Allow audio driver the toggle pin buffer.
> +	 */
> +	void (*pin_buf)(struct device *, bool enable);
>  };
>  
>  /**
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2017-08-16 23:46 ` [PATCH] " Pandiyan, Dhinakaran
@ 2017-08-17  3:56   ` Sanyog Kale
  2017-08-17 18:55     ` Vivi, Rodrigo
  0 siblings, 1 reply; 9+ messages in thread
From: Sanyog Kale @ 2017-08-17  3:56 UTC (permalink / raw)
  To: Pandiyan, Dhinakaran; +Cc: Nikula, Jani, intel-gfx, Vivi, Rodrigo

On Wed, Aug 16, 2017 at 06:46:26PM -0500, Pandiyan, Dhinakaran wrote:
> On Thu, 2017-07-06 at 14:03 -0700, Rodrigo Vivi wrote:
> > Starting on CNL, we need to enable Audio Pin Buffer.
> > 
> > By the spec it seems that this is part of audio programming,
> 
> I am not very clear where the pin buffer enabling/disabling step falls
> in the audio programming sequence. From what I understand, audio codec
> enable/disable is controlled by i915, if pin buffer enable/disable is
> part of that, then we don't need a call back. It's difficult to know
> where this function is going to be used without seeing the audio driver
> patch that makes of use of this.
>

From audio point of view, we are working on correct sequence where this ops
will be called. However during CNL Power-ON we enabled the pin buf using ops
as part of azx_reset.
 
> > so let's give them the hability to set/unset this as needed.
> 
> typo s/hability/ability
> > 
> > v2: With a hook so audio driver can control it.
> > v3: Put back reg definition lost on v2.
> > 
> > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
> >  drivers/gpu/drm/i915/intel_audio.c | 16 ++++++++++++++++
> >  include/drm/i915_component.h       |  6 ++++++
> >  3 files changed, 25 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 64cc674..aab38da 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -2643,6 +2643,9 @@ enum skl_disp_power_wells {
> >  #define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
> >  #define I915_HDMI_LPE_AUDIO_SIZE	0x1000
> >  
> > +#define AUDIO_PIN_BUF_CTL		_MMIO(0x48414)
> > +#define AUDIO_PIN_BUF_ENABLE		(1 << 31)
> > +
> >  /* DisplayPort Audio w/ LPE */
> >  #define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
> >  #define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > index d805b6e..0c83254 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -865,6 +865,21 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> >  	return ret;
> >  }
> >  
> > +static void i915_audio_component_pin_buf(struct device *kdev, bool enable)
> > +{
> 
> Does it matter whether the audio codec is enabled or disabled when this
> call comes in? i.e., do we need some sort of check here? Or do we assume
> the audio driver knows exactly when to enable or disable pin buffer?
> 
> 
> 
> > +	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> > +
> > +	if (!IS_CANNONLAKE(dev_priv))
> 
> Should this be a INTEL_GEN() < 10 since the register is gen10+? I am not
> particular about either of the options.
> 
> > +		return;
> > +
> > +	if (enable)
> > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) |
> > +			   AUDIO_PIN_BUF_ENABLE);
> > +	else
> > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) &
> > +			   ~AUDIO_PIN_BUF_ENABLE);
> > +}
> > +
> >  static const struct i915_audio_component_ops i915_audio_component_ops = {
> >  	.owner		= THIS_MODULE,
> >  	.get_power	= i915_audio_component_get_power,
> > @@ -873,6 +888,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> >  	.get_cdclk_freq	= i915_audio_component_get_cdclk_freq,
> >  	.sync_audio_rate = i915_audio_component_sync_audio_rate,
> >  	.get_eld	= i915_audio_component_get_eld,
> > +	.pin_buf	= i915_audio_component_pin_buf,
> >  };
> >  
> >  static int i915_audio_component_bind(struct device *i915_kdev,
> > diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
> > index 545c6e0..b8875d4 100644
> > --- a/include/drm/i915_component.h
> > +++ b/include/drm/i915_component.h
> > @@ -79,6 +79,12 @@ struct i915_audio_component_ops {
> >  	 */
> >  	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
> >  		       unsigned char *buf, int max_bytes);
> > +	/**
> > +	 * @pin_buf: Enable or disable pin buffer.
> > +	 *
> > +	 * Allow audio driver the toggle pin buffer.
> > +	 */
> > +	void (*pin_buf)(struct device *, bool enable);
> >  };
> >  
> >  /**

-- 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2017-08-17  3:56   ` Sanyog Kale
@ 2017-08-17 18:55     ` Vivi, Rodrigo
  2017-08-17 19:08       ` Pandiyan, Dhinakaran
  0 siblings, 1 reply; 9+ messages in thread
From: Vivi, Rodrigo @ 2017-08-17 18:55 UTC (permalink / raw)
  To: Kale, Sanyog R; +Cc: Nikula, Jani, intel-gfx, Pandiyan, Dhinakaran

On Thu, 2017-08-17 at 09:26 +0530, Sanyog Kale wrote:
> On Wed, Aug 16, 2017 at 06:46:26PM -0500, Pandiyan, Dhinakaran wrote:
> > On Thu, 2017-07-06 at 14:03 -0700, Rodrigo Vivi wrote:
> > > Starting on CNL, we need to enable Audio Pin Buffer.
> > > 
> > > By the spec it seems that this is part of audio programming,
> > 
> > I am not very clear where the pin buffer enabling/disabling step falls
> > in the audio programming sequence. From what I understand, audio codec
> > enable/disable is controlled by i915, if pin buffer enable/disable is
> > part of that, then we don't need a call back. It's difficult to know
> > where this function is going to be used without seeing the audio driver
> > patch that makes of use of this.

Sanyog, I couldn't find all the old emails with spec pointing out the
time that we needed to set this bit. Do you still have?
Anything you could share when publishing the patches?

> >
> 
> From audio point of view, we are working on correct sequence where this ops
> will be called. However during CNL Power-ON we enabled the pin buf using ops
> as part of azx_reset.

Ok, so let's put this on hold while audio drivers are not ready.
It will be on internal branch anyways.
When audio driver gets ready we re-submit all together.

>  
> > > so let's give them the hability to set/unset this as needed.
> > 
> > typo s/hability/ability
> > > 
> > > v2: With a hook so audio driver can control it.
> > > v3: Put back reg definition lost on v2.
> > > 
> > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
> > >  drivers/gpu/drm/i915/intel_audio.c | 16 ++++++++++++++++
> > >  include/drm/i915_component.h       |  6 ++++++
> > >  3 files changed, 25 insertions(+)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > > index 64cc674..aab38da 100644
> > > --- a/drivers/gpu/drm/i915/i915_reg.h
> > > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > > @@ -2643,6 +2643,9 @@ enum skl_disp_power_wells {
> > >  #define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
> > >  #define I915_HDMI_LPE_AUDIO_SIZE	0x1000
> > >  
> > > +#define AUDIO_PIN_BUF_CTL		_MMIO(0x48414)
> > > +#define AUDIO_PIN_BUF_ENABLE		(1 << 31)
> > > +
> > >  /* DisplayPort Audio w/ LPE */
> > >  #define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
> > >  #define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
> > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > > index d805b6e..0c83254 100644
> > > --- a/drivers/gpu/drm/i915/intel_audio.c
> > > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > > @@ -865,6 +865,21 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> > >  	return ret;
> > >  }
> > >  
> > > +static void i915_audio_component_pin_buf(struct device *kdev, bool enable)
> > > +{
> > 
> > Does it matter whether the audio codec is enabled or disabled when this
> > call comes in? i.e., do we need some sort of check here? Or do we assume
> > the audio driver knows exactly when to enable or disable pin buffer?
> > 
> > 
> > 
> > > +	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> > > +
> > > +	if (!IS_CANNONLAKE(dev_priv))
> > 
> > Should this be a INTEL_GEN() < 10 since the register is gen10+? I am not
> > particular about either of the options.
> > 
> > > +		return;
> > > +
> > > +	if (enable)
> > > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) |
> > > +			   AUDIO_PIN_BUF_ENABLE);
> > > +	else
> > > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) &
> > > +			   ~AUDIO_PIN_BUF_ENABLE);
> > > +}
> > > +
> > >  static const struct i915_audio_component_ops i915_audio_component_ops = {
> > >  	.owner		= THIS_MODULE,
> > >  	.get_power	= i915_audio_component_get_power,
> > > @@ -873,6 +888,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> > >  	.get_cdclk_freq	= i915_audio_component_get_cdclk_freq,
> > >  	.sync_audio_rate = i915_audio_component_sync_audio_rate,
> > >  	.get_eld	= i915_audio_component_get_eld,
> > > +	.pin_buf	= i915_audio_component_pin_buf,
> > >  };
> > >  
> > >  static int i915_audio_component_bind(struct device *i915_kdev,
> > > diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
> > > index 545c6e0..b8875d4 100644
> > > --- a/include/drm/i915_component.h
> > > +++ b/include/drm/i915_component.h
> > > @@ -79,6 +79,12 @@ struct i915_audio_component_ops {
> > >  	 */
> > >  	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
> > >  		       unsigned char *buf, int max_bytes);
> > > +	/**
> > > +	 * @pin_buf: Enable or disable pin buffer.
> > > +	 *
> > > +	 * Allow audio driver the toggle pin buffer.
> > > +	 */
> > > +	void (*pin_buf)(struct device *, bool enable);
> > >  };
> > >  
> > >  /**
> 

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2017-08-17 18:55     ` Vivi, Rodrigo
@ 2017-08-17 19:08       ` Pandiyan, Dhinakaran
  0 siblings, 0 replies; 9+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-08-17 19:08 UTC (permalink / raw)
  To: Vivi, Rodrigo; +Cc: Nikula, Jani, intel-gfx, Kale, Sanyog R

On Thu, 2017-08-17 at 18:55 +0000, Vivi, Rodrigo wrote:
> On Thu, 2017-08-17 at 09:26 +0530, Sanyog Kale wrote:
> > On Wed, Aug 16, 2017 at 06:46:26PM -0500, Pandiyan, Dhinakaran wrote:
> > > On Thu, 2017-07-06 at 14:03 -0700, Rodrigo Vivi wrote:
> > > > Starting on CNL, we need to enable Audio Pin Buffer.
> > > > 
> > > > By the spec it seems that this is part of audio programming,
> > > 
> > > I am not very clear where the pin buffer enabling/disabling step falls
> > > in the audio programming sequence. From what I understand, audio codec
> > > enable/disable is controlled by i915, if pin buffer enable/disable is
> > > part of that, then we don't need a call back. It's difficult to know
> > > where this function is going to be used without seeing the audio driver
> > > patch that makes of use of this.
> 
> Sanyog, I couldn't find all the old emails with spec pointing out the
> time that we needed to set this bit. Do you still have?
> Anything you could share when publishing the patches?
> 
> > >
> > 
> > From audio point of view, we are working on correct sequence where this ops
> > will be called. However during CNL Power-ON we enabled the pin buf using ops
> > as part of azx_reset.
> 
> Ok, so let's put this on hold while audio drivers are not ready.
> It will be on internal branch anyways.
> When audio driver gets ready we re-submit all together.
> 

That makes a lot of sense to me.

> >  
> > > > so let's give them the hability to set/unset this as needed.
> > > 
> > > typo s/hability/ability
> > > > 
> > > > v2: With a hook so audio driver can control it.
> > > > v3: Put back reg definition lost on v2.
> > > > 
> > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> > > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > ---
> > > >  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
> > > >  drivers/gpu/drm/i915/intel_audio.c | 16 ++++++++++++++++
> > > >  include/drm/i915_component.h       |  6 ++++++
> > > >  3 files changed, 25 insertions(+)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > > > index 64cc674..aab38da 100644
> > > > --- a/drivers/gpu/drm/i915/i915_reg.h
> > > > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > > > @@ -2643,6 +2643,9 @@ enum skl_disp_power_wells {
> > > >  #define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
> > > >  #define I915_HDMI_LPE_AUDIO_SIZE	0x1000
> > > >  
> > > > +#define AUDIO_PIN_BUF_CTL		_MMIO(0x48414)
> > > > +#define AUDIO_PIN_BUF_ENABLE		(1 << 31)
> > > > +
> > > >  /* DisplayPort Audio w/ LPE */
> > > >  #define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
> > > >  #define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
> > > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > > > index d805b6e..0c83254 100644
> > > > --- a/drivers/gpu/drm/i915/intel_audio.c
> > > > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > > > @@ -865,6 +865,21 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> > > >  	return ret;
> > > >  }
> > > >  
> > > > +static void i915_audio_component_pin_buf(struct device *kdev, bool enable)
> > > > +{
> > > 
> > > Does it matter whether the audio codec is enabled or disabled when this
> > > call comes in? i.e., do we need some sort of check here? Or do we assume
> > > the audio driver knows exactly when to enable or disable pin buffer?
> > > 
> > > 
> > > 
> > > > +	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> > > > +
> > > > +	if (!IS_CANNONLAKE(dev_priv))
> > > 
> > > Should this be a INTEL_GEN() < 10 since the register is gen10+? I am not
> > > particular about either of the options.
> > > 
> > > > +		return;
> > > > +
> > > > +	if (enable)
> > > > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) |
> > > > +			   AUDIO_PIN_BUF_ENABLE);
> > > > +	else
> > > > +		I915_WRITE(AUDIO_PIN_BUF_CTL, I915_READ(AUDIO_PIN_BUF_CTL) &
> > > > +			   ~AUDIO_PIN_BUF_ENABLE);
> > > > +}
> > > > +
> > > >  static const struct i915_audio_component_ops i915_audio_component_ops = {
> > > >  	.owner		= THIS_MODULE,
> > > >  	.get_power	= i915_audio_component_get_power,
> > > > @@ -873,6 +888,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
> > > >  	.get_cdclk_freq	= i915_audio_component_get_cdclk_freq,
> > > >  	.sync_audio_rate = i915_audio_component_sync_audio_rate,
> > > >  	.get_eld	= i915_audio_component_get_eld,
> > > > +	.pin_buf	= i915_audio_component_pin_buf,
> > > >  };
> > > >  
> > > >  static int i915_audio_component_bind(struct device *i915_kdev,
> > > > diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
> > > > index 545c6e0..b8875d4 100644
> > > > --- a/include/drm/i915_component.h
> > > > +++ b/include/drm/i915_component.h
> > > > @@ -79,6 +79,12 @@ struct i915_audio_component_ops {
> > > >  	 */
> > > >  	int (*get_eld)(struct device *, int port, int pipe, bool *enabled,
> > > >  		       unsigned char *buf, int max_bytes);
> > > > +	/**
> > > > +	 * @pin_buf: Enable or disable pin buffer.
> > > > +	 *
> > > > +	 * Allow audio driver the toggle pin buffer.
> > > > +	 */
> > > > +	void (*pin_buf)(struct device *, bool enable);
> > > >  };
> > > >  
> > > >  /**
> > 
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2018-02-08  0:37 ` Rodrigo Vivi
@ 2018-02-08  4:55   ` Guneshwor Singh
  0 siblings, 0 replies; 9+ messages in thread
From: Guneshwor Singh @ 2018-02-08  4:55 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: Jani Nikula, intel-gfx, Sanyog Kale

Hi Rodrigo,

On Wed, Feb 07, 2018 at 04:37:33PM -0800, Rodrigo Vivi wrote:
> Rodrigo Vivi <rodrigo.vivi@intel.com> writes:
> 
> > Starting on CNL, we need to enable Audio Pin Buffer.
> 
> Ok... I forgot to include ICL on this now.
> But first let's check if this is working on CNL and later I sent a v5.
> 

This does not work on CNL. With this, the vendor id response is
0xffffffff.

I am not sure though why/how the below works fine:
(commented out disable sequence)

if (IS_CANNONLAKE(dev_priv)) {
	tmp = I915_READ(AUDIO_PIN_BUF_CTL);
	if (enable)
		tmp |= AUDIO_PIN_BUF_ENABLE;
	/*
	else
		tmp &= ~AUDIO_PIN_BUF_ENABLE;
	*/
	I915_WRITE(AUDIO_PIN_BUF_CTL, tmp);

> On top of that for CNL and ICL audio needs to know when we are
> switching cdclk. But for this work I'd like to hear from audio
> if they need a new hook for notification or what.
> 
> And I will wait the work on audio start first before attempt
> to implement any new hook on our side.
> 
> Thanks,
> Rodrigo.
> 
> >
> > v4: Throw the exclusive hook and everything else away
> >     and add set/unset bit along with codec awake.
> >
> > Based on few spec links that I was checking recently
> > I now believe that on CNL we also need to keep the codec
> > awake chicken bit along with PG2 enable and also add
> > this extra pin buffer enable.
> >
> > BSpec: 18057
> > BSpec: 21352
> > BSpec: 19621
> >
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> > Cc: Guneshwor Singh <guneshwor.o.singh@intel.com>
> > Cc: Abhay Kumar <abhay.kumar@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
> >  drivers/gpu/drm/i915/intel_audio.c | 11 ++++++++++-
> >  2 files changed, 13 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 65ba10ad1fe5..768e784ea241 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -8424,6 +8424,9 @@ enum {
> >  #define HSW_AUD_CHICKENBIT			_MMIO(0x65f10)
> >  #define   SKL_AUD_CODEC_WAKE_SIGNAL		(1 << 15)
> >  
> > +#define AUDIO_PIN_BUF_CTL			_MMIO(0x48414)
> > +#define  AUDIO_PIN_BUF_ENABLE			(1 << 31)
> > +
> >  /* HSW Power Wells */
> >  #define _HSW_PWR_WELL_CTL1			0x45400
> >  #define _HSW_PWR_WELL_CTL2			0x45404
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > index 522d54fecb53..34f18322c9bd 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -729,11 +729,20 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
> >  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> >  	u32 tmp;
> >  
> > -	if (!IS_GEN9_BC(dev_priv))
> > +	if (!IS_GEN9_BC(dev_priv) && !IS_CANNONLAKE(dev_priv))
> >  		return;
> >  
> >  	i915_audio_component_get_power(kdev);
> >  
> > +	if (IS_CANNONLAKE(dev_priv)) {
> > +		tmp = I915_READ(AUDIO_PIN_BUF_CTL);
> > +		if (enable)
> > +			tmp |= AUDIO_PIN_BUF_ENABLE;
> > +		else
> > +			tmp &= ~AUDIO_PIN_BUF_ENABLE;
> > +		I915_WRITE(AUDIO_PIN_BUF_CTL, tmp);
> > +	}
> > +
> >  	/*
> >  	 * Enable/disable generating the codec wake signal, overriding the
> >  	 * internal logic to generate the codec wake to controller.
> > -- 
> > 2.13.6
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
  2018-02-08  0:31 Rodrigo Vivi
@ 2018-02-08  0:37 ` Rodrigo Vivi
  2018-02-08  4:55   ` Guneshwor Singh
  0 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2018-02-08  0:37 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Sanyog Kale, Guneshwor Singh

Rodrigo Vivi <rodrigo.vivi@intel.com> writes:

> Starting on CNL, we need to enable Audio Pin Buffer.

Ok... I forgot to include ICL on this now.
But first let's check if this is working on CNL and later I sent a v5.

On top of that for CNL and ICL audio needs to know when we are
switching cdclk. But for this work I'd like to hear from audio
if they need a new hook for notification or what.

And I will wait the work on audio start first before attempt
to implement any new hook on our side.

Thanks,
Rodrigo.

>
> v4: Throw the exclusive hook and everything else away
>     and add set/unset bit along with codec awake.
>
> Based on few spec links that I was checking recently
> I now believe that on CNL we also need to keep the codec
> awake chicken bit along with PG2 enable and also add
> this extra pin buffer enable.
>
> BSpec: 18057
> BSpec: 21352
> BSpec: 19621
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Sanyog Kale <sanyog.r.kale@intel.com>
> Cc: Guneshwor Singh <guneshwor.o.singh@intel.com>
> Cc: Abhay Kumar <abhay.kumar@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h    |  3 +++
>  drivers/gpu/drm/i915/intel_audio.c | 11 ++++++++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 65ba10ad1fe5..768e784ea241 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -8424,6 +8424,9 @@ enum {
>  #define HSW_AUD_CHICKENBIT			_MMIO(0x65f10)
>  #define   SKL_AUD_CODEC_WAKE_SIGNAL		(1 << 15)
>  
> +#define AUDIO_PIN_BUF_CTL			_MMIO(0x48414)
> +#define  AUDIO_PIN_BUF_ENABLE			(1 << 31)
> +
>  /* HSW Power Wells */
>  #define _HSW_PWR_WELL_CTL1			0x45400
>  #define _HSW_PWR_WELL_CTL2			0x45404
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 522d54fecb53..34f18322c9bd 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -729,11 +729,20 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>  	u32 tmp;
>  
> -	if (!IS_GEN9_BC(dev_priv))
> +	if (!IS_GEN9_BC(dev_priv) && !IS_CANNONLAKE(dev_priv))
>  		return;
>  
>  	i915_audio_component_get_power(kdev);
>  
> +	if (IS_CANNONLAKE(dev_priv)) {
> +		tmp = I915_READ(AUDIO_PIN_BUF_CTL);
> +		if (enable)
> +			tmp |= AUDIO_PIN_BUF_ENABLE;
> +		else
> +			tmp &= ~AUDIO_PIN_BUF_ENABLE;
> +		I915_WRITE(AUDIO_PIN_BUF_CTL, tmp);
> +	}
> +
>  	/*
>  	 * Enable/disable generating the codec wake signal, overriding the
>  	 * internal logic to generate the codec wake to controller.
> -- 
> 2.13.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] drm/i915/cnl: Enable Audio Pin Buffer.
@ 2018-02-08  0:31 Rodrigo Vivi
  2018-02-08  0:37 ` Rodrigo Vivi
  0 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2018-02-08  0:31 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Sanyog Kale, Guneshwor Singh, Rodrigo Vivi

Starting on CNL, we need to enable Audio Pin Buffer.

v4: Throw the exclusive hook and everything else away
    and add set/unset bit along with codec awake.

Based on few spec links that I was checking recently
I now believe that on CNL we also need to keep the codec
awake chicken bit along with PG2 enable and also add
this extra pin buffer enable.

BSpec: 18057
BSpec: 21352
BSpec: 19621

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Sanyog Kale <sanyog.r.kale@intel.com>
Cc: Guneshwor Singh <guneshwor.o.singh@intel.com>
Cc: Abhay Kumar <abhay.kumar@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h    |  3 +++
 drivers/gpu/drm/i915/intel_audio.c | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 65ba10ad1fe5..768e784ea241 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8424,6 +8424,9 @@ enum {
 #define HSW_AUD_CHICKENBIT			_MMIO(0x65f10)
 #define   SKL_AUD_CODEC_WAKE_SIGNAL		(1 << 15)
 
+#define AUDIO_PIN_BUF_CTL			_MMIO(0x48414)
+#define  AUDIO_PIN_BUF_ENABLE			(1 << 31)
+
 /* HSW Power Wells */
 #define _HSW_PWR_WELL_CTL1			0x45400
 #define _HSW_PWR_WELL_CTL2			0x45404
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 522d54fecb53..34f18322c9bd 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -729,11 +729,20 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	u32 tmp;
 
-	if (!IS_GEN9_BC(dev_priv))
+	if (!IS_GEN9_BC(dev_priv) && !IS_CANNONLAKE(dev_priv))
 		return;
 
 	i915_audio_component_get_power(kdev);
 
+	if (IS_CANNONLAKE(dev_priv)) {
+		tmp = I915_READ(AUDIO_PIN_BUF_CTL);
+		if (enable)
+			tmp |= AUDIO_PIN_BUF_ENABLE;
+		else
+			tmp &= ~AUDIO_PIN_BUF_ENABLE;
+		I915_WRITE(AUDIO_PIN_BUF_CTL, tmp);
+	}
+
 	/*
 	 * Enable/disable generating the codec wake signal, overriding the
 	 * internal logic to generate the codec wake to controller.
-- 
2.13.6

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-02-08  4:55 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-06 21:03 [PATCH] drm/i915/cnl: Enable Audio Pin Buffer Rodrigo Vivi
2017-07-06 23:06 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-08-16 23:46 ` [PATCH] " Pandiyan, Dhinakaran
2017-08-17  3:56   ` Sanyog Kale
2017-08-17 18:55     ` Vivi, Rodrigo
2017-08-17 19:08       ` Pandiyan, Dhinakaran
2018-02-08  0:31 Rodrigo Vivi
2018-02-08  0:37 ` Rodrigo Vivi
2018-02-08  4:55   ` Guneshwor Singh

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.