drm/i915/audio: extend get_saved_enc() to support more scenarios
Subsystems (2)
PATCH 1/2 drm/i915/audio: extend get_saved_enc() to support more scenarios
From: Libin Yang <[email protected]>
In initialization, audio driver will call functions get_eld() and etc. But at that time, audio driver may not know whether it is DP MST or not. In the original function get_saved_enc(), if it is DP MST, it requires to set the pipe to the correct value, otherwise, pipe to be -1.
Although audio driver can get the knowledge whether it is in DP MST mode or not by reading the codec register. It will drop performance each time before it calls the get_eld and other similar functions. As gfx driver can easily know whether it is in DP MST mode or not. Let's extend the get_saved_enc() function to handle the situation that audio driver still sends the device id info even it is in DP SST mode and return the correct intel_encoder instead of panic.
--- drivers/gpu/drm/i915/intel_audio.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +28 -4
@@ -737,25 +737,49 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)return dev_priv->cdclk_freq; } +/* +* get the intel_encoder according to the parameter port and pipe +* intel_encoder is saved by the index of pipe +* MST & (pipe >= 0): return the av_enc_map[pipe], +* when port is matched +* MST & (pipe < 0): this is invalid +* Non-MST & (pipe >= 0): only pipe = 0 (the first device entry) +* will get the right intel_encoder with port matched +* Non-MST & (pipe < 0): get the right intel_encoder with port matched +*/ static struct intel_encoder *get_saved_enc (struct drm_i915_private *dev_priv,int port,int pipe) { +struct intel_encoder *encoder;if (WARN_ON (pipe >=I915_MAX_PIPES ))return NULL ;/* MST */ -if (pipe >=0 ) -return dev_priv->av_enc_map[pipe]; +if (pipe >=0 ) { + encoder = dev_priv->av_enc_map[pipe]; +/* +* when bootup, audio driver may not know it is +* MST or not. So it will poll all the port & pipe +* combinations +*/ +if (encoder !=NULL && encoder->port == port && + encoder->type ==INTEL_OUTPUT_DP_MST ) +return encoder; + }/* Non-MST */ -for_each_pipe (dev_priv, pipe) { -struct intel_encoder *encoder; +if (pipe >0 ) +return NULL ; +for_each_pipe (dev_priv, pipe) { encoder = dev_priv->av_enc_map[pipe];if (encoder ==NULL )continue ; +if (encoder->type ==INTEL_OUTPUT_DP_MST ) +continue ; +if (port == encoder->port)return encoder; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/audio: extend audio sync rate support for DP MST
From: Libin Yang <[email protected]>
Remove the type judgement in i915_audio_component_sync_audio_rate(). Audio rate sync is necessary for all i915 digital audio now.
--- drivers/gpu/drm/i915/intel_audio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +1 -3
@@ -805,9 +805,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,/* 1. get the pipe */ intel_encoder =get_saved_enc (dev_priv, port, pipe); -if (!intel_encoder || !intel_encoder->base.crtc || - (intel_encoder->type !=INTEL_OUTPUT_HDMI && - intel_encoder->type !=INTEL_OUTPUT_DP )) { +if (!intel_encoder || !intel_encoder->base.crtc) {DRM_DEBUG_KMS ("Not valid for port %c\n" ,port_name (port)); err = -ENODEV ; goto unlock;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/audio: extend get_saved_enc() to support more scenarios
In reply to [email protected]== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/audio: extend get_saved_enc() to support more scenarios
URL : https://patchwork.freedesktop.org/series/16200/
State : success
== Summary ==
Series 16200v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16200/revisions/1/mbox/
Test kms_busy:
Subgroup basic-flip-default-a:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-default-b:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-default-c:
skip -> PASS (fi-ivb-3770)
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
skip -> PASS (fi-ivb-3770)
Subgroup basic-busy-flip-before-cursor-varying-size:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-after-cursor-legacy:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-after-cursor-varying-size:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-before-cursor-legacy:
skip -> PASS (fi-ivb-3770)
Subgroup basic-flip-before-cursor-varying-size:
skip -> PASS (fi-ivb-3770)
Test kms_force_connector_basic:
Subgroup force-connector-state:
skip -> PASS (fi-ivb-3770)
Subgroup force-edid:
skip -> PASS (fi-ivb-3770)
Subgroup force-load-detect:
skip -> PASS (fi-ivb-3770)
Subgroup prune-stale-modes:
skip -> PASS (fi-ivb-3770)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
skip -> PASS (fi-ivb-3770)
Subgroup suspend-read-crc-pipe-a:
skip -> PASS (fi-ivb-3770)
Subgroup suspend-read-crc-pipe-b:
skip -> PASS (fi-ivb-3770)
Subgroup suspend-read-crc-pipe-c:
skip -> PASS (fi-ivb-3770)
Test prime_vgem:
Subgroup basic-fence-flip:
skip -> PASS (fi-ivb-3770)fi-bdw-5557u total:245 pass:230 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:245 pass:205 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:245 pass:192 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:245 pass:224 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:245 pass:223 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:245 pass:212 dwarn:0 dfail:0 fail:0 skip:33
51c6c255aa05775bcfb3f5790a3b9249e5990f3e drm-tip: 2016y-11m-30d-16h-12m-19s UTC integration manifest a6d27e4 drm/i915/audio: extend audio sync rate support for DP MST
99235be drm/i915/audio: extend get_saved_enc() to support more scenarios
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3156/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MST
In reply to [email protected]Any comments? Thanks.
Regards,
Libin
Quoted 38 lines
-----Original Message-----
From: Yang, Libin
Sent: Thursday, December 1, 2016 1:17 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>
Subject: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MSTFrom: Libin Yang <[email protected]>
Remove the type judgement in
i915_audio_component_sync_audio_rate(). Audio rate sync is necessary for all i915 digital audio now.Signed-off-by Libin Yang <[email protected]>---
drivers/gpu/drm/i915/intel_audio.c| 4 +---1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/intel_audio.c +1
-3@@ -805,9 +805,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,/* 1. get the pipe */ intel_encoder =get_saved_enc (dev_priv, port, pipe); -if (!intel_encoder || !intel_encoder->base.crtc || - (intel_encoder->type !=INTEL_OUTPUT_HDMI && - intel_encoder->type !=INTEL_OUTPUT_DP )) { +if (!intel_encoder || !intel_encoder->base.crtc) {DRM_DEBUG_KMS ("Not valid for port %c\n" ,port_name (port));err = -ENODEV; goto unlock;
Quoted 2 lines
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MST
Quoted 1 line · Libin
Any comments? Thanks.
Both pushed to dinq, thanks for the patches.
Libin and/or Dhinakaran, please improve the documentation of struct i915_audio_component_ops to describe the parameters of sync_audio_rate and get_eld hooks. For example, there's nothing about pipe being -1 for non-MST.
BR,
Jani.
Quoted 46 lines
Regards,
LibinQuoted 40 lines
-----Original Message-----
From: Yang, Libin
Sent: Thursday, December 1, 2016 1:17 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>
Subject: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MSTFrom: Libin Yang <[email protected]>
Remove the type judgement in
i915_audio_component_sync_audio_rate(). Audio rate sync is necessary for all i915 digital audio now.Signed-off-by Libin Yang <[email protected]>---
drivers/gpu/drm/i915/intel_audio.c| 4 +---1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/intel_audio.c +1
-3@@ -805,9 +805,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,/* 1. get the pipe */ intel_encoder =get_saved_enc (dev_priv, port, pipe); -if (!intel_encoder || !intel_encoder->base.crtc || - (intel_encoder->type !=INTEL_OUTPUT_HDMI && - intel_encoder->type !=INTEL_OUTPUT_DP )) { +if (!intel_encoder || !intel_encoder->base.crtc) {DRM_DEBUG_KMS ("Not valid for port %c\n" ,port_name (port));err = -ENODEV; goto unlock;--
2.7.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MST
Quoted 12 lines
-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Friday, December 2, 2016 10:25 PM
To: Yang, Libin <[email protected]>; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; [email protected]; [email protected]
Subject: RE: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MSTOn Fri, 02 Dec 2016, "Yang, Libin" <[email protected]> wrote:
Quoted 8 lines
Quoted 1 line
Any comments? Thanks.
Both pushed to dinq, thanks for the patches.
Libin and/or Dhinakaran, please improve the documentation of struct
i915_audio_component_opsto describe the parameters ofsync_audio_rateandget_eldhooks. For example, there's nothing about pipe being -1 for non- MST.
Thanks. Get it. I will update it next week.
Regards,
Libin
Quoted 47 lines
BR,
Jani.Quoted 34 lines
Regards,
LibinQuoted 29 lines
-----Original Message-----
From: Yang, Libin
Sent: Thursday, December 1, 2016 1:17 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>
Subject: [PATCH 2/2] drm/i915/audio: extend audio sync rate support for DP MSTFrom: Libin Yang <[email protected]>
Remove the type judgement in
i915_audio_component_sync_audio_rate(). Audio rate sync is necessary for all i915 digital audio now.Signed-off-by Libin Yang <[email protected]>---
drivers/gpu/drm/i915/intel_audio.c| 4 +---1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -805,9 +805,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,
Quoted 7 lines
drivers/gpu/drm/i915/intel_audio.c +1
-3/* 1. get the pipe */ intel_encoder =get_saved_enc (dev_priv, port, pipe); -if (!intel_encoder || !intel_encoder->base.crtc || - (intel_encoder->type !=INTEL_OUTPUT_HDMI && - intel_encoder->type !=INTEL_OUTPUT_DP )) { +if (!intel_encoder || !intel_encoder->base.crtc) { DRM_DEBUG_KMS("Not valid for port %c\n",
port_name(port));
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0err = -ENODEV ;goto unlock;--
2.7.4--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx