drm/i915: set proper N/CTS in modeset
Subsystems (2)
PATCH v2 1/1 drm/i915: set proper N/CTS in modeset
From: Libin Yang <[email protected]>
When modeset occurs and the TMDS frequency is set to some speical values, the N/CTS need to be set manually if audio is playing.
--- drivers/gpu/drm/i915/intel_audio.c | 57 ++++++++++++++++++++++++++++++++------ include/drm/i915_component.h | 10 +++++++ 2 files changed, 58 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +48 -9
@@ -128,6 +128,20 @@ static int audio_config_get_n(const struct drm_display_mode *mode, int rate)return 0 ; } +static uint32_t audio_config_setup_n_reg (int n,uint32_t val) +{ +int n_low, n_up; +uint32_t tmp = val; + + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); + tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +return tmp; +} +/* check whether N/CTS/M need be set manually */ static bool audio_rate_need_prog (struct intel_crtc *crtc,struct drm_display_mode *mode)
@@ -262,9 +276,14 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,struct drm_i915_private *dev_priv = connector->dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; +struct intel_digital_port *intel_dig_port = +enc_to_dig_port (&encoder->base); +enum port port = intel_dig_port->port;uint32_t tmp;int len, i; +int n, rate;DRM_DEBUG_KMS ("Enable audio codec on pipe %c, %u bytes ELD\n" ,pipe_name (pipe),drm_eld_size (eld));
@@ -302,12 +321,29 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,/* Enable timestamps */ tmp =I915_READ (HSW_AUD_CFG (pipe)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; - tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ;if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) tmp |=AUD_CONFIG_N_VALUE_INDEX ;else tmp |=audio_config_hdmi_pixel_clock (mode); + + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +if (audio_rate_need_prog (intel_crtc, mode)) { +if (!acomp) + rate =0 ; +else if (port >=PORT_A && port <=PORT_E ) + rate = acomp->aud_sample_rate[port]; +else { +DRM_ERROR ("invalid port: %d\n" , port); + rate =0 ; + } + n =audio_config_get_n (mode, rate); +if (n !=0 ) + tmp =audio_config_setup_n_reg (n, tmp); +else +DRM_DEBUG_KMS ("no suitable N value is found\n" ); + } +I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);
@@ -594,9 +630,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,struct intel_digital_port *intel_dig_port;struct intel_crtc *crtc;struct drm_display_mode *mode; +struct i915_audio_component *acomp = dev_priv->audio_component;enum pipe pipe =-1 ;u32 tmp; -int n_low, n_up, n; +int n;/* HSW, BDW SKL need this fix */ if (!IS_SKYLAKE(dev_priv) &&
@@ -630,6 +667,9 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, pipe_name(pipe), port_name(port)); mode = &crtc->config->base.adjusted_mode; +/* port must be valid now, otherwise the pipe will be invalid */ + acomp->aud_sample_rate[port] = rate; +/* 2. check whether to set the N/CTS/M manually or not */ if (!audio_rate_need_prog (crtc, mode)) { tmp =I915_READ (HSW_AUD_CFG (pipe));
@@ -649,15 +689,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,mutex_unlock (&dev_priv->av_mutex);return 0 ; } - n_low = n &0xfff ; - n_up = (n >>12 ) &0xff ; -/* 4. set the N/CTS/M */ +/* 3. set the N/CTS/M */ tmp =I915_READ (HSW_AUD_CFG (pipe)); - tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); - tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | - (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | -AUD_CONFIG_N_PROG_ENABLE ); + tmp =audio_config_setup_n_reg (n, tmp);I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);
@@ -678,6 +713,7 @@ static int i915_audio_component_bind(struct device *i915_dev, {struct i915_audio_component *acomp = data;struct drm_i915_private *dev_priv =dev_to_i915 (i915_dev); +int i;if (WARN_ON (acomp->ops || acomp->dev))return -EEXIST ;
@@ -685,6 +721,9 @@ static int i915_audio_component_bind(struct device *i915_dev,drm_modeset_lock_all (dev_priv->dev); acomp->ops = &i915_audio_component_ops; acomp->dev = i915_dev; +BUILD_BUG_ON (MAX_PORTS !=I915_MAX_PORTS ); +for (i =0 ; i <ARRAY_SIZE (acomp->aud_sample_rate); i++) + acomp->aud_sample_rate[i] =0 ; dev_priv->audio_component = acomp;drm_modeset_unlock_all (dev_priv->dev);
include/drm/i915_component.h +10 -0
@@ -24,8 +24,18 @@ #ifndef _I915_COMPONENT_H_ #define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port + * It must be sync with I915_MAX_PORTS defined i915_drv.h + * 5 should be enough as only HSW, BDW, SKL need such fix. + */ +#define MAX_PORTS 5 + struct i915_audio_component { struct device *dev; + /** + * @aud_sample_rate: the array of audio sample rate per port + */ + int aud_sample_rate[MAX_PORTS]; const struct i915_audio_component_ops { struct module *owner;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · On Fri, 25 Sep 2015, [email protected] wrote:
From: Libin Yang <[email protected]>
When modeset occurs and the TMDS frequency is set to some speical values, the N/CTS need to be set manually if audio is playing.
Signed-off-by Libin Yang <[email protected]>
Quoted 160 lines
--- drivers/gpu/drm/i915/intel_audio.c | 57 ++++++++++++++++++++++++++++++++------ include/drm/i915_component.h | 10 +++++++ 2 files changed, 58 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_audio.c +48
-9@@ -128,6 +128,20 @@ static int audio_config_get_n(const struct drm_display_mode *mode, int rate)return 0 ; } +static uint32_t audio_config_setup_n_reg (int n,uint32_t val) +{ +int n_low, n_up; +uint32_t tmp = val; + + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); + tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +return tmp; +} +/* check whether N/CTS/M need be set manually */ static bool audio_rate_need_prog (struct intel_crtc *crtc,struct drm_display_mode *mode)@@ -262,9 +276,14 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,struct drm_i915_private *dev_priv = connector->dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; +struct intel_digital_port *intel_dig_port = +enc_to_dig_port (&encoder->base); +enum port port = intel_dig_port->port;uint32_t tmp;int len, i; +int n, rate;DRM_DEBUG_KMS ("Enable audio codec on pipe %c, %u bytes ELD\n" ,pipe_name (pipe),drm_eld_size (eld));@@ -302,12 +321,29 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,/* Enable timestamps */ tmp =I915_READ (HSW_AUD_CFG (pipe)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; - tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ;if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) tmp |=AUD_CONFIG_N_VALUE_INDEX ;else tmp |=audio_config_hdmi_pixel_clock (mode); + + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +if (audio_rate_need_prog (intel_crtc, mode)) { +if (!acomp) + rate =0 ; +else if (port >=PORT_A && port <=PORT_E ) + rate = acomp->aud_sample_rate[port]; +else { +DRM_ERROR ("invalid port: %d\n" , port); + rate =0 ; + } + n =audio_config_get_n (mode, rate); +if (n !=0 ) + tmp =audio_config_setup_n_reg (n, tmp); +else +DRM_DEBUG_KMS ("no suitable N value is found\n" ); + } +I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);@@ -594,9 +630,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,struct intel_digital_port *intel_dig_port;struct intel_crtc *crtc;struct drm_display_mode *mode; +struct i915_audio_component *acomp = dev_priv->audio_component;enum pipe pipe =-1 ;u32 tmp; -int n_low, n_up, n; +int n;/* HSW, BDW SKL need this fix */ if (!IS_SKYLAKE(dev_priv) &&@@ -630,6 +667,9 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, pipe_name(pipe), port_name(port)); mode = &crtc->config->base.adjusted_mode; +/* port must be valid now, otherwise the pipe will be invalid */ + acomp->aud_sample_rate[port] = rate; +/* 2. check whether to set the N/CTS/M manually or not */ if (!audio_rate_need_prog (crtc, mode)) { tmp =I915_READ (HSW_AUD_CFG (pipe));@@ -649,15 +689,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,mutex_unlock (&dev_priv->av_mutex);return 0 ; } - n_low = n &0xfff ; - n_up = (n >>12 ) &0xff ; -/* 4. set the N/CTS/M */ +/* 3. set the N/CTS/M */ tmp =I915_READ (HSW_AUD_CFG (pipe)); - tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); - tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | - (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | -AUD_CONFIG_N_PROG_ENABLE ); + tmp =audio_config_setup_n_reg (n, tmp);I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);@@ -678,6 +713,7 @@ static int i915_audio_component_bind(struct device *i915_dev, {struct i915_audio_component *acomp = data;struct drm_i915_private *dev_priv =dev_to_i915 (i915_dev); +int i;if (WARN_ON (acomp->ops || acomp->dev))return -EEXIST ;@@ -685,6 +721,9 @@ static int i915_audio_component_bind(struct device *i915_dev,drm_modeset_lock_all (dev_priv->dev); acomp->ops = &i915_audio_component_ops; acomp->dev = i915_dev; +BUILD_BUG_ON (MAX_PORTS !=I915_MAX_PORTS ); +for (i =0 ; i <ARRAY_SIZE (acomp->aud_sample_rate); i++) + acomp->aud_sample_rate[i] =0 ; dev_priv->audio_component = acomp;drm_modeset_unlock_all (dev_priv->dev);include/drm/i915_component.h +10
-0@@ -24,8 +24,18 @@ #ifndef _I915_COMPONENT_H_ #define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port + * It must be sync with I915_MAX_PORTS defined i915_drv.h + * 5 should be enough as only HSW, BDW, SKL need such fix. + */ +#define MAX_PORTS 5 + struct i915_audio_component { struct device *dev; + /** + * @aud_sample_rate: the array of audio sample rate per port + */ + int aud_sample_rate[MAX_PORTS]; const struct i915_audio_component_ops { struct module *owner;Signature · 1 line
1.9.1
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Jani Nikula
Quoted 7 lines · On Fri, 25 Sep 2015, [email protected] wrote:
From: Libin Yang <[email protected]>
When modeset occurs and the TMDS frequency is set to some speical values, the N/CTS need to be set manually if audio is playing.
Signed-off-by Libin Yang <[email protected]>Reviewed-by Jani Nikula <[email protected]>
Now all 4 patches are applied to topic/drm-sync-audio-rate.
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/drm-sync-audio-rate
It was merged back to sound for-next branch, too.
Feel free to merge this branch into drm tree.
thanks,
Takashi
Quoted 157 lines
Quoted 157 lines
--- drivers/gpu/drm/i915/intel_audio.c | 57 ++++++++++++++++++++++++++++++++------ include/drm/i915_component.h | 10 +++++++ 2 files changed, 58 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_audio.c +48
-9@@ -128,6 +128,20 @@ static int audio_config_get_n(const struct drm_display_mode *mode, int rate)return 0 ; } +static uint32_t audio_config_setup_n_reg (int n,uint32_t val) +{ +int n_low, n_up; +uint32_t tmp = val; + + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); + tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +return tmp; +} +/* check whether N/CTS/M need be set manually */ static bool audio_rate_need_prog (struct intel_crtc *crtc,struct drm_display_mode *mode)@@ -262,9 +276,14 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,struct drm_i915_private *dev_priv = connector->dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; +struct intel_digital_port *intel_dig_port = +enc_to_dig_port (&encoder->base); +enum port port = intel_dig_port->port;uint32_t tmp;int len, i; +int n, rate;DRM_DEBUG_KMS ("Enable audio codec on pipe %c, %u bytes ELD\n" ,pipe_name (pipe),drm_eld_size (eld));@@ -302,12 +321,29 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,/* Enable timestamps */ tmp =I915_READ (HSW_AUD_CFG (pipe)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; - tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ;if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) tmp |=AUD_CONFIG_N_VALUE_INDEX ;else tmp |=audio_config_hdmi_pixel_clock (mode); + + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +if (audio_rate_need_prog (intel_crtc, mode)) { +if (!acomp) + rate =0 ; +else if (port >=PORT_A && port <=PORT_E ) + rate = acomp->aud_sample_rate[port]; +else { +DRM_ERROR ("invalid port: %d\n" , port); + rate =0 ; + } + n =audio_config_get_n (mode, rate); +if (n !=0 ) + tmp =audio_config_setup_n_reg (n, tmp); +else +DRM_DEBUG_KMS ("no suitable N value is found\n" ); + } +I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);@@ -594,9 +630,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,struct intel_digital_port *intel_dig_port;struct intel_crtc *crtc;struct drm_display_mode *mode; +struct i915_audio_component *acomp = dev_priv->audio_component;enum pipe pipe =-1 ;u32 tmp; -int n_low, n_up, n; +int n;/* HSW, BDW SKL need this fix */ if (!IS_SKYLAKE(dev_priv) &&@@ -630,6 +667,9 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, pipe_name(pipe), port_name(port)); mode = &crtc->config->base.adjusted_mode; +/* port must be valid now, otherwise the pipe will be invalid */ + acomp->aud_sample_rate[port] = rate; +/* 2. check whether to set the N/CTS/M manually or not */ if (!audio_rate_need_prog (crtc, mode)) { tmp =I915_READ (HSW_AUD_CFG (pipe));@@ -649,15 +689,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,mutex_unlock (&dev_priv->av_mutex);return 0 ; } - n_low = n &0xfff ; - n_up = (n >>12 ) &0xff ; -/* 4. set the N/CTS/M */ +/* 3. set the N/CTS/M */ tmp =I915_READ (HSW_AUD_CFG (pipe)); - tmp &= ~(AUD_CONFIG_UPPER_N_MASK |AUD_CONFIG_LOWER_N_MASK ); - tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | - (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | -AUD_CONFIG_N_PROG_ENABLE ); + tmp =audio_config_setup_n_reg (n, tmp);I915_WRITE (HSW_AUD_CFG (pipe), tmp);mutex_unlock (&dev_priv->av_mutex);@@ -678,6 +713,7 @@ static int i915_audio_component_bind(struct device *i915_dev, {struct i915_audio_component *acomp = data;struct drm_i915_private *dev_priv =dev_to_i915 (i915_dev); +int i;if (WARN_ON (acomp->ops || acomp->dev))return -EEXIST ;@@ -685,6 +721,9 @@ static int i915_audio_component_bind(struct device *i915_dev,drm_modeset_lock_all (dev_priv->dev); acomp->ops = &i915_audio_component_ops; acomp->dev = i915_dev; +BUILD_BUG_ON (MAX_PORTS !=I915_MAX_PORTS ); +for (i =0 ; i <ARRAY_SIZE (acomp->aud_sample_rate); i++) + acomp->aud_sample_rate[i] =0 ; dev_priv->audio_component = acomp;drm_modeset_unlock_all (dev_priv->dev);include/drm/i915_component.h +10
-0@@ -24,8 +24,18 @@ #ifndef _I915_COMPONENT_H_ #define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port + * It must be sync with I915_MAX_PORTS defined i915_drv.h + * 5 should be enough as only HSW, BDW, SKL need such fix. + */ +#define MAX_PORTS 5 + struct i915_audio_component { struct device *dev; + /** + * @aud_sample_rate: the array of audio sample rate per port + */ + int aud_sample_rate[MAX_PORTS];
Quoted 9 lines
Quoted 5 lines
include/drm/i915_component.h +0
-0const struct i915_audio_component_ops { struct module *owner;Signature · 1 line
1.9.1Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Takashi Iwai
Quoted 10 lines · Jani Nikula
Quoted 7 lines · On Fri, 25 Sep 2015, [email protected] wrote:
From: Libin Yang <[email protected]>
When modeset occurs and the TMDS frequency is set to some speical values, the N/CTS need to be set manually if audio is playing.
Signed-off-by Libin Yang <[email protected]>
Quoted 8 lines
Quoted 1 line
Reviewed-by Jani Nikula <[email protected]>Now all 4 patches are applied to topic/drm-sync-audio-rate.
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.gittopic/drm-sync-audio-rateIt was merged back to sound for-next branch, too.
Feel free to merge this branch into drm tree.
I've merged your branch with now 5 patches into drm-intel-next-queued. There's a bit of conflicts with ongoing i915 work, so for pull request ordering it's probably better when sound goes in before drm (or otherwise Linus will end up with a mess).
Adding Dave about that one as fyi.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 6 lines · On 2015-09-25 03:36, [email protected] wrote:
include/drm/i915_component.h +2
-0@@ -24,8 +24,18 @@#ifndef _I915_COMPONENT_H_#define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port +* It must be sync with I915_MAX_PORTS defined i915_drv.h
include/drm/i915_component.h line 38
Quoted 10 lines
include/drm/i915_component.h +8
-0+* 5 should be enough as only HSW, BDW, SKL need such fix. +*/ +#define MAX_PORTS 5 +struct i915_audio_component {struct device *dev; +/** +* @aud_sample_rate: the array of audio sample rate per port +*/ +int aud_sample_rate[MAX_PORTS ];
Just a quick question as I was trying to understand the code:
aud_sample_rate seems only set and get on the i915 side, never on the hda side.
In short, why is this variable here, and not in e g, as a single integer in the intel_digital_port struct?
That way we also avoid the possibility of MAX_PORTS becoming out of sync with the i915 side.
Signature · 2 lines
David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
+ gfx driver team.
Hi David,
Quoted 32 lines
-----Original Message-----
From: David Henningsson [mailto:[email protected]]
Sent: Tuesday, October 13, 2015 9:43 PM
To: [email protected]; Yang, Libin
Subject: Re: [alsa-devel] [PATCH v2] drm/i915: set proper N/CTS in modesetQuoted 6 lines · On 2015-09-25 03:36, [email protected] wrote:
include/drm/i915_component.h +2
-0@@ -24,8 +24,18 @@#ifndef _I915_COMPONENT_H_#define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port +* It must be sync with I915_MAX_PORTS defined i915_drv.h include/drm/i915_component.h line 38
Quoted 10 lines
include/drm/i915_component.h +8
-0+* 5 should be enough as only HSW, BDW, SKL need such fix. +*/ +#define MAX_PORTS 5 +struct i915_audio_component {struct device *dev; +/** +* @aud_sample_rate: the array of audio sample rate per port +*/ +int aud_sample_rate[MAX_PORTS ];Just a quick question as I was trying to understand the code:
aud_sample_rateseems only set and get on the i915 side, never on the hda side.
Quoted 6 lines
In short, why is this variable here, and not in e g, as a single integer in the
intel_digital_portstruct?That way we also avoid the possibility of
MAX_PORTSbecoming out of sync
with the i915 side.
Put it in struct i915_audio_component just because it is audio related and easy for management.
It seems to put it in intel_digital_port will be easier.
Let's hear the gfx team's comments.
Regards,
Libin
Quoted 4 lines
--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
Quoted 39 lines · Libin
+ gfx driver team.
Hi David,
Quoted 35 lines
-----Original Message-----
From: David Henningsson [mailto:[email protected]]
Sent: Tuesday, October 13, 2015 9:43 PM
To: [email protected]; Yang, Libin
Subject: Re: [alsa-devel] [PATCH v2] drm/i915: set proper N/CTS in modesetQuoted 6 lines · On 2015-09-25 03:36, [email protected] wrote:
include/drm/i915_component.h +2
-0@@ -24,8 +24,18 @@#ifndef _I915_COMPONENT_H_#define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port +* It must be sync with I915_MAX_PORTS defined i915_drv.h include/drm/i915_component.h line 38
Quoted 10 lines
include/drm/i915_component.h +8
-0+* 5 should be enough as only HSW, BDW, SKL need such fix. +*/ +#define MAX_PORTS 5 +struct i915_audio_component {struct device *dev; +/** +* @aud_sample_rate: the array of audio sample rate per port +*/ +int aud_sample_rate[MAX_PORTS ];Just a quick question as I was trying to understand the code:
aud_sample_rateseems only set and get on the i915 side, never on the hda side.In short, why is this variable here, and not in e g, as a single integer in the
intel_digital_portstruct?
Quoted 8 lines
Quoted 3 lines
That way we also avoid the possibility of
MAX_PORTSbecoming out of sync
with the i915 side.Put it in struct
i915_audio_componentjust because it is audio related and easy for management.It seems to put it in
intel_digital_portwill be easier.
IIRC that's more or less how I pseudo-coded it in one of my replies in one of the threads discussing this...
Yeah here
http://lists.freedesktop.org/archives/intel-gfx/2015-August/074267.html
Signature · 2 lines
Ville Syrjälä Intel OTC
Jani Nikula
maintainerQuoted 43 lines · Libin
+ gfx driver team.
Hi David,
Quoted 32 lines
-----Original Message-----
From: David Henningsson [mailto:[email protected]]
Sent: Tuesday, October 13, 2015 9:43 PM
To: [email protected]; Yang, Libin
Subject: Re: [alsa-devel] [PATCH v2] drm/i915: set proper N/CTS in modesetQuoted 6 lines · On 2015-09-25 03:36, [email protected] wrote:
include/drm/i915_component.h +2
-0@@ -24,8 +24,18 @@#ifndef _I915_COMPONENT_H_#define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port +* It must be sync with I915_MAX_PORTS defined i915_drv.h include/drm/i915_component.h line 38
Quoted 10 lines
include/drm/i915_component.h +8
-0+* 5 should be enough as only HSW, BDW, SKL need such fix. +*/ +#define MAX_PORTS 5 +struct i915_audio_component {struct device *dev; +/** +* @aud_sample_rate: the array of audio sample rate per port +*/ +int aud_sample_rate[MAX_PORTS ];Just a quick question as I was trying to understand the code:
aud_sample_rateseems only set and get on the i915 side, never on the hda side.Quoted 6 lines
In short, why is this variable here, and not in e g, as a single integer in the
intel_digital_portstruct?That way we also avoid the possibility of
MAX_PORTSbecoming out of sync
with the i915 side.
Quoted 6 lines
Put it in struct
i915_audio_componentjust because it is audio related and easy for management.It seems to put it in
intel_digital_portwill be easier.Let's hear the gfx team's comments.
Ack on moving it into struct intel_digital_port.
We had a bit of a hurry to get the original patches in, didn't want to start bikeshedding at each step of the way...
BR,
Jani.
Quoted 8 lines
Regards,
LibinQuoted 4 lines
--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center