drm/i915: Add audio sync_audio_rate callback
Subsystems (3)
PATCH v5 1/4 drm/i915: Add audio sync_audio_rate callback
From: Libin Yang <[email protected]>
Add the sync_audio_rate callback.
With the callback, audio driver can trigger
i915 driver to set the proper N/CTS or N/M
based on different sample rates.
--- include/drm/i915_component.h | 1 + 1 file changed, 1 insertion(+)
include/drm/i915_component.h +1 -0
@@ -33,6 +33,7 @@ struct i915_audio_component {void (*put_power)(struct device *);void (*codec_wake_override)(struct device *,bool enable);int (*get_cdclk_freq)(struct device *); +int (*sync_audio_rate)(struct device *,int port,int rate); } *ops; };
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 2/4 drm/i915: implement sync_audio_rate callback
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
--- drivers/gpu/drm/i915/intel_audio.c | 119 +++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+)
drivers/gpu/drm/i915/intel_audio.c +119 -0
@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, }; +/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001) +static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 }, + {96000 ,TMDS_297M ,10240 ,247500 }, + {176400 ,TMDS_296M ,17836 ,234375 }, + {176400 ,TMDS_297M ,18816 ,247500 }, + {44100 ,TMDS_296M ,23296 ,281250 }, + {44100 ,TMDS_297M ,20480 ,247500 }, +}; +/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock (struct drm_display_mode *mode) {
@@ -90,6 +115,31 @@ static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)return hdmi_audio_clock[i].config; } +static int audio_config_get_n (struct drm_display_mode *mode,int rate) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { +if ((rate == aud_ncts[i].sample_rate) && + (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, +struct drm_display_mode *mode) +{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,
@@ -514,12 +564,81 @@ static int i915_audio_component_get_cdclk_freq(struct device *dev)return ret; } +static int i915_audio_component_sync_audio_rate (struct device *dev, +int port,int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp; +int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder->base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc); +if (!crtc) { +DRM_DEBUG_KMS ("%s: crtc is NULL\n" , __func__); +continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { +DRM_DEBUG_KMS ("no pipe for the port %c\n" ,port_name (port)); +return -ENODEV ; + } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { +DRM_DEBUG_KMS ("Using automatic mode for N value on port %c\n" , +port_name (port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. 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 ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} +static const struct i915_audio_component_ops i915_audio_component_ops = { .owner =THIS_MODULE , .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override = i915_audio_component_codec_wake_override, .get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, }; static int i915_audio_component_bind(struct device *i915_dev,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 20 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119 +++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+)drivers/gpu/drm/i915/intel_audio.c +0
-0
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, }; +/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)
I don't really like the defines.
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +11
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 },
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ { 32000, TMDS_297M, 3072, 222750 }, + { 88200, TMDS_296M, 8918, 234375 }, + { 88200, TMDS_297M, 9408, 247500 }, + { 96000, TMDS_296M, 11648, 281250 }, + { 96000, TMDS_297M, 10240, 247500 }, + { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};
Last two should be 192 kHz. All the other values seem to match the spec.
These do assume 8bpc, but as the spec doesn't even specify N/CTS values for deep color modes @ 297MHz, so I suppose the expectations is that the max TMDS clock will never be so high as to allow them.
If/when we start using manual programming for other TMDS clock rates we'll need to consider 12bpc as well.
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode) · line 118
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock (struct drm_display_mode *mode) {@@ -90,6 +115,31 @@ static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)return hdmi_audio_clock[i].config; } +static int audio_config_get_n (struct drm_display_mode *mode,int rate)
mode can be const.
Quoted 41 lines
drivers/gpu/drm/i915/intel_audio.c +34
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { +if ((rate == aud_ncts[i].sample_rate) && + (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, +struct drm_display_mode *mode) +{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int i915_audio_component_get_cdclk_freq(struct device *dev)return ret; } +static int i915_audio_component_sync_audio_rate (struct device *dev, +int port,int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ;
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 586
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+u32 tmp; +int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder->base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc);
This sort of thing would need some locking to safely start digging at the modeset state.
I would probably not do that, and instead add some new lock(s) for this. The modeset code would then fill out some relevant information protected by that same lock, and this function could then go look at it without having to worry about the rest of modeset locking/state.
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+if (!crtc) { +DRM_DEBUG_KMS ("%s: crtc is NULL\n" , __func__); +continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { +DRM_DEBUG_KMS ("no pipe for the port %c\n" ,port_name (port)); +return -ENODEV ;
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);
This stuff would need to be abstracted to work on pre-HSW too.
Quoted 43 lines
drivers/gpu/drm/i915/intel_audio.c +27
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { +DRM_DEBUG_KMS ("Using automatic mode for N value on port %c\n" , +port_name (port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. 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 ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} +static const struct i915_audio_component_ops i915_audio_component_ops = { .owner =THIS_MODULE , .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override = i915_audio_component_codec_wake_override, .get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, }; static int i915_audio_component_bind(struct device *i915_dev,Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 37 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 119 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 7 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, };
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
I agree it's not a good name. Do you have some suggestions?
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_audio.c +16
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 }, + {96000 ,TMDS_297M ,10240 ,247500 },
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+ { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};Last two should be 192 kHz. All the other values seem to match the spec.
Oh, my typo. Thanks for pointing it out.
Quoted 9 lines
These do assume 8bpc, but as the spec doesn't even specify N/CTS values for deep color modes @ 297MHz, so I suppose the expectations is
that the max TMDS clock will never be so high as to allow them.If/when we start using manual programming for other TMDS clock rates
we'll need to consider 12bpc as well.
These values are recommended from HDMI spec. It's not related to the bpp. Am I wrong? I'm find the value from HDMISpecification 1.4: table 7-1, table 7-2 and table 7-3.
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct {
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static u32
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0{@@ -90,6 +115,31 @@ static u32
audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return hdmi_audio_clock[i].config; } +static int audio_config_get_n(struct drm_display_mode *mode, intrate)
mode can be const.
OK. I will change it.
Quoted 60 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { + if ((rate == aud_ncts[i].sample_rate) &&drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, + struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(struct device*dev,
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ int port, int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp;drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 586
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder- base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc);This sort of thing would need some locking to safely start digging at the modeset state.
Quoted 5 lines
I would probably not do that, and instead add some new lock(s) for this. The modeset code would then fill out some relevant information protected
by that same lock, and this function could then go look at it without having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the function, I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you have suggested
lock I can use?
Quoted 14 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 589
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +11
-0+return -ENODEV ; + } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Right, I need judge the platform firstly.
Quoted 44 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { + DRM_DEBUG_KMS("Using automatic mode for N valueon port %c\n",
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. set the N/CTS/M */ + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0.get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, };static int i915_audio_component_bind(struct device
*i915_dev,
--
1.9.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 37 lines · Libin
Quoted 37 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 119 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 7 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, };
Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
I agree it's not a good name. Do you have some suggestions?
I'd probably just have used raw numbers myself.
Quoted 35 lines
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/intel_audio.c +16
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 }, + {96000 ,TMDS_297M ,10240 ,247500 },Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+ { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};Last two should be 192 kHz. All the other values seem to match the spec.
Oh, my typo. Thanks for pointing it out.
Quoted 6 lines
These do assume 8bpc, but as the spec doesn't even specify N/CTS values for deep color modes @ 297MHz, so I suppose the expectations is
that the max TMDS clock will never be so high as to allow them.
Quoted 7 lines
Quoted 3 lines
If/when we start using manual programming for other TMDS clock rates
we'll need to consider 12bpc as well.These values are recommended from HDMI spec. It's not related to the bpp. Am I wrong? I'm find the value from HDMISpecification 1.4: table 7-1, table 7-2 and table 7-3.
There are separate tables for deep color modes in appendix D. Tables D-1 through D-3 are of interest to us since we can only do the 12bpc deep color mode.
Quoted 85 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c static const struct {
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static u32
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0{@@ -90,6 +115,31 @@ static u32
audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return hdmi_audio_clock[i].config; } +static int audio_config_get_n(struct drm_display_mode *mode, intrate)
mode can be const.
OK. I will change it.
Quoted 65 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { + if ((rate == aud_ncts[i].sample_rate) &&drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, + struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(struct device*dev,
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ int port, int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp;drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 586
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder- base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc);This sort of thing would need some locking to safely start digging at the modeset state.
I would probably not do that, and instead add some new lock(s) for this. The modeset code would then fill out some relevant information protected
by that same lock, and this function could then go look at it without having to worry about the rest of modeset locking/state.
Quoted 5 lines
Quoted 1 line
From audio side, there is no competition when calling the function,
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you have suggested
lock I can use?
To do it like this we'd need pretty much all the modeset locks, which to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind of new audio lock to i915.
Quoted 83 lines
Quoted 15 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 589
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +11
-0+return -ENODEV ; + } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Right, I need judge the platform firstly.
Quoted 52 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { + DRM_DEBUG_KMS("Using automatic mode for N valueon port %c\n",
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. set the N/CTS/M */ + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0.get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, };static int i915_audio_component_bind(struct device
*i915_dev,
--
1.9.1Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 45 lines · Ville Syrjälä
Quoted 43 lines · Libin
Quoted 42 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 119 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cdrivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 10 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +3
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, }; +/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
Quoted 3 lines
Quoted 1 line
I agree it's not a good name. Do you have some suggestions?
I'd probably just have used raw numbers myself.
It's quite unsafe. You can easily overlook, e.g. 29700 instead of 297000.
Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
In reply to Ville SyrjäläQuoted 98 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, August 24, 2015 8:53 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 37 lines · Libin
Quoted 37 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 119 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 7 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, };Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
I agree it's not a good name. Do you have some suggestions?
I'd probably just have used raw numbers myself.
Quoted 27 lines
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/intel_audio.c +16
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 }, + {96000 ,TMDS_297M ,10240 ,247500 },Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+ { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};Last two should be 192 kHz. All the other values seem to match the spec.
Quoted 5 lines
Oh, my typo. Thanks for pointing it out.
Quoted 3 lines
These do assume 8bpc, but as the spec doesn't even specify N/CTS values for deep color modes @ 297MHz, so I suppose the
expectations
Quoted 7 lines
Quoted 6 lines
is
that the max TMDS clock will never be so high as to allow them.If/when we start using manual programming for other TMDS clock rates
we'll need to consider 12bpc as well.
Quoted 7 lines
Quoted 3 lines
These values are recommended from HDMI spec. It's not related to the bpp. Am I wrong? I'm find the value from HDMISpecification 1.4: table 7-1, table 7-2 and table 7-3.
There are separate tables for deep color modes in appendix D. Tables D-1 through D-3 are of interest to us since we can only do the 12bpc deep color mode.
Yes, we found the D tables in the spec before, and it seems a little Complicated. And the table 7-x seems to be more general. This is the reason we use table 7-x.
OK. We will use D-1, D-2 and D-3 table for N/CTS.
Quoted 97 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c static const struct {
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock(struct
drm_display_modeQuoted 8 lines
Quoted 8 lines
*mode)
drivers/gpu/drm/i915/intel_audio.c static u32
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0{@@ -90,6 +115,31 @@ static u32
audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return hdmi_audio_clock[i].config; } +static int audio_config_get_n(struct drm_display_mode *mode,int
Quoted 64 lines
Quoted 3 lines
rate)
mode can be const.
OK. I will change it.
Quoted 58 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { + if ((rate == aud_ncts[i].sample_rate) &&drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, + struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(struct device*dev,
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ int port, int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp;drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 586
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder- base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc);This sort of thing would need some locking to safely start digging
at
Quoted 3 lines
Quoted 3 lines
the modeset state.
I would probably not do that, and instead add some new lock(s) for
this.
Quoted 3 lines
Quoted 3 lines
The modeset code would then fill out some relevant information protected
by that same lock, and this function could then go look at itwithout
Quoted 7 lines
Quoted 3 lines
having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the function,
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you have suggested
lock I can use?
Quoted 4 lines
To do it like this we'd need pretty much all the modeset locks, which to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind of new audio lock to i915.
If we are using a new audio lock, I believe we still need use the lock when gfx is doing the modeset. Only adding the new lock in the function i915_audio_component_sync_audio_rate() is not enough because gfx driver will still modify it without locking.
I'm not sure where to add the lock in the gfx driver.
Regards,
Libin
Quoted 85 lines
Quoted 30 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 589
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +11
-0+return -ENODEV ; + } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Quoted 54 lines
Right, I need judge the platform firstly.
Quoted 52 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { + DRM_DEBUG_KMS("Using automatic mode for N valueon port %c\n",
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. set the N/CTS/M */ + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0.get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, };static int i915_audio_component_bind(struct device
*i915_dev,
--
1.9.1Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
Quoted 3 lines
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 102 lines · Libin
Quoted 102 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, August 24, 2015 8:53 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 37 lines · Libin
Quoted 37 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Tue, Aug 18, 2015 at 02:51:52PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 119 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 7 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -68,6 +68,31 @@ static const struct { { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 }, };Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
I agree it's not a good name. Do you have some suggestions?
I'd probably just have used raw numbers myself.
Quoted 27 lines
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/intel_audio.c +16
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 }, + {96000 ,TMDS_297M ,10240 ,247500 },Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+ { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};Last two should be 192 kHz. All the other values seem to match the spec.
Quoted 5 lines
Oh, my typo. Thanks for pointing it out.
Quoted 3 lines
These do assume 8bpc, but as the spec doesn't even specify N/CTS values for deep color modes @ 297MHz, so I suppose the
expectations
Quoted 10 lines
Quoted 6 lines
is
that the max TMDS clock will never be so high as to allow them.If/when we start using manual programming for other TMDS clock rates
we'll need to consider 12bpc as well.These values are recommended from HDMI spec. It's not related to the bpp. Am I wrong? I'm find the value from HDMISpecification 1.4: table 7-1, table 7-2 and table 7-3.
Quoted 7 lines
Quoted 3 lines
There are separate tables for deep color modes in appendix D. Tables D-1 through D-3 are of interest to us since we can only do the 12bpc deep color mode.
Yes, we found the D tables in the spec before, and it seems a little Complicated. And the table 7-x seems to be more general. This is the reason we use table 7-x.
What's complicated? With 8bpc you use 7-x, with 12bpc you use D-x. But as stated there are no 297MHz values in the D-x tables so the assumption seems to be that the max TMDS clock will be ~300Mhz and so there's no way to to get a 297Mhz pixel clock with deep color modes.
The fact that the D-x tables refer to the pixel clock instead of TMDS clock is also a bit confusing. Seems they forgot about pixel replication there. But I believe we should just consider the pixel replicated pixel clock when consulting these tables.
Quoted 2 lines
OK. We will use D-1, D-2 and D-3 table for N/CTS.
If you're only worried about 297Mhz modes, then there should be no need to consult the D-x tables at this time.
Quoted 103 lines
Quoted 98 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static const struct {
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ static u32 audio_config_hdmi_pixel_clock(struct
drm_display_modeQuoted 8 lines
Quoted 8 lines
*mode)
drivers/gpu/drm/i915/intel_audio.c static u32
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0{@@ -90,6 +115,31 @@ static u32
audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return hdmi_audio_clock[i].config; } +static int audio_config_get_n(struct drm_display_mode *mode,int
Quoted 64 lines
Quoted 3 lines
rate)
mode can be const.
OK. I will change it.
Quoted 58 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { + if ((rate == aud_ncts[i].sample_rate) &&drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n; + } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog (struct intel_crtc *crtc, + struct drm_display_mode*mode)
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true; +else +return false; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(struct device*dev,
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ int port, int rate) +{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc; +struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp;drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 586
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { +if (intel_encoder->type !=INTEL_OUTPUT_HDMI ) +continue ; + intel_dig_port =enc_to_dig_port (&intel_encoder- base); +if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc);This sort of thing would need some locking to safely start digging
at
Quoted 3 lines
Quoted 3 lines
the modeset state.
I would probably not do that, and instead add some new lock(s) for
this.
Quoted 3 lines
Quoted 3 lines
The modeset code would then fill out some relevant information protected
by that same lock, and this function could then go look at itwithout
Quoted 7 lines
Quoted 3 lines
having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the function,
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you have suggested
lock I can use?Quoted 4 lines
To do it like this we'd need pretty much all the modeset locks, which to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind of new audio lock to i915.
Quoted 7 lines
If we are using a new audio lock, I believe we still need use the lock when gfx is doing the modeset. Only adding the new lock in the function
i915_audio_component_sync_audio_rate()is not enough because gfx driver will still modify it without locking.I'm not sure where to add the lock in the gfx driver.
The audio enable/disable during modeset would also grab the lock, and consult whatever information the audio driver provided. I would also suggest renaming the .sync_audio_rate() to something more clear like .set_sample_rate()
Anyway, I was thinking of something like this:
intel_audio_codec_enable()
{
lock();
.. configure n/cts
encoder->audio.enabled = true;
unlock();
}intel_audio_codec_disable()
{
lock();
encoder->audio.enabled = false;
unlock();
}set_sample_rate()
{
lock();
encoder->audio.sample_rate = rate;
if (encoder->audio.enabled) {
... reconfigure n/cts
}
unlock();
}Something like that should protect sample rate changes from racing with an ongoing modeset.
Quoted 91 lines
Regards,
LibinQuoted 88 lines
Quoted 30 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 589
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +11
-0+return -ENODEV ; + } +DRM_DEBUG_KMS ("pipe %c connects port %c\n" , +pipe_name (pipe),port_name (port)); + mode = &crtc->config->base.adjusted_mode; + +/* 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)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Quoted 54 lines
Right, I need judge the platform firstly.
Quoted 52 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { + DRM_DEBUG_KMS("Using automatic mode for N valueon port %c\n",
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. set the N/CTS/M */ + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ tmp |= ((n_up <<AUD_CONFIG_UPPER_N_SHIFT ) | + (n_low <<AUD_CONFIG_LOWER_N_SHIFT ) | +AUD_CONFIG_N_PROG_ENABLE ); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0.get_cdclk_freq = i915_audio_component_get_cdclk_freq, + .sync_audio_rate = i915_audio_component_sync_audio_rate, };static int i915_audio_component_bind(struct device
*i915_dev,
--
1.9.1Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 144 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, August 25, 2015 12:27 AM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 21 lines · Libin
Quoted 21 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, August 24, 2015 8:53 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 10 lines · Libin
Quoted 10 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Tue, Aug 18, 2015 at 02:51:52PM +0800,
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines · wrote:
From: Libin Yang <[email protected]>
HDMI audio may not work at some frequencies with the HW provided N/CTS.
Quoted 8 lines
This patch sets the proper N value for the given audio sample rate at the impacted frequencies. At other frequencies, it will use the N/CTS value which HW provides.
Signed-off-by Libin Yang <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 119+++++++++++++++++++++++++++++++++++++
Quoted 2 lines
1 file changed, 119 insertions(+)Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cdrivers/gpu/drm/i915/intel_audio.c static const struct { · line 68
Quoted 5 lines
index dc32cf4..96b97be 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -68,6 +68,31 @@ static const struct { { 148500,
AUD_CONFIG_PIXEL_CLOCK_HDMI_148500},Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 73
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0}; +/* HDMI N/CTS table */ +#define TMDS_297M 297000 +#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)I don't really like the defines.
I agree it's not a good name. Do you have some suggestions?
I'd probably just have used raw numbers myself.
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_audio.c +15
-0+static const struct { +int sample_rate; +int clock; +int n; +int cts; +} aud_ncts[] = { + {44100 ,TMDS_296M ,4459 ,234375 }, + {44100 ,TMDS_297M ,4704 ,247500 }, + {48000 ,TMDS_296M ,5824 ,281250 }, + {48000 ,TMDS_297M ,5120 ,247500 }, + {32000 ,TMDS_296M ,5824 ,421875 }, + {32000 ,TMDS_297M ,3072 ,222750 }, + {88200 ,TMDS_296M ,8918 ,234375 }, + {88200 ,TMDS_297M ,9408 ,247500 }, + {96000 ,TMDS_296M ,11648 ,281250 },Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 94
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+ { 96000, TMDS_297M, 10240, 247500 }, + { 176400, TMDS_296M, 17836, 234375 }, + { 176400, TMDS_297M, 18816, 247500 }, + { 44100, TMDS_296M, 23296, 281250 }, + { 44100, TMDS_297M, 20480, 247500 }, +};Last two should be 192 kHz. All the other values seem to match
the
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
spec.
Oh, my typo. Thanks for pointing it out.
Quoted 2 lines
These do assume 8bpc, but as the spec doesn't even specify
N/CTS
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
values for deep color modes @ 297MHz, so I suppose the
expectations
Quoted 4 lines
Quoted 4 lines
is
that the max TMDS clock will never be so high as to allow them.If/when we start using manual programming for other TMDS
clock
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
rates
we'll need to consider 12bpc as well.These values are recommended from HDMI spec. It's not related to the bpp. Am I wrong? I'm find the value from
HDMISpecification
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
1.4: table 7-1, table 7-2 and table 7-3.
There are separate tables for deep color modes in appendix D.
Tables
Quoted 1 line
Quoted 1 line
D-1 through D-3 are of interest to us since we can only do the
12bpc
Quoted 5 lines
Quoted 1 line
deep color mode.
Yes, we found the D tables in the spec before, and it seems a little Complicated. And the table 7-x seems to be more general. This is the reason we use table 7-x.
What's complicated? With 8bpc you use 7-x, with 12bpc you use D-x. But
as stated there are no 297MHz values in the D-x tables so the assumption
seems to be that the max TMDS clock will be ~300Mhz and so there's no
way to to get a 297Mhz pixel clock with deep color modes.The fact that the D-x tables refer to the pixel clock instead of TMDS clock is also a bit confusing. Seems they forgot about pixel replication there. But I believe we should just consider the pixel replicated pixel clock when consulting these tables.
Quoted 1 line
Quoted 5 lines
Quoted 1 line
OK. We will use D-1, D-2 and D-3 table for N/CTS.
If you're only worried about 297Mhz modes, then there should be no need
to consult the D-x tables at this time.
OK, so I will still use the 7-x table.
Quoted 128 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 96
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c static const struct { · line 97
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +0
-0static u32 audio_config_hdmi_pixel_clock(struct
drm_display_modeQuoted 4 lines
Quoted 4 lines
*mode)
drivers/gpu/drm/i915/intel_audio.c static u32
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0{@@ -90,6 +115,31 @@ static u32audio_config_hdmi_pixel_clock(struct
drm_display_mode*mode)
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return hdmi_audio_clock[i].config; } +static int audio_config_get_n(struct drm_display_mode*mode,
Quoted 8 lines
Quoted 8 lines
int
Quoted 7 lines
Quoted 3 lines
rate)
mode can be const.
OK. I will change it.
Quoted 1 line
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +7
-0+{ +int i; + +for (i =0 ; i <ARRAY_SIZE (aud_ncts); i++) { +if ((rate == aud_ncts[i].sample_rate) && + (mode->clock == aud_ncts[i].clock)) { +return aud_ncts[i].n;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ } + } +return 0 ; +} + +/* check whether N/CTS/M need be set manually */ +static bool audio_rate_need_prog(struct intel_crtc *crtc, + struct
drm_display_modeQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
*mode)
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+{ + if (((mode->clock == TMDS_297M) || + (mode->clock == TMDS_296M)) && + intel_pipe_has_type(crtc,
INTEL_OUTPUT_HDMI))Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+return true; + else + return false; +} + static bool intel_eld_uptodate(struct drm_connector*connector,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -514,12 +564,81 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(structdevice
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
*dev,
drivers/gpu/drm/i915/intel_audio.c static int · line 568
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +1
-0+int port, intrate)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+{ +struct drm_i915_private *dev_priv =dev_to_i915 (dev); +struct drm_device *drm_dev = dev_priv->dev; +struct intel_encoder *intel_encoder; +struct intel_digital_port *intel_dig_port; +struct intel_crtc *crtc;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+struct drm_display_mode *mode; +enum pipe pipe =-1 ; +u32 tmp; +int n_low, n_up, n; + +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { + if (intel_encoder->type !=
INTEL_OUTPUT_HDMI)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 584
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+continue ; + intel_dig_port =enc_to_dig_port(&intel_encoder-
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 587
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0base); +if (port == intel_dig_port->port) { + crtc = to_intel_crtc(intel_encoder-base.crtc);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
This sort of thing would need some locking to safely start
digging
Quoted 4 lines
Quoted 4 lines
at
Quoted 3 lines
Quoted 3 lines
the modeset state.
I would probably not do that, and instead add some new lock(s)
for
Quoted 2 lines
Quoted 2 lines
this.
Quoted 1 line
Quoted 1 line
The modeset code would then fill out some relevant
information
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
protected
by that same lock, and this function could then go look at itwithout
Quoted 3 lines
Quoted 3 lines
having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the
function,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you havesuggested
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
lock I can use?
To do it like this we'd need pretty much all the modeset locks,
which
Quoted 2 lines
Quoted 2 lines
to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind of
new
Quoted 8 lines
Quoted 1 line
audio lock to i915.
If we are using a new audio lock, I believe we still need use the lock when gfx is doing the modeset. Only adding the new lock in the function
i915_audio_component_sync_audio_rate()is not enough because gfx driver will still modify it without locking.
Quoted 7 lines
Quoted 1 line
I'm not sure where to add the lock in the gfx driver.
The audio enable/disable during modeset would also grab the lock, and
consult whatever information the audio driver provided. I would also suggest renaming the .sync_audio_rate() to something more clear like .set_sample_rate()
The sample rate in audio means the how often the audio data is sampled. Actually this function is none of setting sample rate. The sample rate setting is done in audio driver. What the function does is only setting the n/cts based on the audio sample rate.
Quoted 19 lines
Anyway, I was thinking of something like this:
intel_audio_codec_enable(){ lock(); .. configure n/cts encoder->audio.enabled = true; unlock(); }
intel_audio_codec_disable(){ lock(); encoder->audio.enabled = false; unlock(); }
set_sample_rate()
Quoted 8 lines
{
lock();
encoder->audio.sample_rate = rate;
if (encoder->audio.enabled) {
... reconfigure n/cts
}
unlock();
}I'm still not sure whether it is safe when gfx driver is doing the modeset. Suppose gfx driver will handle the protection, right?
If so, I will add spin_lock_irqsave as you suggested.
Quoted 3 lines
Something like that should protect sample rate changes from racing with an ongoing modeset.
Btw, it is not changing the sample rate. Audio sample rate will never be changed in these functions.
Regards,
Libin
Quoted 96 lines
Quoted 20 lines
Regards,
LibinQuoted 16 lines
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 589
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-0+continue ; + } + pipe = crtc->pipe; +break ; + } + } + +if (pipe ==INVALID_PIPE ) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+return -ENODEV ; + } + DRM_DEBUG_KMS("pipe %c connects port %c\n", + pipe_name(pipe),
port_name(port));Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+ mode = &crtc->config->base.adjusted_mode; + +/* 2. check whether to set the N/CTS/M manually or not */
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 608
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+if (!audio_rate_need_prog (crtc, mode)) { + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Right, I need judge the platform firstly.
Quoted 1 line
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+return 0 ; + } + + n =audio_config_get_n (mode, rate); +if (n ==0 ) { + DRM_DEBUG_KMS("Using automatic mode forN value
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
on port %c\n",
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 12 lines
drivers/gpu/drm/i915/intel_audio.c +12
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp); +return 0 ; + } + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + +/* 4. set the N/CTS/M */ + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 629
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+ tmp |= ((n_up << AUD_CONFIG_UPPER_N_SHIFT) | + (n_low <<
AUD_CONFIG_LOWER_N_SHIFT) |Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+ AUD_CONFIG_N_PROG_ENABLE); +I915_WRITE (HSW_AUD_CFG (pipe), tmp); + +return 0 ; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +0
-0.get_cdclk_freq =
i915_audio_component_get_cdclk_freq,Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c static int · line 642
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +1
-0+ .sync_audio_rate =
i915_audio_component_sync_audio_rate,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0};static int i915_audio_component_bind(struct device
*i915_dev,Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
Quoted 11 lines
Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Quoted 102 lines · Libin
Quoted 102 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, August 25, 2015 12:27 AM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 21 lines · Libin
Quoted 21 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, August 24, 2015 8:53 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 10 lines · Libin
Quoted 10 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Tue, Aug 18, 2015 at 02:51:52PM +0800,
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line · wrote:
+static int i915_audio_component_sync_audio_rate(struct
device
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
*dev,
Review
Quoted 1 line
(quoted diff) +1
-0+ int port, intrate)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+{ + struct drm_i915_private *dev_priv = dev_to_i915(dev); + struct drm_device *drm_dev = dev_priv->dev; + struct intel_encoder *intel_encoder; + struct intel_digital_port *intel_dig_port; + struct intel_crtc *crtc;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+ struct drm_display_mode *mode; + enum pipe pipe = -1; + u32 tmp; + int n_low, n_up, n; + + /* 1. get the pipe */ + for_each_intel_encoder(drm_dev, intel_encoder) { + if (intel_encoder->type !=
INTEL_OUTPUT_HDMI)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ continue; + intel_dig_port =enc_to_dig_port(&intel_encoder-
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
base);
(quoted diff) +2
-0+ if (port == intel_dig_port->port) { + crtc = to_intel_crtc(intel_encoder-base.crtc);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
This sort of thing would need some locking to safely start
digging
Quoted 4 lines
Quoted 4 lines
at
Quoted 3 lines
Quoted 3 lines
the modeset state.
I would probably not do that, and instead add some new lock(s)
for
Quoted 2 lines
Quoted 2 lines
this.
Quoted 1 line
Quoted 1 line
The modeset code would then fill out some relevant
information
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
protected
by that same lock, and this function could then go look at itwithout
Quoted 3 lines
Quoted 3 lines
having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the
function,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you havesuggested
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
lock I can use?
To do it like this we'd need pretty much all the modeset locks,
which
Quoted 2 lines
Quoted 2 lines
to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind of
new
Quoted 9 lines
Quoted 1 line
audio lock to i915.
If we are using a new audio lock, I believe we still need use the lock when gfx is doing the modeset. Only adding the new lock in the function
i915_audio_component_sync_audio_rate()is not enough because gfx driver will still modify it without locking.I'm not sure where to add the lock in the gfx driver.
Quoted 8 lines
Quoted 5 lines
The audio enable/disable during modeset would also grab the lock, and
consult whatever information the audio driver provided. I would also suggest renaming the .sync_audio_rate() to something more clear like .set_sample_rate()The sample rate in audio means the how often the audio data is sampled. Actually this function is none of setting sample rate.
Well it's more of sample_rate_change_notify() or something like that. But I don't mind too much what it's called. We can go with your original name if you feel it's more clear.
Quoted 31 lines
The sample rate setting is done in audio driver. What the function does is only setting the n/cts based on the audio sample rate.
Quoted 19 lines
Anyway, I was thinking of something like this:
intel_audio_codec_enable(){ lock(); .. configure n/cts encoder->audio.enabled = true; unlock(); }
intel_audio_codec_disable(){ lock(); encoder->audio.enabled = false; unlock(); }
set_sample_rate()Quoted 8 lines
{ lock(); encoder->audio.sample_rate = rate; if (encoder->audio.enabled) { ... reconfigure n/cts } unlock(); }
Quoted 2 lines
I'm still not sure whether it is safe when gfx driver is doing the modeset. Suppose gfx driver will handle the protection, right?
intel_audio_codec_enable/disable are called during the modeset. With my idea as long as you're holding the lock and audio.enabled==true you could be sure there's nothing bad happening at the same time in i915.
Quoted 2 lines
If so, I will add
spin_lock_irqsaveas you suggested.
Could be a mutex I think.
Quoted 7 lines
Quoted 4 lines
Something like that should protect sample rate changes from racing with an ongoing modeset.
Btw, it is not changing the sample rate. Audio sample rate will never be changed in these functions.
The audio driver can change the sample rate at any point, at which point it'll call into i915 to reconfigure n/cts, no? So we just need to make sure things can't blow up if it does that while there's a modeset happening at the same time.
Quoted 106 lines
Regards,
LibinQuoted 103 lines
Quoted 20 lines
Regards,
LibinQuoted 16 lines
Quoted 16 lines
Quoted 16 lines
Review
Quoted 5 lines
(quoted diff) +2
-0+ if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);Review
Quoted 9 lines
(quoted diff) +9
-0+ continue; + } + pipe = crtc->pipe; + break; + } + } + + if (pipe == INVALID_PIPE) { + DRM_DEBUG_KMS("no pipe for the port %c\n",
port_name(port));Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ return -ENODEV; + } + DRM_DEBUG_KMS("pipe %c connects port %c\n", + pipe_name(pipe),
port_name(port));Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ mode = &crtc->config->base.adjusted_mode; + + /* 2. check whether to set the N/CTS/M manually ornot */
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ if (!audio_rate_need_prog(crtc, mode)) { + tmp = I915_READ(HSW_AUD_CFG(pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE; + I915_WRITE(HSW_AUD_CFG(pipe), tmp);This stuff would need to be abstracted to work on pre-HSW too.
Right, I need judge the platform firstly.
Quoted 1 line
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ return 0; + } + + n = audio_config_get_n(mode, rate); + if (n == 0) { + DRM_DEBUG_KMS("Using automatic mode forN value
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
on port %c\n",
Review
Quoted 12 lines
(quoted diff) +12
-0+ port_name(port)); + tmp = I915_READ(HSW_AUD_CFG(pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE; + I915_WRITE(HSW_AUD_CFG(pipe), tmp); + return 0; + } + n_low = n & 0xfff; + n_up = (n >> 12) & 0xff; + + /* 4. set the N/CTS/M */ + tmp = I915_READ(HSW_AUD_CFG(pipe)); + tmp &= ~(AUD_CONFIG_UPPER_N_MASK |
AUD_CONFIG_LOWER_N_MASK);Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ tmp |= ((n_up << AUD_CONFIG_UPPER_N_SHIFT) | + (n_low <<
AUD_CONFIG_LOWER_N_SHIFT) |Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 7 lines
(quoted diff) +6
-0+ AUD_CONFIG_N_PROG_ENABLE); + I915_WRITE(HSW_AUD_CFG(pipe), tmp); + + return 0; +} + static const struct i915_audio_component_ops
i915_audio_component_ops= {Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Review
Quoted 4 lines
(quoted diff) +0
-0.owner = THIS_MODULE, .get_power = i915_audio_component_get_power, .put_power = i915_audio_component_put_power, .codec_wake_override =
i915_audio_component_codec_wake_override,Quoted 1 line
.get_cdclk_freq =
i915_audio_component_get_cdclk_freq,Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ .sync_audio_rate =
i915_audio_component_sync_audio_rate,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
};
static int i915_audio_component_bind(struct device
*i915_dev,Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxQuoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC--
Ville Syrjälä
Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/4] drm/i915: implement sync_audio_rate callback
Hi Ville,
Quoted 123 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, August 26, 2015 8:27 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 64 lines · Libin
Quoted 64 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, August 25, 2015 12:27 AM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 21 lines · Libin
Quoted 21 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, August 24, 2015 8:53 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 10 lines · Libin
Quoted 10 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:14 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
On Tue, Aug 18, 2015 at 02:51:52PM +0800,
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line · wrote:
+static int i915_audio_component_sync_audio_rate(struct
device
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
*dev,
Review
Quoted 1 line
(quoted diff) +1
-0+ int port, intrate)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+{ + struct drm_i915_private *dev_priv = dev_to_i915(dev); + struct drm_device *drm_dev = dev_priv->dev; + struct intel_encoder *intel_encoder; + struct intel_digital_port *intel_dig_port; + struct intel_crtc *crtc;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+ struct drm_display_mode *mode; + enum pipe pipe = -1; + u32 tmp; + int n_low, n_up, n; + + /* 1. get the pipe */ + for_each_intel_encoder(drm_dev, intel_encoder) { + if (intel_encoder->type !=
INTEL_OUTPUT_HDMI)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ continue; + intel_dig_port =enc_to_dig_port(&intel_encoder-
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
base);
(quoted diff) +2
-0+ if (port == intel_dig_port->port) { + crtc = to_intel_crtc(intel_encoder-base.crtc);
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
This sort of thing would need some locking to safely start
digging
Quoted 4 lines
Quoted 4 lines
at
Quoted 3 lines
Quoted 3 lines
the modeset state.
I would probably not do that, and instead add some new
lock(s)
Quoted 14 lines
Quoted 14 lines
for
Quoted 2 lines
Quoted 2 lines
this.
Quoted 1 line
Quoted 1 line
The modeset code would then fill out some relevant
information
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
protected
by that same lock, and this function could then go look at itwithout
Quoted 3 lines
Quoted 3 lines
having to worry about the rest of modeset locking/state.
From audio side, there is no competition when calling the
function,
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I think.
For protecting the competition between audio and gfx driver, it seems we need use the lock from gfx side. Do you haveQuoted 7 lines
Quoted 7 lines
suggested
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
lock I can use?
To do it like this we'd need pretty much all the modeset locks,
which
Quoted 2 lines
Quoted 2 lines
to me feels a bit troublesome if the audio driver can call this at any point. So I suggested that we may want to add some kind
of
Quoted 9 lines
Quoted 9 lines
new
Quoted 8 lines
Quoted 1 line
audio lock to i915.
If we are using a new audio lock, I believe we still need use the lock when gfx is doing the modeset. Only adding the new lock in the function
i915_audio_component_sync_audio_rate()is not enough because gfx driver will still modify it without locking.Quoted 5 lines
Quoted 5 lines
Quoted 1 line
I'm not sure where to add the lock in the gfx driver.
The audio enable/disable during modeset would also grab the lock, and
consult whatever information the audio driver provided. I wouldalso
Quoted 1 line
Quoted 1 line
suggest renaming the .sync_audio_rate() to something more clear
like
Quoted 2 lines
Quoted 1 line
.set_sample_rate()
Quoted 7 lines
Quoted 2 lines
The sample rate in audio means the how often the audio data is sampled. Actually this function is none of setting sample rate.
Well it's more of
sample_rate_change_notify()or something like that. But I don't mind too much what it's called. We can go with your original
name if you feel it's more clear.
OK, I will keep the original name as it will be more clear for audio driver developer.
Quoted 42 lines
Quoted 32 lines
The sample rate setting is done in audio driver. What the function does is only setting the n/cts based on the audio sample rate.
Quoted 19 lines
Anyway, I was thinking of something like this:
intel_audio_codec_enable(){ lock(); .. configure n/cts encoder->audio.enabled = true; unlock(); }
intel_audio_codec_disable(){ lock(); encoder->audio.enabled = false; unlock(); }
set_sample_rate()Quoted 8 lines
{ lock(); encoder->audio.sample_rate = rate; if (encoder->audio.enabled) { ... reconfigure n/cts } unlock(); }Quoted 1 line
I'm still not sure whether it is safe when gfx driver is doing the
modeset.
Quoted 1 line
Suppose gfx driver will handle the protection, right?
intel_audio_codec_enable/disable are called during the modeset. With my
idea as long as you're holding the lock and audio.enabled==true you could be sure there's nothing bad happening at the same time in i915.Quoted 1 line
Quoted 3 lines
Quoted 1 line
If so, I will add
spin_lock_irqsaveas you suggested.Could be a mutex I think.
OK, mutex is OK for audio driver, too.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Something like that should protect sample rate changes from
racing
Quoted 2 lines
Quoted 1 line
with an ongoing modeset.
Quoted 8 lines
Quoted 2 lines
Btw, it is not changing the sample rate. Audio sample rate will never be changed in these functions.
The audio driver can change the sample rate at any point, at which point
it'll call into i915 to reconfigure n/cts, no? So we just need to make sure things can't blow up if it does that while there's a modeset happening at the same time.
The function is called before playing audio.
Regards,
Libin
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 3/4 ALSA: hda - display audio call sync_audio_rate callback
In reply to [email protected]From: Libin Yang <[email protected]>
For display audio, call the sync_audio_rate callback function to do the synchronization between gfx driver and audio driver.
--- sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
sound/pci/hda/patch_hdmi.c +19 -0
@@ -1770,6 +1770,16 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)return non_pcm; } +/* There is a fixed mapping between audio pin node and display port +* on current Intel platforms: +* Pin Widget 5 - PORT B (port = 1 in i915 driver) +* Pin Widget 6 - PORT C (port = 2 in i915 driver) +* Pin Widget 7 - PORT D (port = 3 in i915 driver) +*/ +static int intel_pin2port (hda_nid_t pin_nid) +{ +return pin_nid -4 ; +}/* * HDMI callbacks
@@ -1786,6 +1796,8 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,int pin_idx =hinfo_to_pin_index (codec, hinfo);struct hdmi_spec_per_pin *per_pin =get_pin (spec, pin_idx);hda_nid_t pin_nid = per_pin->pin_nid; +struct snd_pcm_runtime *runtime = substream->runtime; +struct i915_audio_component *acomp = codec->bus->core.audio_component;bool non_pcm;int pinctl;
@@ -1802,6 +1814,13 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,intel_not_share_assigned_cvt (codec, pin_nid, per_pin->mux_idx); } +/* Call sync_audio_rate to set the N/CTS/M manually if necessary */ +/* Todo: add DP1.2 MST audio support later */ +if (acomp && acomp->ops && acomp->ops->sync_audio_rate) + acomp->ops->sync_audio_rate (acomp->dev, +intel_pin2port (pin_nid), + runtime->rate); + non_pcm =check_non_pcm_per_cvt (codec, cvt_nid);mutex_lock (&per_pin->lock); per_pin->channels = substream->runtime->channels;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 4/4 drm/i915: set proper N/CTS in modeset
In reply to [email protected]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/i915_reg.h | 8 ++++++++ drivers/gpu/drm/i915/intel_audio.c | 40 +++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -7035,6 +7035,8 @@ enum skl_disp_power_wells { _HSW_AUD_MISC_CTRL_A, \ _HSW_AUD_MISC_CTRL_B) +#define HSW_AUD_PIPE_CONN_SEL_CTRL 0x650ac +#define _HSW_AUD_DIP_ELD_CTRL_ST_A 0x650b4#define _HSW_AUD_DIP_ELD_CTRL_ST_B 0x651b4#define HSW_AUD_DIP_ELD_CTRL (pipe) _PIPE(pipe, \
@@ -7049,6 +7051,12 @@ enum skl_disp_power_wells { _HSW_AUD_DIG_CNVT_2)#define DIP_PORT_SEL_MASK 0x3 +#define _HSW_AUD_STR_DESC_1 0x65084 +#define _HSW_AUD_STR_DESC_2 0x65184 +#define AUD_STR_DESC (pipe) _PIPE(pipe, \ + _HSW_AUD_STR_DESC_1, \ + _HSW_AUD_STR_DESC_2) +#define _HSW_AUD_EDID_DATA_A 0x65050#define _HSW_AUD_EDID_DATA_B 0x65150#define HSW_AUD_EDID_DATA (pipe) _PIPE(pipe, \
drivers/gpu/drm/i915/intel_audio.c +39 -1
@@ -140,6 +140,27 @@ static bool audio_rate_need_prog(struct intel_crtc *crtc,return false; } +static int audio_config_get_rate (struct drm_i915_private *dev_priv, +enum pipe pipe) +{ +uint32_t tmp; +int cvt_idx; +int base_rate, mul, div, rate; + + tmp =I915_READ (HSW_AUD_PIPE_CONN_SEL_CTRL ); + cvt_idx = (tmp >> (pipe *8 )) &0xff ; + tmp =I915_READ (AUD_STR_DESC (cvt_idx)); + base_rate = tmp & (1 <<14 ); +if (base_rate ==0 ) + rate =48000 ; +else + rate =44100 ; + mul = (tmp & (0x7 <<11 )) +1 ; + div = (tmp & (0x7 <<8 )) +1 ; + rate = rate * mul / div; +return rate; +} + static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,
@@ -261,6 +282,8 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,const uint8_t *eld = connector->eld;uint32_t tmp;int len, i; +int n_low, n_up, n; +int rate;DRM_DEBUG_KMS ("Enable audio codec on pipe %c, %u bytes ELD\n" ,pipe_name (pipe),drm_eld_size (eld));
@@ -296,12 +319,27 @@ 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)) { + rate =audio_config_get_rate (dev_priv, pipe); + n =audio_config_get_n (mode, rate); +if (n !=0 ) { + 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 ); + } + } +I915_WRITE (HSW_AUD_CFG (pipe), tmp); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 4/4] drm/i915: set proper N/CTS in modeset
Quoted 56 lines · On Tue, Aug 18, 2015 at 02:51:54PM +0800, [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]>--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ drivers/gpu/drm/i915/intel_audio.c | 40 +++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +8
-0@@ -7035,6 +7035,8 @@ enum skl_disp_power_wells { _HSW_AUD_MISC_CTRL_A, \ _HSW_AUD_MISC_CTRL_B) +#define HSW_AUD_PIPE_CONN_SEL_CTRL 0x650ac +#define _HSW_AUD_DIP_ELD_CTRL_ST_A 0x650b4#define _HSW_AUD_DIP_ELD_CTRL_ST_B 0x651b4#define HSW_AUD_DIP_ELD_CTRL (pipe) _PIPE(pipe, \@@ -7049,6 +7051,12 @@ enum skl_disp_power_wells { _HSW_AUD_DIG_CNVT_2)#define DIP_PORT_SEL_MASK 0x3 +#define _HSW_AUD_STR_DESC_1 0x65084 +#define _HSW_AUD_STR_DESC_2 0x65184 +#define AUD_STR_DESC (pipe) _PIPE(pipe, \ + _HSW_AUD_STR_DESC_1, \ + _HSW_AUD_STR_DESC_2) +#define _HSW_AUD_EDID_DATA_A 0x65050#define _HSW_AUD_EDID_DATA_B 0x65150#define HSW_AUD_EDID_DATA (pipe) _PIPE(pipe, \drivers/gpu/drm/i915/intel_audio.c +10
-0@@ -140,6 +140,27 @@ static bool audio_rate_need_prog(struct intel_crtc *crtc,return false; } +static int audio_config_get_rate (struct drm_i915_private *dev_priv, +enum pipe pipe) +{ +uint32_t tmp; +int cvt_idx; +int base_rate, mul, div, rate; + + tmp =I915_READ (HSW_AUD_PIPE_CONN_SEL_CTRL ); + cvt_idx = (tmp >> (pipe *8 )) &0xff ; + tmp =I915_READ (AUD_STR_DESC (cvt_idx));
drivers/gpu/drm/i915/intel_audio.c static bool audio_rate_need_prog(struct intel_crtc *crtc, · line 162
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+ base_rate = tmp & (1 <<14 ); +if (base_rate ==0 ) + rate =48000 ; +else + rate =44100 ; + mul = (tmp & (0x7 <<11 )) +1 ; + div = (tmp & (0x7 <<8 )) +1 ; + rate = rate * mul / div; +return rate; +}
Given your new .sync_audio_rate() callback, the audio driver should have already told us what the current sample rate is, and so we shouldn't have to go dig it up from registers.
Quoted 28 lines
drivers/gpu/drm/i915/intel_audio.c +8
-1+ static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -261,6 +282,8 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,const uint8_t *eld = connector->eld;uint32_t tmp;int len, i; +int n_low, n_up, n; +int rate;DRM_DEBUG_KMS ("Enable audio codec on pipe %c, %u bytes ELD\n" ,pipe_name (pipe),drm_eld_size (eld));@@ -296,12 +319,27 @@ 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_eed_prog (intel_crtc, mode)) { + rate =audio_config_get_rate (dev_priv, pipe); + n =audio_config_get_n (mode, rate);
drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct drm_connector *connector, · line 341
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+if (n !=0 ) { + 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 ); + } + }
We should share the code to set this up with .sync_audio_rate() rather than having two copies of essentically the same code.
Quoted 11 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+I915_WRITE (HSW_AUD_CFG (pipe), tmp); }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 4/4] drm/i915: set proper N/CTS in modeset
Quoted 80 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Friday, August 21, 2015 11:26 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v5 4/4] drm/i915: set proper N/CTS in modesetQuoted 10 lines · On Tue, Aug 18, 2015 at 02:51:54PM +0800, [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]>--- drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ drivers/gpu/drm/i915/intel_audio.c | 40+++++++++++++++++++++++++++++++++++++-
Review
Quoted 3 lines
2 files changed, 47 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_reg.hQuoted 13 lines
index 6786e94..122b5bd 100644
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7035,6 +7035,8 @@ enum skl_disp_power_wells { _HSW_AUD_MISC_CTRL_A, \ _HSW_AUD_MISC_CTRL_B) +#define HSW_AUD_PIPE_CONN_SEL_CTRL 0x650ac +#define _HSW_AUD_DIP_ELD_CTRL_ST_A 0x650b4#define _HSW_AUD_DIP_ELD_CTRL_ST_B 0x651b4#define HSW_AUD_DIP_ELD_CTRL (pipe) _PIPE(pipe, \drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 7057
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -7049,6 +7051,12 @@ enum skl_disp_power_wells { _HSW_AUD_DIG_CNVT_2)#define DIP_PORT_SEL_MASK 0x3 +#define _HSW_AUD_STR_DESC_1 0x65084 +#define _HSW_AUD_STR_DESC_2 0x65184 +#define AUD_STR_DESC (pipe) _PIPE(pipe, \ + _HSW_AUD_STR_DESC_1,\Review
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0+ _HSW_AUD_STR_DESC_2) +#define _HSW_AUD_EDID_DATA_A 0x65050#define _HSW_AUD_EDID_DATA_B 0x65150#define HSW_AUD_EDID_DATA (pipe) _PIPE(pipe, \(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cdrivers/gpu/drm/i915/intel_audio.c static bool audio_rate_need_prog(struct
Quoted 4 lines
index 96b97be..0dfdc77 100644
drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -140,6 +140,27 @@ static bool audio_rate_need_prog(struct
intel_crtc*crtc,Quoted 20 lines
drivers/gpu/drm/i915/intel_audio.c +17
-0return false; } +static int audio_config_get_rate (struct drm_i915_private *dev_priv, +enum pipe pipe) +{ +uint32_t tmp; +int cvt_idx; +int base_rate, mul, div, rate; + + tmp =I915_READ (HSW_AUD_PIPE_CONN_SEL_CTRL ); + cvt_idx = (tmp >> (pipe *8 )) &0xff ; + tmp =I915_READ (AUD_STR_DESC (cvt_idx)); + base_rate = tmp & (1 <<14 ); +if (base_rate ==0 ) + rate =48000 ; +else + rate =44100 ; + mul = (tmp & (0x7 <<11 )) +1 ; + div = (tmp & (0x7 <<8 )) +1 ;
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static bool audio_rate_need_prog(struct intel_crtc *crtc, · line 162
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +3
-0+ rate = rate * mul / div; +return rate; +}Given your new .sync_audio_rate() callback, the audio driver should have
already told us what the current sample rate is, and so we shouldn't have to go dig it up from registers.
This patch is not calling sync_audio_rate() from audio driver. It happens when gfx doing the modeset.
Quoted 43 lines
drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +1
-0+ static bool intel_eld_uptodate(struct drm_connector *connector, int reg_eldv, uint32_t bits_eldv, int reg_elda, uint32_t bits_elda,@@ -261,6 +282,8 @@ static void hsw_audio_codec_enable(struct
drm_connector*connector,drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct drm_connector *connector,
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0const uint8_t *eld = connector->eld;uint32_t tmp;int len, i; +int n_low, n_up, n; +int rate; DRM_DEBUG_KMS("Enable audio codec on pipe %c, %u bytesELD\n",
drivers/gpu/drm/i915/intel_audio.c static void
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0pipe_name(pipe), drm_eld_size(eld));@@ -296,12 +319,27 @@ static voidhsw_audio_codec_enable(struct
drm_connector*connector,drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct drm_connector *connector,
Quoted 6 lines
drivers/gpu/drm/i915/intel_audio.c +0
-1/* 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))drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct drm_connector *connector, · line 342
Quoted 13 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0tmp |=AUD_CONFIG_N_VALUE_INDEX ; else tmp |= audio_config_hdmi_pixel_clock(mode); + + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +if (audio_rate_eed_prog (intel_crtc, mode)) { + rate =audio_config_get_rate (dev_priv, pipe); + n =audio_config_get_n (mode, rate); +if (n !=0 ) { + n_low = n &0xfff ; + n_up = (n >>12 ) &0xff ; + tmp &= ~(AUD_CONFIG_UPPER_N_MASK | +
AUD_CONFIG_LOWER_N_MASK);drivers/gpu/drm/i915/intel_audio.c static void · line 337
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +1
-0+ tmp |= ((n_up <<
AUD_CONFIG_UPPER_N_SHIFT) |drivers/gpu/drm/i915/intel_audio.c static void · line 338
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +1
-0+ (n_low <<
AUD_CONFIG_LOWER_N_SHIFT) |
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static void · line 339
Quoted 1 line
drivers/gpu/drm/i915/intel_audio.c +1
-0+AUD_CONFIG_N_PROG_ENABLE);drivers/gpu/drm/i915/intel_audio.c static void hsw_audio_codec_enable(struct drm_connector *connector, · line 341
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+ } + }We should share the code to set this up with .sync_audio_rate() rather than having two copies of essentically the same code.
It's only setting a variable tmp, not sure we really need a separate function to do the setting?
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +1
-1+I915_WRITE (HSW_AUD_CFG (pipe), tmp); } --1.9.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · On Tue, Aug 18, 2015 at 02:51:51PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the
sync_audio_ratecallback.With the callback, audio driver can trigger
i915 driver to set the proper N/CTS or N/M
based on different sample rates.Signed-off-by Libin Yang <[email protected]>--- include/drm/i915_component.h | 1 + 1 file changed, 1 insertion(+)include/drm/i915_component.h +0
-0
include/drm/i915_component.h struct i915_audio_component { · line 36
Quoted 4 lines
include/drm/i915_component.h +1
-0@@ -33,6 +33,7 @@ struct i915_audio_component {void (*put_power)(struct device *);void (*codec_wake_override)(struct device *,bool enable);int (*get_cdclk_freq)(struct device *); +int (*sync_audio_rate)(struct device *,int port,int rate);
We're missing kerneldoc for this entire struct here, which isn't great. This needs to be fixed. Please
- pull out the ops structure so it's not inlined (kerneldoc can't handle nested ops structures).
- please document all the callbacks with kerneldoc. In 4.3 we can have kerneldoc in-line in structures right above each member like this
/**
* @put_power:
*
* Longer text explaining this hook.
*/
void (*put_power)(struct device *);
For each hook please explain at least who calls it (gfx or audio) and where exactly it's called in the overall flow.
- Extended the overview doc section with references to the component/ops structure would be needed too.
And please make sure it all looks pretty with make htmldocs.
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Daniel,
Quoted 53 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, August 26, 2015 4:18 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 1/4] drm/i915: Add audiosync_audio_ratecallbackQuoted 8 lines · On Tue, Aug 18, 2015 at 02:51:51PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the
sync_audio_ratecallback.With the callback, audio driver can trigger
i915 driver to set the proper N/CTS or N/M
based on different sample rates.Review
Quoted 6 lines
Signed-off-by Libin Yang <[email protected]>--- include/drm/i915_component.h | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/include/drm/i915_component.hinclude/drm/i915_component.h struct i915_audio_component { · line 34
Quoted 6 lines
index c9a8b64..aabebcb 100644
include/drm/i915_component.h +0
-0@@ -33,6 +33,7 @@ struct i915_audio_component {void (*put_power)(struct device *); void (*codec_wake_override)(struct device *, boolenable);
include/drm/i915_component.h struct i915_audio_component { · line 36
Quoted 2 lines
include/drm/i915_component.h +1
-0int (*get_cdclk_freq)(struct device *); + int (*sync_audio_rate)(struct device *, int port, intrate);
We're missing kerneldoc for this entire struct here, which isn't great. This needs to be fixed. Please
- pull out the ops structure so it's not inlined (kerneldoc can't handle nested ops structures).
- please document all the callbacks with kerneldoc. In 4.3 we can have kerneldoc in-line in structures right above each member like this/**
* @put_power:* * Longer text explaining this hook. */void (*put_power)(struct device *);
Quoted 7 lines
For each hook please explain at least who calls it (gfx or audio) and where exactly it's called in the overall flow.
- Extended the overview doc section with references to the component/ops
structure would be needed too.And please make sure it all looks pretty with make htmldocs.
Could we start another patch session for this task because, as you know, this is a little independent on these patches? What do you think?
Regards,
Libin
Quoted 6 lines
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 61 lines · Libin
Hi Daniel,
Quoted 59 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, August 26, 2015 4:18 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 1/4] drm/i915: Add audiosync_audio_ratecallbackQuoted 8 lines · On Tue, Aug 18, 2015 at 02:51:51PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the
sync_audio_ratecallback.With the callback, audio driver can trigger
i915 driver to set the proper N/CTS or N/M
based on different sample rates.Review
Quoted 6 lines
Signed-off-by Libin Yang <[email protected]>--- include/drm/i915_component.h | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/include/drm/i915_component.hinclude/drm/i915_component.h struct i915_audio_component { · line 34
Quoted 6 lines
index c9a8b64..aabebcb 100644
include/drm/i915_component.h +0
-0@@ -33,6 +33,7 @@ struct i915_audio_component {void (*put_power)(struct device *); void (*codec_wake_override)(struct device *, boolenable);
include/drm/i915_component.h struct i915_audio_component { · line 36
Quoted 2 lines
include/drm/i915_component.h +1
-0int (*get_cdclk_freq)(struct device *); + int (*sync_audio_rate)(struct device *, int port, intrate);
We're missing kerneldoc for this entire struct here, which isn't great. This needs to be fixed. Please
- pull out the ops structure so it's not inlined (kerneldoc can't handle nested ops structures).
- please document all the callbacks with kerneldoc. In 4.3 we can have kerneldoc in-line in structures right above each member like this/**
* @put_power:* * Longer text explaining this hook. */void (*put_power)(struct device *);
For each hook please explain at least who calls it (gfx or audio) and where exactly it's called in the overall flow.
- Extended the overview doc section with references to the component/ops
structure would be needed too.
Quoted 5 lines
Quoted 1 line
And please make sure it all looks pretty with make htmldocs.
Could we start another patch session for this task because, as you know, this is a little independent on these patches? What do you think?
Nowadays I want proper docs for new features, and for places where we missed them thus far they need to be backfilled. Also there's some good confusion in the review about how this all works together, so better docs seem called for no matter what to get this in. Instead of just adding all the explanations to commit messages only I figured it's better to do them as kerneldoc.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Daniel,
Quoted 83 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, August 26, 2015 5:08 PM
To: Yang, Libin
Cc: Daniel Vetter; [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 1/4] drm/i915: Add audiosync_audio_ratecallbackQuoted 42 lines · Libin
Hi Daniel,
Quoted 40 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, August 26, 2015 4:18 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v5 1/4] drm/i915: Add audiosync_audio_ratecallbackQuoted 8 lines · On Tue, Aug 18, 2015 at 02:51:51PM +0800, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the
sync_audio_ratecallback.With the callback, audio driver can trigger
i915 driver to set the proper N/CTS or N/M
based on different sample rates.Review
Quoted 6 lines
Signed-off-by Libin Yang <[email protected]>--- include/drm/i915_component.h | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/include/drm/i915_component.hinclude/drm/i915_component.h struct i915_audio_component { · line 34
Quoted 6 lines
index c9a8b64..aabebcb 100644
include/drm/i915_component.h +0
-0@@ -33,6 +33,7 @@ struct i915_audio_component {void (*put_power)(struct device *); void (*codec_wake_override)(struct device *, boolenable);
include/drm/i915_component.h struct i915_audio_component { · line 36
Quoted 2 lines
include/drm/i915_component.h +1
-0int (*get_cdclk_freq)(struct device *); + int (*sync_audio_rate)(struct device *, int port, intrate);
We're missing kerneldoc for this entire struct here, which isn't
great.
Quoted 2 lines
Quoted 2 lines
This needs to be fixed. Please
- pull out the ops structure so it's not inlined (kerneldoc can'thandle
Quoted 2 lines
Quoted 2 lines
nested ops structures).
- please document all the callbacks with kerneldoc. In 4.3 we canhave
Quoted 10 lines
Quoted 10 lines
kerneldoc in-line in structures right above each member like this
/**
* @put_power:* * Longer text explaining this hook. */void (*put_power)(struct device *);
For each hook please explain at least who calls it (gfx or audio)
and
Quoted 10 lines
Quoted 6 lines
where exactly it's called in the overall flow.
- Extended the overview doc section with references to the component/ops
structure would be needed too.And please make sure it all looks pretty with make htmldocs.
Could we start another patch session for this task because, as you know, this is a little independent on these patches? What do you think?
Quoted 10 lines
Nowadays I want proper docs for new features, and for places where we
missed them thus far they need to be backfilled. Also there's some good
confusion in the review about how this all works together, so better docs
seem called for no matter what to get this in. Instead of just adding all the explanations to commit messages only I figured it's better to do them
as kerneldoc.
Yes, I agree and I will add it for the sync_audio_rate function in the next version.
Regards,
Libin
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx