drm/i915: Add audio sync_audio_rate callback
Subsystems (3)
PATCH v3 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 v3 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 | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+)
drivers/gpu/drm/i915/intel_audio.c +117 -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,79 @@ 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) { + 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
Jani Nikula
maintainerRe: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
Quoted 93 lines · On Mon, 17 Aug 2015, [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 | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+)drivers/gpu/drm/i915/intel_audio.c +56
-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,79 @@ 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;
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 582
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+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) { + intel_dig_port =enc_to_dig_port (&intel_encoder->base);
Mmmh, not all encoders are digital ports. enc_to_dig_port does a container_of, so you can't just check for NULL either. IOW, you need to check the encoder->type (and you only care about HDMI here).
Quoted 63 lines
drivers/gpu/drm/i915/intel_audio.c +51
-0+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 · 1 line
1.9.1
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
Hi Jani
Quoted 119 lines
-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Monday, August 17, 2015 8:21 PM
To: Yang, Libin; [email protected]; [email protected]; intel- [email protected]; [email protected]
Cc: Yang, Libin
Subject: Re: [PATCH v3 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Mon, 17 Aug 2015, [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 | 117+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 117 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 24 lines
index dc32cf4..27add6a 100644
drivers/gpu/drm/i915/intel_audio.c +17
-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 },drivers/gpu/drm/i915/intel_audio.c static const struct { · line 97
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ { 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)
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)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)
Quoted 5 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,79 @@ 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 13 lines
drivers/gpu/drm/i915/intel_audio.c +13
-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; +int n_low, n_up, n; + +/* 1. get the pipe */
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 583
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+for_each_intel_encoder (drm_dev, intel_encoder) { + intel_dig_port =enc_to_dig_port (&intel_encoder- base);Mmmh, not all encoders are digital ports.
enc_to_dig_portdoes acontainer_of, so you can't just check for NULL either. IOW, you need to
check theencoder->type(and you only care about HDMI here).
Do you mean it should be:
if (!crtc || !intel_pipe_has_type(crtc, INTEL_OUTPUT_HDMI))
regards,
Libin
Quoted 66 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc); +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 7 lines
drivers/gpu/drm/i915/intel_audio.c +7
-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 */ drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-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); +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 4 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, };
Quoted 7 lines
Quoted 4 lines
static int i915_audio_component_bind(struct device
*i915_dev,
--
1.9.1--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
Quoted 130 lines · Libin
Hi Jani
Quoted 119 lines
-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Monday, August 17, 2015 8:21 PM
To: Yang, Libin; [email protected]; [email protected]; intel- [email protected]; [email protected]
Cc: Yang, Libin
Subject: Re: [PATCH v3 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 5 lines · On Mon, 17 Aug 2015, [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 | 117+++++++++++++++++++++++++++++++++++++
Review
Quoted 3 lines
1 file changed, 117 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 24 lines
index dc32cf4..27add6a 100644
drivers/gpu/drm/i915/intel_audio.c +17
-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 },drivers/gpu/drm/i915/intel_audio.c static const struct { · line 97
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +8
-0+ { 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)
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)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)
Quoted 5 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,79 @@ 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 13 lines
drivers/gpu/drm/i915/intel_audio.c +13
-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; +int n_low, n_up, n; + +/* 1. get the pipe */ Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int · line 583
Quoted 3 lines
drivers/gpu/drm/i915/intel_audio.c +2
-0+for_each_intel_encoder (drm_dev, intel_encoder) { + intel_dig_port =enc_to_dig_port (&intel_encoder- base);Mmmh, not all encoders are digital ports.
enc_to_dig_portdoes acontainer_of, so you can't just check for NULL either. IOW, you need to
check theencoder->type(and you only care about HDMI here).
Quoted 2 lines
Do you mean it should be:
if (!crtc || !intel_pipe_has_type(crtc,INTEL_OUTPUT_HDMI))
No, just check for intel_encoder->type as the first thing in the loop, and continue if it isn't HDMI.
if (intel_encoder->type != INTEL_OUTPUT_HDMI)
continue;Quoted 77 lines
regards,
LibinQuoted 73 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc); +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 7 lines
drivers/gpu/drm/i915/intel_audio.c +7
-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 */ drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-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); +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--
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
In reply to Jani NikulaQuoted 100 lines · Jani Nikula
Quoted 99 lines · On Mon, 17 Aug 2015, [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 | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+)drivers/gpu/drm/i915/intel_audio.c +62
-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,79 @@ 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;
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 582
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+ +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { + intel_dig_port =enc_to_dig_port (&intel_encoder->base);Mmmh, not all encoders are digital ports.
enc_to_dig_portdoes acontainer_of, so you can't just check for NULL either. IOW, you need to check theencoder->type(and you only care about HDMI here).
encoder->type is changed at runtime thanks to ddi encoders. Also shouldn't we care about dp audio too or am I confused?
-Daniel
Quoted 71 lines
Quoted 64 lines
drivers/gpu/drm/i915/intel_audio.c +51
-0+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 · 1 line
1.9.1Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
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
Re: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
Hi Daniel,
Quoted 125 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, August 26, 2015 3:53 PM
To: Jani Nikula
Cc: Yang, Libin; [email protected]; [email protected]; intel- [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH v3 2/4] drm/i915: implementsync_audio_ratecallbackQuoted 6 lines · Jani Nikula
Quoted 5 lines · On Mon, 17 Aug 2015, [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
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 | 117+++++++++++++++++++++++++++++++++++++
Quoted 3 lines
Review
Quoted 3 lines
1 file changed, 117 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_audio.cQuoted 26 lines
Quoted 26 lines
index dc32cf4..27add6a 100644
drivers/gpu/drm/i915/intel_audio.c +19
-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 },Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static const struct {
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +6
-0+ { 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)Quoted 2 lines
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 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 rate)
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
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_mode*mode)
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-0+{ +if (((mode->clock ==TMDS_297M ) || + (mode->clock ==TMDS_296M )) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) +return true;Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int
Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+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,79 @@ static int
i915_audio_component_get_cdclk_freq(struct device *dev)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 +1
-0return ret; } +static int i915_audio_component_sync_audio_rate(struct device*dev,
Quoted 17 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +5
-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;drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 10 lines
drivers/gpu/drm/i915/intel_audio.c +10
-0+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) { + intel_dig_port = enc_to_dig_port(&intel_encoder-base);
Quoted 8 lines
Quoted 2 lines
Mmmh, not all encoders are digital ports.
enc_to_dig_portdoes acontainer_of, so you can't just check for NULL either. IOW, you needto
Quoted 1 line
check the
encoder->type(and you only care about HDMI here).
encoder->typeis changed at runtime thanks to ddi encoders. Also shouldn't
we care about dp audio too or am I confused?
Do you have suggestion how to handle it as it is changed at runtime? Need a lock or not?
For DP, because the 4K DP display is not stable, so we didn't do the full test on DP and no patch is ready for DP currently.
Based on the very simple test on DP, it seems DP audio is OK. When DP is stable, we will do the full test and decide to make the patch or not based on the test result.
Regards,
Libin
Quoted 80 lines
-Daniel
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev)
Quoted 5 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+if (port == intel_dig_port->port) { + crtc =to_intel_crtc (intel_encoder->base.crtc); +if (!crtc) { + DRM_DEBUG_KMS("%s: crtc isNULL\n",
__func__);Quoted 9 lines
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 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_audio.c +9
-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));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+ 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 valueon port %c\n",
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+ port_name(port)); + tmp =I915_READ (HSW_AUD_CFG (pipe)); + tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; +I915_WRITE (HSW_AUD_CFG (pipe), tmp);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+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 9 lines
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= {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 +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 4 lines
Quoted 4 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, };Quoted 11 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-1static int i915_audio_component_bind(struct device *i915_dev, --1.9.1
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 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
Jani Nikula
maintainerRe: [PATCH v3 2/4] drm/i915: implement sync_audio_rate callback
In reply to Daniel VetterQuoted 110 lines · Daniel Vetter
Quoted 100 lines · Jani Nikula
Quoted 99 lines · On Mon, 17 Aug 2015, [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 | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+)drivers/gpu/drm/i915/intel_audio.c +62
-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,79 @@ 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;Quoted 8 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_get_cdclk_freq(struct device *dev) · line 582
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +4
-0+ +/* 1. get the pipe */ +for_each_intel_encoder (drm_dev, intel_encoder) { + intel_dig_port =enc_to_dig_port (&intel_encoder->base);Mmmh, not all encoders are digital ports.
enc_to_dig_portdoes acontainer_of, so you can't just check for NULL either. IOW, you need to check theencoder->type(and you only care about HDMI here).
Quoted 2 lines
encoder->typeis changed at runtime thanks to ddi encoders. Also shouldn't we care about dp audio too or am I confused?
IIUC DP can take care of itself, we need the whole callback here to be able to program HDMI N/CTS parameters.
BR,
Jani.
Quoted 78 lines
-Daniel
Quoted 71 lines
Quoted 64 lines
drivers/gpu/drm/i915/intel_audio.c +51
-0+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 · 1 line
1.9.1Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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
Re: [PATCH v3 3/4] ALSA: hda - display audio call sync_audio_rate callback
Quoted 7 lines · On Mon, 17 Aug 2015 12:40:00 +0200, [email protected] wrote:
From: Libin Yang <[email protected]>
For display audio, call the
sync_audio_ratecallback function to do the synchronization between gfx driver and audio driver.Signed-off-by Libin Yang <[email protected]>
I guess it would be easier to take this series from drm tree. Feel free to my ack
thanks,
Takashi
Quoted 51 lines
--- 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 · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/4] ALSA: hda - display audio call sync_audio_rate callback
Hi Takashi,
Quoted 14 lines
-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Monday, August 17, 2015 8:26 PM
To: Yang, Libin
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3 3/4] ALSA: hda - display audio callsync_audio_ratecallbackQuoted 3 lines · On Mon, 17 Aug 2015 12:40:00 +0200, [email protected] wrote:
From: Libin Yang <[email protected]>
Quoted 8 lines
Quoted 4 lines
For display audio, call the
sync_audio_ratecallback function to do the synchronization between gfx driver and audio driver.Signed-off-by Libin Yang <[email protected]>I guess it would be easier to take this series from drm tree. Feel free to my ack
Reviewed-by Takashi Iwai <[email protected]>
Get it. Thanks.
Regards,
Libin
Quoted 54 lines
thanks,
Takashi
Review
Quoted 5 lines
--- sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)(quoted diff) +0
-0
b/sound/pci/hda/patch_hdmi.csound/pci/hda/patch_hdmi.c static bool
Quoted 4 lines
index a97db5f..1668868 100644
sound/pci/hda/patch_hdmi.c +0
-0@@ -1770,6 +1770,16 @@ static bool
check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)sound/pci/hda/patch_hdmi.c static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
Quoted 4 lines
sound/pci/hda/patch_hdmi.c +1
-0return non_pcm; } +/* There is a fixed mapping between audio pin node and display port
sound/pci/hda/patch_hdmi.c static int
Quoted 13 lines
sound/pci/hda/patch_hdmi.c +9
-0+* 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 intgeneric_hdmi_playback_pcm_prepare(struct
hda_pcm_stream*hinfo,sound/pci/hda/patch_hdmi.c static int
Quoted 10 lines
sound/pci/hda/patch_hdmi.c +2
-0int 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 intgeneric_hdmi_playback_pcm_prepare(struct
hda_pcm_stream*hinfo,sound/pci/hda/patch_hdmi.c static int · line 1818
Quoted 5 lines
sound/pci/hda/patch_hdmi.c +1
-0intel_not_share_assigned_cvt (codec, pin_nid, per_pin- mux_idx); } +/* Call sync_audio_rate to set the N/CTS/M manually if necessary */
Quoted 12 lines
Quoted 8 lines
sound/pci/hda/patch_hdmi.c +6
-0+/* 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);Quoted 4 lines
per_pin->channels=substream->runtime->channels;
--
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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