[PATCH] drm/i915/audio: Fix audio detection issue on GLK

[PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Gaurav K Singh]

On Geminilake, sometimes audio card is not getting
detected after reboot. This is a spurious issue happening on
Geminilake. HW codec and HD audio controller link was going
out of sync for which there was a fix in i915 driver but
was not getting invoked for GLK. Extending this fix to GLK as well.

Tested by Du,Wenkai on GLK board.

Bspec: 21829

v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro (Jani N)

Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
Reviewed-by: Abhay Kumar <abhay.Kumar@intel.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 656f6c931341..3ea566f99450 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	u32 tmp;
 
-	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
+	if (!IS_GEN9(dev_priv))
 		return;
 
 	i915_audio_component_get_power(kdev);
-- 
1.9.1

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Du,Wenkai]

On 4/17/2018 11:22 AM, Gaurav K Singh wrote:
> On Geminilake, sometimes audio card is not getting
> detected after reboot. This is a spurious issue happening on
> Geminilake. HW codec and HD audio controller link was going
> out of sync for which there was a fix in i915 driver but
> was not getting invoked for GLK. Extending this fix to GLK as well.
>
> Tested by Du,Wenkai on GLK board.
>
> Bspec: 21829
>
> v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro (Jani N)
>
> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> Reviewed-by: Abhay Kumar <abhay.Kumar@intel.com>
Reviewed-by: Wenkai Du <wenkai.du@intel.com>
Tested-by: Wenkai Du <wenkai.du@intel.com>


