[PATCH] drm/i915: Refine the has_audio assignment

[PATCH] drm/i915: Refine the has_audio assignment

[Yang]

From: Yang Shi <yang.a.shi@intel.com>

Refine the has_audio assignment for dp and hdmi.

Signed-off-by: Yang Shi <yang.a.shi@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c   | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a29868c..47aa2ea 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1644,7 +1644,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 	else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
 		pipe_config->has_audio = intel_dp->has_audio;
 	else
-		pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
+		pipe_config->has_audio = false;
 
 	if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
 		struct drm_display_mode *panel_mode =
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 179d0ad..3c4b92e 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1474,8 +1474,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
 		if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
 			pipe_config->has_audio = intel_hdmi->has_audio;
 		else
-			pipe_config->has_audio =
-				intel_conn_state->force_audio == HDMI_AUDIO_ON;
+			pipe_config->has_audio = false;
 	}
 
 	/*
-- 
2.7.4

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

✓ Fi.CI.BAT: success for drm/i915: Refine the has_audio assignment

[Patchwork]

== Series Details ==

Series: drm/i915: Refine the has_audio assignment
URL   : https://patchwork.freedesktop.org/series/41650/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4050 -> Patchwork_8684 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/41650/revisions/1/mbox/

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_ctx_switch@basic-default:
      fi-cnl-y3:          PASS -> INCOMPLETE (fdo#105086)

    
    ==== Possible fixes ====

    igt@gem_exec_suspend@basic-s4-devices:
      fi-kbl-7500u:       DMESG-WARN (fdo#105128) -> PASS

    
  fdo#105086 https://bugs.freedesktop.org/show_bug.cgi?id=105086
  fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128


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

  Missing    (2): fi-ilk-m540 fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4050 -> Patchwork_8684

  CI_DRM_4050: dc857e9d853d2bd074adaf49c49deb473328ea72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4428: aa330c72a74c071eddb35300e4dd1957eb8d30ff @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8684: 8a6ced3b5f509a8156fddac5afda1ea029045ac0 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4428: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit


== Linux commits ==

8a6ced3b5f50 drm/i915: Refine the has_audio assignment

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8684/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: Refine the has_audio assignment

[Patchwork]

== Series Details ==

Series: drm/i915: Refine the has_audio assignment
URL   : https://patchwork.freedesktop.org/series/41650/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4050_full -> Patchwork_8684_full =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_8684_full need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8684_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/41650/revisions/1/mbox/

== Possible new issues ==

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

  === IGT changes ===

    ==== Warnings ====

    igt@gem_mocs_settings@mocs-rc6-blt:
      shard-kbl:          SKIP -> PASS +1

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#100368)

    
    ==== Possible fixes ====

    igt@kms_flip@2x-plain-flip-ts-check:
      shard-hsw:          FAIL (fdo#100368) -> PASS

    igt@kms_flip@dpms-vs-vblank-race-interruptible:
      shard-hsw:          DMESG-WARN (fdo#102614) -> PASS

    igt@kms_sysfs_edid_timing:
      shard-apl:          WARN (fdo#100047) -> PASS

    igt@pm_rps@reset:
      shard-apl:          FAIL (fdo#102250) -> PASS

    
  fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#102250 https://bugs.freedesktop.org/show_bug.cgi?id=102250
  fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614


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

  Missing    (2): shard-glk shard-glkb 


== Build changes ==

    * Linux: CI_DRM_4050 -> Patchwork_8684

  CI_DRM_4050: dc857e9d853d2bd074adaf49c49deb473328ea72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4428: aa330c72a74c071eddb35300e4dd1957eb8d30ff @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8684: 8a6ced3b5f509a8156fddac5afda1ea029045ac0 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4428: 93b35926a150e318439d2505901288594b3548f5 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

Re: [PATCH] drm/i915: Refine the has_audio assignment

[Chris Wilson]

Quoting Yang (2018-04-13 05:06:45)
> From: Yang Shi <yang.a.shi@intel.com>
> 
> Refine the has_audio assignment for dp and hdmi.

s/Refine/Ignore the user override for/

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

Re: [PATCH] drm/i915: Refine the has_audio assignment

[Jani Nikula]

On Fri, 13 Apr 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Yang (2018-04-13 05:06:45)
>> From: Yang Shi <yang.a.shi@intel.com>
>> 
>> Refine the has_audio assignment for dp and hdmi.
>
> s/Refine/Ignore the user override for/
>
> Why?

Yang, we'll need the explanation before we continue with review or even
consider merging. We routinely ignore patches where questions go
unanswered.

BR,
Jani.


-- 
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: Refine the has_audio assignment

[Shi, Yang A]

>-----Original Message-----
>From: Jani Nikula [mailto:jani.nikula@linux.intel.com]
>Sent: Wednesday, April 18, 2018 8:44 PM
>To: Chris Wilson <chris@chris-wilson.co.uk>; Shi, Yang A <yang.a.shi@intel.com>;
>intel-gfx@lists.freedesktop.org
>Cc: Shi, Yang A <yang.a.shi@intel.com>
>Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refine the has_audio assignment
>
>On Fri, 13 Apr 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> Quoting Yang (2018-04-13 05:06:45)
>>> From: Yang Shi <yang.a.shi@intel.com>
>>>
>>> Refine the has_audio assignment for dp and hdmi.
>>
>> s/Refine/Ignore the user override for/
>>
>> Why?
>
>Yang, we'll need the explanation before we continue with review or even consider
>merging. We routinely ignore patches where questions go unanswered.
>
>BR,
>Jani.

This code change is just to make driver code more readable.
If(condition) value = a  else value = condition looks redundancy.

BR.
Yang.

>
>
>--
>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: Refine the has_audio assignment

[Chris Wilson]

Quoting Shi, Yang A (2018-04-19 02:22:33)
> >-----Original Message-----
> >From: Jani Nikula [mailto:jani.nikula@linux.intel.com]
> >Sent: Wednesday, April 18, 2018 8:44 PM
> >To: Chris Wilson <chris@chris-wilson.co.uk>; Shi, Yang A <yang.a.shi@intel.com>;
> >intel-gfx@lists.freedesktop.org
> >Cc: Shi, Yang A <yang.a.shi@intel.com>
> >Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refine the has_audio assignment
> >
> >On Fri, 13 Apr 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> >> Quoting Yang (2018-04-13 05:06:45)
> >>> From: Yang Shi <yang.a.shi@intel.com>
> >>>
> >>> Refine the has_audio assignment for dp and hdmi.
> >>
> >> s/Refine/Ignore the user override for/
> >>
> >> Why?
> >
> >Yang, we'll need the explanation before we continue with review or even consider
> >merging. We routinely ignore patches where questions go unanswered.
> >
> >BR,
> >Jani.
> 
> This code change is just to make driver code more readable.
> If(condition) value = a  else value = condition looks redundancy.

Read the patch again, AUTO != ON.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Refine the has_audio assignment

[Shi, Yang A]

>-----Original Message-----
>From: Chris Wilson [mailto:chris@chris-wilson.co.uk]
>Sent: Thursday, April 19, 2018 2:13 PM
>To: Shi, Yang A <yang.a.shi@intel.com>; Jani Nikula <jani.nikula@linux.intel.com>;
>intel-gfx@lists.freedesktop.org
>Subject: RE: [Intel-gfx] [PATCH] drm/i915: Refine the has_audio assignment
>
>Quoting Shi, Yang A (2018-04-19 02:22:33)
>> >-----Original Message-----
>> >From: Jani Nikula [mailto:jani.nikula@linux.intel.com]
>> >Sent: Wednesday, April 18, 2018 8:44 PM
>> >To: Chris Wilson <chris@chris-wilson.co.uk>; Shi, Yang A
>> ><yang.a.shi@intel.com>; intel-gfx@lists.freedesktop.org
>> >Cc: Shi, Yang A <yang.a.shi@intel.com>
>> >Subject: Re: [Intel-gfx] [PATCH] drm/i915: Refine the has_audio
>> >assignment
>> >
>> >On Fri, 13 Apr 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> >> Quoting Yang (2018-04-13 05:06:45)
>> >>> From: Yang Shi <yang.a.shi@intel.com>
>> >>>
>> >>> Refine the has_audio assignment for dp and hdmi.
>> >>
>> >> s/Refine/Ignore the user override for/
>> >>
>> >> Why?
>> >
>> >Yang, we'll need the explanation before we continue with review or
>> >even consider merging. We routinely ignore patches where questions go unanswered.
>> >
>> >BR,
>> >Jani.
>>
>> This code change is just to make driver code more readable.
>> If(condition) value = a  else value = condition looks redundancy.
>
>Read the patch again, AUTO != ON.
>-Chris

Yes, I make a mistake and misunderstand such code.

BR.
Yang.

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