Regards,
Wenkai
> ---
>   drivers/gpu/drm/i915/intel_audio.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 656f6c931341..3ea566f99450 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>   	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>   	u32 tmp;
>   
> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> +	if (!IS_GEN9(dev_priv))
>   		return;
>   
>   	i915_audio_component_get_power(kdev);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for drm/i915/audio: Fix audio detection issue on GLK (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/audio: Fix audio detection issue on GLK (rev3)
URL   : https://patchwork.freedesktop.org/series/41334/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
31e1d7550f3b drm/i915/audio: Fix audio detection issue on GLK
-:16: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#16: 
v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro (Jani N)

total: 0 errors, 1 warnings, 0 checks, 8 lines checked

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

✓ Fi.CI.BAT: success for drm/i915/audio: Fix audio detection issue on GLK (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/audio: Fix audio detection issue on GLK (rev3)
URL   : https://patchwork.freedesktop.org/series/41334/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4059 -> Patchwork_8711 =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_8711 need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8711, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/41334/revisions/3/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8711:

  === IGT changes ===

    ==== Warnings ====

    igt@core_auth@basic-auth:
      fi-kbl-r:           PASS -> NOTRUN +257

    igt@drv_getparams_basic@basic-subslice-total:
      fi-snb-2600:        PASS -> NOTRUN +244

    igt@drv_hangman@error-state-basic:
      fi-elk-e7500:       PASS -> NOTRUN +181

    igt@gem_busy@basic-busy-default:
      fi-glk-j4005:       PASS -> NOTRUN +255

    igt@gem_close_race@basic-process:
      fi-ivb-3770:        PASS -> NOTRUN +251

    igt@gem_ctx_param@basic:
      fi-gdg-551:         SKIP -> NOTRUN +107

    igt@gem_exec_basic@basic-bsd1:
      fi-cfl-u:           SKIP -> NOTRUN +25

    igt@gem_exec_basic@basic-vebox:
      fi-ivb-3770:        SKIP -> NOTRUN +32

    igt@gem_exec_basic@gtt-bsd:
      fi-bwr-2160:        SKIP -> NOTRUN +104

    igt@gem_exec_basic@gtt-bsd2:
      fi-kbl-7500u:       SKIP -> NOTRUN +23
      fi-cnl-y3:          SKIP -> NOTRUN +25

    igt@gem_exec_basic@readonly-bsd:
      fi-pnv-d510:        SKIP -> NOTRUN +63

    igt@gem_exec_basic@readonly-bsd1:
      fi-snb-2520m:       SKIP -> NOTRUN +39

    igt@gem_exec_flush@basic-batch-kernel-default-cmd:
      fi-bxt-dsi:         SKIP -> NOTRUN +29

    igt@gem_exec_flush@basic-batch-kernel-default-wb:
      fi-kbl-7567u:       PASS -> NOTRUN +264

    igt@gem_exec_flush@basic-uc-rw-default:
      fi-byt-j1900:       PASS -> NOTRUN +249

    igt@gem_exec_gttfill@basic:
      fi-skl-gvtdvm:      SKIP -> NOTRUN +22

    igt@gem_exec_reloc@basic-cpu-active:
      fi-bsw-n3050:       PASS -> NOTRUN +238

    igt@gem_exec_reloc@basic-write-cpu-noreloc:
      fi-skl-6770hq:      PASS -> NOTRUN +264

    igt@gem_exec_reloc@basic-write-gtt-noreloc:
      fi-ivb-3520m:       PASS -> NOTRUN +253

    igt@gem_exec_store@basic-bsd1:
      fi-kbl-r:           SKIP -> NOTRUN +26

    igt@gem_exec_store@basic-bsd2:
      fi-hsw-4770:        SKIP -> NOTRUN +26

    igt@gem_flink_basic@basic:
      fi-gdg-551:         PASS -> NOTRUN +175

    igt@gem_mmap@basic-small-bo:
      fi-skl-gvtdvm:      PASS -> NOTRUN +261

    igt@gem_mmap_gtt@basic-read:
      fi-cnl-y3:          PASS -> NOTRUN +258

    igt@gem_mmap_gtt@basic-read-write-distinct:
      fi-hsw-4770:        PASS -> NOTRUN +257

    igt@gem_mmap_gtt@basic-small-bo:
      fi-kbl-7500u:       PASS -> NOTRUN +259

    igt@gem_mmap_gtt@basic-wc:
      fi-pnv-d510:        PASS -> NOTRUN +219

    igt@gem_mmap_gtt@basic-write:
      fi-cfl-8700k:       PASS -> NOTRUN +256

    igt@gem_mmap_gtt@basic-write-gtt:
      fi-blb-e6850:       PASS -> NOTRUN +219

    igt@gem_ringfill@basic-default-fd:
      fi-elk-e7500:       SKIP -> NOTRUN +46

    igt@gem_sync@basic-store-all:
      fi-byt-n2820:       PASS -> NOTRUN +245

    igt@gem_wait@basic-await-all:
      fi-glk-1:           PASS -> NOTRUN +256

    igt@gem_workarounds@basic-read:
      fi-snb-2600:        SKIP -> NOTRUN +39

    igt@gvt_basic@invalid-placeholder-test:
      fi-skl-6260u:       SKIP -> NOTRUN +19

    igt@kms_addfb_basic@addfb25-bad-modifier:
      fi-bdw-gvtdvm:      PASS -> NOTRUN +260

    igt@kms_addfb_basic@too-high:
      fi-bwr-2160:        PASS -> NOTRUN +179

    igt@kms_addfb_basic@unused-modifier:
      fi-bdw-5557u:       PASS -> NOTRUN +263

    igt@kms_chamelium@common-hpd-after-suspend:
      fi-ivb-3520m:       SKIP -> NOTRUN +28

    igt@kms_chamelium@dp-crc-fast:
      fi-skl-guc:         SKIP -> NOTRUN +27

    igt@kms_chamelium@dp-edid-read:
      fi-skl-6770hq:      SKIP -> NOTRUN +19
      fi-byt-n2820:       SKIP -> NOTRUN +38

    igt@kms_chamelium@dp-hpd-fast:
      fi-ilk-650:         SKIP -> NOTRUN +59

    igt@kms_chamelium@hdmi-crc-fast:
      fi-cfl-s3:          SKIP -> NOTRUN +25
      fi-bsw-n3050:       SKIP -> NOTRUN +45
      fi-byt-j1900:       SKIP -> NOTRUN +34

    igt@kms_chamelium@hdmi-edid-read:
      fi-glk-1:           SKIP -> NOTRUN +27
      fi-blb-e6850:       SKIP -> NOTRUN +63

    igt@kms_chamelium@vga-edid-read:
      fi-cfl-8700k:       SKIP -> NOTRUN +27
      fi-skl-6600u:       SKIP -> NOTRUN +26

    igt@kms_flip@basic-flip-vs-dpms:
      fi-ilk-650:         PASS -> NOTRUN +224

    igt@kms_flip@basic-plain-flip:
      fi-bxt-j4205:       PASS -> NOTRUN +255

    igt@kms_force_connector_basic@force-connector-state:
      fi-kbl-7567u:       SKIP -> NOTRUN +19

    igt@kms_force_connector_basic@prune-stale-modes:
      fi-glk-j4005:       SKIP -> NOTRUN +28
      fi-skl-6700k2:      SKIP -> NOTRUN +23

    igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
      fi-skl-6600u:       PASS -> NOTRUN +257

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-snb-2520m:       PASS -> NOTRUN +244

    igt@kms_sink_crc_basic:
      fi-bdw-gvtdvm:      SKIP -> NOTRUN +23

    igt@pm_backlight@basic-brightness:
      fi-bxt-j4205:       SKIP -> NOTRUN +28
      fi-bdw-5557u:       SKIP -> NOTRUN +20

    igt@pm_rpm@basic-rte:
      fi-skl-6260u:       PASS -> NOTRUN +264

    igt@prime_self_import@basic-llseek-bad:
      fi-skl-guc:         PASS -> NOTRUN +256

    igt@prime_self_import@basic-with_two_bos:
      fi-bxt-dsi:         PASS -> NOTRUN +254

    igt@prime_vgem@basic-busy-default:
      fi-cfl-u:           PASS -> NOTRUN +258

    igt@vgem_basic@create:
      fi-cfl-s3:          PASS -> NOTRUN +258

    igt@vgem_basic@mmap:
      fi-skl-6700k2:      PASS -> NOTRUN +260

    
== Known issues ==

  Here are the changes found in Patchwork_8711 that come from known issues:

  === IGT changes ===

    ==== Possible fixes ====

    igt@gem_exec_suspend@basic-s3:
      fi-ivb-3520m:       DMESG-WARN (fdo#106084) -> NOTRUN +1

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         FAIL (fdo#102575) -> NOTRUN

    igt@gem_ringfill@basic-default-hang:
      fi-pnv-d510:        DMESG-WARN (fdo#101600) -> NOTRUN
      fi-blb-e6850:       DMESG-WARN (fdo#101600) -> NOTRUN

    igt@kms_chamelium@common-hpd-after-suspend:
      fi-kbl-7500u:       DMESG-WARN (fdo#102505) -> NOTRUN

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
      fi-elk-e7500:       INCOMPLETE (fdo#103989) -> NOTRUN

    
  fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
  fdo#102505 https://bugs.freedesktop.org/show_bug.cgi?id=102505
  fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
  fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
  fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084


== Participating hosts (36 -> 33) ==

  Missing    (3): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4059 -> Patchwork_8711

  CI_DRM_4059: c1645edc253f2b52a8c94565a75b479a6782e75f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4435: ddbe5a4d8bb1780ecf07f72e815062d3bce8ff71 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8711: 31e1d7550f3b6bff39c91aef9627141d738f531d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4435: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit


== Linux commits ==

31e1d7550f3b drm/i915/audio: Fix audio detection issue on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8711/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for drm/i915/audio: Fix audio detection issue on GLK (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/audio: Fix audio detection issue on GLK (rev3)
URL   : https://patchwork.freedesktop.org/series/41334/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4059_full -> Patchwork_8711_full =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_8711_full need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8711_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/41334/revisions/3/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8711_full:

  === IGT changes ===

    ==== Warnings ====

    igt@gem_busy@extended-parallel-bsd1:
      shard-hsw:          SKIP -> NOTRUN +890

    igt@gem_exec_params@dr1-dirt:
      shard-kbl:          PASS -> NOTRUN +1940

    igt@gem_pread@stolen-uncached:
      shard-kbl:          SKIP -> NOTRUN +700

    igt@gem_pwrite@display:
      shard-snb:          PASS -> NOTRUN +1377

    igt@kms_chv_cursor_fail@pipe-b-256x256-top-edge:
      shard-hsw:          PASS -> NOTRUN +1783

    igt@kms_rotation_crc@sprite-rotation-90-pos-100-0:
      shard-apl:          PASS -> NOTRUN +1834

    igt@perf_pmu@busy-start-vcs1:
      shard-snb:          SKIP -> NOTRUN +1298

    igt@prime_vgem@sync-bsd1:
      shard-apl:          SKIP -> NOTRUN +835

    
== Known issues ==

  Here are the changes found in Patchwork_8711_full that come from known issues:

  === IGT changes ===

    ==== Possible fixes ====

    igt@drv_selftest@mock_breadcrumbs:
      shard-hsw:          DMESG-FAIL (fdo#106085) -> NOTRUN
      shard-snb:          DMESG-FAIL (fdo#106085) -> NOTRUN
      shard-apl:          DMESG-FAIL (fdo#106085) -> NOTRUN
      shard-kbl:          DMESG-FAIL (fdo#106085) -> NOTRUN

    igt@drv_selftest@mock_scatterlist:
      shard-hsw:          DMESG-WARN (fdo#103667) -> NOTRUN
      shard-kbl:          DMESG-WARN (fdo#103667) -> NOTRUN
      shard-snb:          DMESG-WARN (fdo#103667) -> NOTRUN
      shard-apl:          DMESG-WARN (fdo#103667) -> NOTRUN

    igt@gem_ctx_isolation@vcs0-s3:
      shard-kbl:          INCOMPLETE (fdo#103665) -> NOTRUN

    igt@gem_exec_schedule@pi-ringfull-blt:
      shard-apl:          FAIL (fdo#103158) -> NOTRUN +3

    igt@gem_exec_schedule@pi-ringfull-bsd1:
      shard-kbl:          FAIL (fdo#103158) -> NOTRUN +4

    igt@kms_flip@2x-flip-vs-expired-vblank:
      shard-hsw:          FAIL (fdo#102887) -> NOTRUN

    igt@kms_flip@flip-vs-expired-vblank-interruptible:
      shard-apl:          FAIL (fdo#105363, fdo#102887) -> NOTRUN

    igt@kms_flip@modeset-vs-vblank-race:
      shard-hsw:          FAIL (fdo#103060) -> NOTRUN

    igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
      shard-snb:          FAIL (fdo#103167) -> NOTRUN

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> NOTRUN
      shard-hsw:          FAIL (fdo#99912) -> NOTRUN
      shard-snb:          FAIL (fdo#99912) -> NOTRUN

    igt@kms_sysfs_edid_timing:
      shard-hsw:          WARN (fdo#100047) -> NOTRUN
      shard-kbl:          FAIL (fdo#100047) -> NOTRUN

    igt@prime_vgem@coherency-gtt:
      shard-apl:          FAIL (fdo#100587) -> NOTRUN +1

    
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
  fdo#100587 https://bugs.freedesktop.org/show_bug.cgi?id=100587
  fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
  fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
  fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#103667 https://bugs.freedesktop.org/show_bug.cgi?id=103667
  fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
  fdo#106085 https://bugs.freedesktop.org/show_bug.cgi?id=106085
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


== Participating hosts (6 -> 4) ==

  Missing    (2): shard-glk shard-glkb 


== Build changes ==

    * Linux: CI_DRM_4059 -> Patchwork_8711

  CI_DRM_4059: c1645edc253f2b52a8c94565a75b479a6782e75f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4435: ddbe5a4d8bb1780ecf07f72e815062d3bce8ff71 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8711: 31e1d7550f3b6bff39c91aef9627141d738f531d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4435: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8711/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Singh, Gaurav K]

On 4/17/2018 11:58 PM, Du,Wenkai wrote:
>
> On 4/17/2018 11:22 AM, Gaurav K Singh wrote:
>> On Geminilake, sometimes audio card is not getting
>> detected after reboot. This is a spurious issue happening on
>> Geminilake. HW codec and HD audio controller link was going
>> out of sync for which there was a fix in i915 driver but
>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>
>> Tested by Du,Wenkai on GLK board.
>>
>> Bspec: 21829
>>
>> v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 
>> macro (Jani N)
>>
>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>> Reviewed-by: Abhay Kumar <abhay.Kumar@intel.com>
> Reviewed-by: Wenkai Du <wenkai.du@intel.com>
> Tested-by: Wenkai Du <wenkai.du@intel.com>
>
>
> Regards,
> Wenkai
Hi Jani,

Could you please help in merging this patch to unblock audio.

With regards,
Gaurav
>> ---
>>   drivers/gpu/drm/i915/intel_audio.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c 
>> b/drivers/gpu/drm/i915/intel_audio.c
>> index 656f6c931341..3ea566f99450 100644
>> --- a/drivers/gpu/drm/i915/intel_audio.c
>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>> @@ -729,7 +729,7 @@ static void 
>> i915_audio_component_codec_wake_override(struct device *kdev,
>>       struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>       u32 tmp;
>>   -    if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>> +    if (!IS_GEN9(dev_priv))
>>           return;
>>         i915_audio_component_get_power(kdev);

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Jani Nikula]

On Wed, 18 Apr 2018, "Singh, Gaurav K" <gaurav.k.singh@intel.com> wrote:
> On 4/17/2018 11:58 PM, Du,Wenkai wrote:
>>
>> On 4/17/2018 11:22 AM, Gaurav K Singh wrote:
>>> On Geminilake, sometimes audio card is not getting
>>> detected after reboot. This is a spurious issue happening on
>>> Geminilake. HW codec and HD audio controller link was going
>>> out of sync for which there was a fix in i915 driver but
>>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>>
>>> Tested by Du,Wenkai on GLK board.
>>>
>>> Bspec: 21829
>>>
>>> v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 
>>> macro (Jani N)
>>>
>>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>>> Reviewed-by: Abhay Kumar <abhay.Kumar@intel.com>
>> Reviewed-by: Wenkai Du <wenkai.du@intel.com>
>> Tested-by: Wenkai Du <wenkai.du@intel.com>
>>
>>
>> Regards,
>> Wenkai
> Hi Jani,
>
> Could you please help in merging this patch to unblock audio.

Pushed, thanks for the patch and review.

Added Cc: stable, with a dependency on b651bd2a3ae3 ("drm/i915/audio:
Fix audio enumeration issue on BXT") to be backported as well.

BR,
Jani.

>
> With regards,
> Gaurav
>>> ---
>>>   drivers/gpu/drm/i915/intel_audio.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_audio.c 
>>> b/drivers/gpu/drm/i915/intel_audio.c
>>> index 656f6c931341..3ea566f99450 100644
>>> --- a/drivers/gpu/drm/i915/intel_audio.c
>>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>>> @@ -729,7 +729,7 @@ static void 
>>> i915_audio_component_codec_wake_override(struct device *kdev,
>>>       struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>>       u32 tmp;
>>>   -    if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>>> +    if (!IS_GEN9(dev_priv))
>>>           return;
>>>         i915_audio_component_get_power(kdev);
>

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915/audio: Fix audio detection issue on GLK (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/audio: Fix audio detection issue on GLK (rev3)
URL   : https://patchwork.freedesktop.org/series/41334/
State : failure

== Summary ==

Applying: drm/i915/audio: Fix audio detection issue on GLK
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_audio.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8711/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915/audio: Fix audio detection issue on GLK (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/audio: Fix audio detection issue on GLK (rev3)
URL   : https://patchwork.freedesktop.org/series/41334/
State : failure

== Summary ==

Applying: drm/i915/audio: Fix audio detection issue on GLK
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_audio.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8711/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Kumar, Abhay]

On 4/17/2018 12:18 AM, Gaurav K Singh wrote:
> On Geminilake, sometimes audio card is not getting
> detected after reboot. This is a spurious issue happening on
> Geminilake. HW codec and HD audio controller link was going
> out of sync for which there was a fix in i915 driver but
> was not getting invoked for GLK. Extending this fix to GLK as well.
>
> Tested by Du,Wenkai on GLK board.
>
> Bspec: 21829
>
> v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro
>
> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Abhay Kumar <abhay.Kumar@intel.com>


> ---
>   drivers/gpu/drm/i915/intel_audio.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 656f6c931341..3ea566f99450 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>   	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>   	u32 tmp;
>   
> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> +	if (!IS_GEN9(dev_priv))
>   		return;
>   
>   	i915_audio_component_get_power(kdev);

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Jani Nikula]

On Tue, 17 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
> On Geminilake, sometimes audio card is not getting
> detected after reboot. This is a spurious issue happening on
> Geminilake. HW codec and HD audio controller link was going
> out of sync for which there was a fix in i915 driver but
> was not getting invoked for GLK. Extending this fix to GLK as well.
>
> Tested by Du,Wenkai on GLK board.
>
> Bspec: 21829
>
> v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro
>
> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

That Reviewed-by is jumping to conclusions I'm afraid. Giving review
comments does not mean Reviewed-by. Only explicit Reviewed-by reply
does.

I can only say that this is the right approach *if* glk is to be covered
here, but I have no data to actually say if that's the right thing to
do.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/intel_audio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 656f6c931341..3ea566f99450 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>  	u32 tmp;
>  
> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> +	if (!IS_GEN9(dev_priv))
>  		return;
>  
>  	i915_audio_component_get_power(kdev);

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Gaurav K Singh]

On Geminilake, sometimes audio card is not getting
detected after reboot. This is a spurious issue happening on
Geminilake. HW codec and HD audio controller link was going
out of sync for which there was a fix in i915 driver but
was not getting invoked for GLK. Extending this fix to GLK as well.

Tested by Du,Wenkai on GLK board.

Bspec: 21829

v2: Instead of checking GEN9_BC, BXT and GLK macros, use IS_GEN9 macro

Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 656f6c931341..3ea566f99450 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -729,7 +729,7 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	u32 tmp;
 
-	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
+	if (!IS_GEN9(dev_priv))
 		return;
 
 	i915_audio_component_get_power(kdev);
-- 
1.9.1

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Singh, Gaurav K]

On 4/10/2018 4:32 PM, Jani Nikula wrote:
> On Mon, 09 Apr 2018, "Kumar, Abhay" <abhay.kumar@intel.com> wrote:
>> On 4/9/2018 4:20 PM, Pandiyan, Dhinakaran wrote:
>>>
>>> On Mon, 2018-04-09 at 12:18 -0700, Kumar, Abhay wrote:
>>>> On 4/9/2018 12:10 PM, Rodrigo Vivi wrote:
>>>>> On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
>>>>>> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
>>>>>>> On Geminilake, sometimes audio card is not getting
>>>>>>> detected after reboot. This is a spurious issue happening on
>>>>>>> Geminilake. HW codec and HD audio controller link was going
>>>>>>> out of sync for which there was a fix in i915 driver but
>>>>>>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>>>>>>
>>>>>>> Tested by Du,Wenkai on GLK board.
>>>>>>>
>>>>>>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>>>>>>> ---
>>>>>>>     drivers/gpu/drm/i915/intel_audio.c | 3 ++-
>>>>>>>     1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>>>
>>>>>>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>>>>>>> index 656f6c931341..73b1e0b96f88 100644
>>>>>>> --- a/drivers/gpu/drm/i915/intel_audio.c
>>>>>>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>>>>>>> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>>>>>>>     	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>>>>>>     	u32 tmp;
>>>>>>>     
>>>>>>> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>>>>>>> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
>>>>>>> +						!IS_GEMINILAKE(dev_priv))
>>>>>> That could be written as
>>>>>>
>>>>>> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
>>>>>>
>>>>>> which in turn could just be written as
>>>>>>
>>>>>> 	if (!IS_GEN9(dev_priv))
>>>>>>
>>>>>> ...but since GLK has gen 10 display, so I'm wondering if the same issue
>>>>>> will be present in gen 10 too, and whether this should just become
>>>>>>
>>>>>> 	if (INTEL_GEN(dev_priv) < 9)
>>>>> +1. I opened here to exactly add same comment.
>>>> I am checking with DINQ and without this patch for GLK it can enumerate
>>>> HDA codec. Ofcourse after cdclk fix.
>>> How about the other way around? i.e., does codec enumeration work this
>>> patch but without the cdclk change?
>> Nop. with DINQ we need to have cdclk change to make Codec detection
>> work. With or without this patch.
> Basically what you're saying is that this patch is not needed? Gaurav,
> can you check with the CDCLK patch [1] if that fixes the issue for you?
>
> BR,
> Jani.
Jani,

Our team tried my patch (not including Abhay's patch) which fixed the 
issue. But will also try Abhay's patch(this time without my patch), Will 
update accordingly.

With regards,
Gaurav
>
>
> PS. The CDCLK patch is not enough to fix the issue completely (probe
> without display outputs will still choose a low CDCLK) but that's work
> in progress.
>
>
> [1] http://patchwork.freedesktop.org/patch/msgid/1508968932-32208-1-git-send-email-abhay.kumar@intel.com
>
>
>>>
>>>
>>>>>> BR,
>>>>>> Jani.
>>>>>>
>>>>>>
>>>>>>
>>>>>>>     		return;
>>>>>>>     
>>>>>>>     	i915_audio_component_get_power(kdev);
>>>>>> -- 
>>>>>> Jani Nikula, Intel Open Source Technology Center
>>>>>> _______________________________________________
>>>>>> Intel-gfx mailing list
>>>>>> Intel-gfx@lists.freedesktop.org
>>>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>>>> _______________________________________________
>>>>> Intel-gfx mailing list
>>>>> Intel-gfx@lists.freedesktop.org
>>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Jani Nikula]

On Mon, 09 Apr 2018, "Kumar, Abhay" <abhay.kumar@intel.com> wrote:
> On 4/9/2018 4:20 PM, Pandiyan, Dhinakaran wrote:
>>
>>
>> On Mon, 2018-04-09 at 12:18 -0700, Kumar, Abhay wrote:
>>> On 4/9/2018 12:10 PM, Rodrigo Vivi wrote:
>>>> On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
>>>>> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
>>>>>> On Geminilake, sometimes audio card is not getting
>>>>>> detected after reboot. This is a spurious issue happening on
>>>>>> Geminilake. HW codec and HD audio controller link was going
>>>>>> out of sync for which there was a fix in i915 driver but
>>>>>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>>>>>
>>>>>> Tested by Du,Wenkai on GLK board.
>>>>>>
>>>>>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>>>>>> ---
>>>>>>    drivers/gpu/drm/i915/intel_audio.c | 3 ++-
>>>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>>>>>> index 656f6c931341..73b1e0b96f88 100644
>>>>>> --- a/drivers/gpu/drm/i915/intel_audio.c
>>>>>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>>>>>> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>>>>>>    	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>>>>>    	u32 tmp;
>>>>>>    
>>>>>> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>>>>>> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
>>>>>> +						!IS_GEMINILAKE(dev_priv))
>>>>> That could be written as
>>>>>
>>>>> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
>>>>>
>>>>> which in turn could just be written as
>>>>>
>>>>> 	if (!IS_GEN9(dev_priv))
>>>>>
>>>>> ...but since GLK has gen 10 display, so I'm wondering if the same issue
>>>>> will be present in gen 10 too, and whether this should just become
>>>>>
>>>>> 	if (INTEL_GEN(dev_priv) < 9)
>>>> +1. I opened here to exactly add same comment.
>>> I am checking with DINQ and without this patch for GLK it can enumerate
>>> HDA codec. Ofcourse after cdclk fix.
>> How about the other way around? i.e., does codec enumeration work this
>> patch but without the cdclk change?
> Nop. with DINQ we need to have cdclk change to make Codec detection 
> work. With or without this patch.

Basically what you're saying is that this patch is not needed? Gaurav,
can you check with the CDCLK patch [1] if that fixes the issue for you?

BR,
Jani.


PS. The CDCLK patch is not enough to fix the issue completely (probe
without display outputs will still choose a low CDCLK) but that's work
in progress.


[1] http://patchwork.freedesktop.org/patch/msgid/1508968932-32208-1-git-send-email-abhay.kumar@intel.com


>
>>
>>
>>
>>>>> BR,
>>>>> Jani.
>>>>>
>>>>>
>>>>>
>>>>>>    		return;
>>>>>>    
>>>>>>    	i915_audio_component_get_power(kdev);
>>>>> -- 
>>>>> Jani Nikula, Intel Open Source Technology Center
>>>>> _______________________________________________
>>>>> Intel-gfx mailing list
>>>>> Intel-gfx@lists.freedesktop.org
>>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Dhinakaran Pandiyan]

On Mon, 2018-04-09 at 12:18 -0700, Kumar, Abhay wrote:
> 
> On 4/9/2018 12:10 PM, Rodrigo Vivi wrote:
> > On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
> >> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
> >>> On Geminilake, sometimes audio card is not getting
> >>> detected after reboot. This is a spurious issue happening on
> >>> Geminilake. HW codec and HD audio controller link was going
> >>> out of sync for which there was a fix in i915 driver but
> >>> was not getting invoked for GLK. Extending this fix to GLK as well.
> >>>
> >>> Tested by Du,Wenkai on GLK board.
> >>>
> >>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> >>> ---
> >>>   drivers/gpu/drm/i915/intel_audio.c | 3 ++-
> >>>   1 file changed, 2 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> >>> index 656f6c931341..73b1e0b96f88 100644
> >>> --- a/drivers/gpu/drm/i915/intel_audio.c
> >>> +++ b/drivers/gpu/drm/i915/intel_audio.c
> >>> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
> >>>   	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> >>>   	u32 tmp;
> >>>   
> >>> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> >>> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
> >>> +						!IS_GEMINILAKE(dev_priv))
> >> That could be written as
> >>
> >> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
> >>
> >> which in turn could just be written as
> >>
> >> 	if (!IS_GEN9(dev_priv))
> >>
> >> ...but since GLK has gen 10 display, so I'm wondering if the same issue
> >> will be present in gen 10 too, and whether this should just become
> >>
> >> 	if (INTEL_GEN(dev_priv) < 9)
> > +1. I opened here to exactly add same comment.
> I am checking with DINQ and without this patch for GLK it can enumerate 
> HDA codec. Ofcourse after cdclk fix.

How about the other way around? i.e., does codec enumeration work this
patch but without the cdclk change?



> >
> >> BR,
> >> Jani.
> >>
> >>
> >>
> >>>   		return;
> >>>   
> >>>   	i915_audio_component_get_power(kdev);
> >> -- 
> >> Jani Nikula, Intel Open Source Technology Center
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Kumar, Abhay]

On 4/9/2018 4:20 PM, Pandiyan, Dhinakaran wrote:
>
>
> On Mon, 2018-04-09 at 12:18 -0700, Kumar, Abhay wrote:
>> On 4/9/2018 12:10 PM, Rodrigo Vivi wrote:
>>> On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
>>>> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
>>>>> On Geminilake, sometimes audio card is not getting
>>>>> detected after reboot. This is a spurious issue happening on
>>>>> Geminilake. HW codec and HD audio controller link was going
>>>>> out of sync for which there was a fix in i915 driver but
>>>>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>>>>
>>>>> Tested by Du,Wenkai on GLK board.
>>>>>
>>>>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>>>>> ---
>>>>>    drivers/gpu/drm/i915/intel_audio.c | 3 ++-
>>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>>>>> index 656f6c931341..73b1e0b96f88 100644
>>>>> --- a/drivers/gpu/drm/i915/intel_audio.c
>>>>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>>>>> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>>>>>    	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>>>>    	u32 tmp;
>>>>>    
>>>>> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>>>>> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
>>>>> +						!IS_GEMINILAKE(dev_priv))
>>>> That could be written as
>>>>
>>>> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
>>>>
>>>> which in turn could just be written as
>>>>
>>>> 	if (!IS_GEN9(dev_priv))
>>>>
>>>> ...but since GLK has gen 10 display, so I'm wondering if the same issue
>>>> will be present in gen 10 too, and whether this should just become
>>>>
>>>> 	if (INTEL_GEN(dev_priv) < 9)
>>> +1. I opened here to exactly add same comment.
>> I am checking with DINQ and without this patch for GLK it can enumerate
>> HDA codec. Ofcourse after cdclk fix.
> How about the other way around? i.e., does codec enumeration work this
> patch but without the cdclk change?
Nop. with DINQ we need to have cdclk change to make Codec detection 
work. With or without this patch.

>
>
>
>>>> BR,
>>>> Jani.
>>>>
>>>>
>>>>
>>>>>    		return;
>>>>>    
>>>>>    	i915_audio_component_get_power(kdev);
>>>> -- 
>>>> Jani Nikula, Intel Open Source Technology Center
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Kumar, Abhay]

On 4/9/2018 12:10 PM, Rodrigo Vivi wrote:
> On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
>> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
>>> On Geminilake, sometimes audio card is not getting
>>> detected after reboot. This is a spurious issue happening on
>>> Geminilake. HW codec and HD audio controller link was going
>>> out of sync for which there was a fix in i915 driver but
>>> was not getting invoked for GLK. Extending this fix to GLK as well.
>>>
>>> Tested by Du,Wenkai on GLK board.
>>>
>>> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_audio.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
>>> index 656f6c931341..73b1e0b96f88 100644
>>> --- a/drivers/gpu/drm/i915/intel_audio.c
>>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>>> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>>>   	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>>>   	u32 tmp;
>>>   
>>> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
>>> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
>>> +						!IS_GEMINILAKE(dev_priv))
>> That could be written as
>>
>> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
>>
>> which in turn could just be written as
>>
>> 	if (!IS_GEN9(dev_priv))
>>
>> ...but since GLK has gen 10 display, so I'm wondering if the same issue
>> will be present in gen 10 too, and whether this should just become
>>
>> 	if (INTEL_GEN(dev_priv) < 9)
> +1. I opened here to exactly add same comment.
I am checking with DINQ and without this patch for GLK it can enumerate 
HDA codec. Ofcourse after cdclk fix.
>
>> BR,
>> Jani.
>>
>>
>>
>>>   		return;
>>>   
>>>   	i915_audio_component_get_power(kdev);
>> -- 
>> Jani Nikula, Intel Open Source Technology Center
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Rodrigo Vivi]

On Mon, Apr 09, 2018 at 05:07:31PM +0300, Jani Nikula wrote:
> On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
> > On Geminilake, sometimes audio card is not getting
> > detected after reboot. This is a spurious issue happening on
> > Geminilake. HW codec and HD audio controller link was going
> > out of sync for which there was a fix in i915 driver but
> > was not getting invoked for GLK. Extending this fix to GLK as well.
> >
> > Tested by Du,Wenkai on GLK board.
> >
> > Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_audio.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> > index 656f6c931341..73b1e0b96f88 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
> >  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
> >  	u32 tmp;
> >  
> > -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> > +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
> > +						!IS_GEMINILAKE(dev_priv))
> 
> That could be written as
> 
> 	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))
> 
> which in turn could just be written as
> 
> 	if (!IS_GEN9(dev_priv))
> 
> ...but since GLK has gen 10 display, so I'm wondering if the same issue
> will be present in gen 10 too, and whether this should just become
> 
> 	if (INTEL_GEN(dev_priv) < 9)

+1. I opened here to exactly add same comment.

> 
> BR,
> Jani.
> 
> 
> 
> >  		return;
> >  
> >  	i915_audio_component_get_power(kdev);
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Jani Nikula]

On Sun, 08 Apr 2018, Gaurav K Singh <gaurav.k.singh@intel.com> wrote:
> On Geminilake, sometimes audio card is not getting
> detected after reboot. This is a spurious issue happening on
> Geminilake. HW codec and HD audio controller link was going
> out of sync for which there was a fix in i915 driver but
> was not getting invoked for GLK. Extending this fix to GLK as well.
>
> Tested by Du,Wenkai on GLK board.
>
> Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 656f6c931341..73b1e0b96f88 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>  	u32 tmp;
>  
> -	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
> +	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
> +						!IS_GEMINILAKE(dev_priv))

That could be written as

	if (!IS_GEN9_BC(dev_priv) && !IS_GEN9_LP(dev_priv))

which in turn could just be written as

	if (!IS_GEN9(dev_priv))

...but since GLK has gen 10 display, so I'm wondering if the same issue
will be present in gen 10 too, and whether this should just become

	if (INTEL_GEN(dev_priv) < 9)

BR,
Jani.



>  		return;
>  
>  	i915_audio_component_get_power(kdev);

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/audio: Fix audio detection issue on GLK

[Gaurav K Singh]

On Geminilake, sometimes audio card is not getting
detected after reboot. This is a spurious issue happening on
Geminilake. HW codec and HD audio controller link was going
out of sync for which there was a fix in i915 driver but
was not getting invoked for GLK. Extending this fix to GLK as well.

Tested by Du,Wenkai on GLK board.

Signed-off-by: Gaurav K Singh <gaurav.k.singh@intel.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 656f6c931341..73b1e0b96f88 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -729,7 +729,8 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	u32 tmp;
 
-	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv))
+	if (!IS_GEN9_BC(dev_priv) && !IS_BROXTON(dev_priv) &&
+						!IS_GEMINILAKE(dev_priv))
 		return;
 
 	i915_audio_component_get_power(kdev);
-- 
1.9.1

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