diff mbox series

[v4] drm/i915/hdmi: SPD infoframe update for discrete

Message ID 20221129203343.720860-1-clinton.a.taylor@intel.com (mailing list archive)
State New, archived
Headers show
Series [v4] drm/i915/hdmi: SPD infoframe update for discrete | expand

Commit Message

Clint Taylor Nov. 29, 2022, 8:33 p.m. UTC 
Replace integrated with discrete for dgfx platforms.

v2: commit title reword (Jani)
v3: use variable name i915 (Jani)
v4: commit message reword (MattR)
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Taylor, Clinton A <clinton.a.taylor@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdmi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Matt Roper Nov. 30, 2022, 5:43 p.m. UTC | #1 
On Tue, Nov 29, 2022 at 10:05:18PM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/hdmi: SPD infoframe update for discrete
> URL   : https://patchwork.freedesktop.org/series/111450/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_12446 -> Patchwork_111450v1
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_111450v1 absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_111450v1, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/index.html
> 
> Participating hosts (35 -> 37)
> ------------------------------
> 
>   Additional (3): bat-atsm-1 fi-tgl-dsi bat-dg1-5 
>   Missing    (1): fi-rkl-11600 
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_111450v1:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@i915_suspend@basic-s3-without-i915:
>     - fi-skl-6600u:       [PASS][1] -> [INCOMPLETE][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12446/fi-skl-6600u/igt@i915_suspend@basic-s3-without-i915.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-skl-6600u/igt@i915_suspend@basic-s3-without-i915.html

Appears to be the same as
https://gitlab.freedesktop.org/drm/intel/-/issues/7614 , just on a
different platform.  Not related to this patch.

This v4 patch is functionally identical to v2 where BAT passed and
full-CI's only failure was also a false positive, so applied to
drm-intel-next.  Thanks for the patch.


Matt

> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * igt@gem_exec_suspend@basic-s0@smem:
>     - {bat-atsm-1}:       NOTRUN -> [INCOMPLETE][3]
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-atsm-1/igt@gem_exec_suspend@basic-s0@smem.html
> 
>   * igt@i915_selftest@live@gt_engines:
>     - {fi-tgl-dsi}:       NOTRUN -> [DMESG-WARN][4]
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-tgl-dsi/igt@i915_selftest@live@gt_engines.html
> 
>   * igt@i915_selftest@live@gt_lrc:
>     - {fi-tgl-dsi}:       NOTRUN -> [INCOMPLETE][5]
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-tgl-dsi/igt@i915_selftest@live@gt_lrc.html
> 
>   * igt@i915_suspend@basic-s3-without-i915:
>     - {bat-atsm-1}:       NOTRUN -> [SKIP][6]
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_111450v1 that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_lmem_swapping@basic:
>     - fi-apl-guc:         NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#4613]) +3 similar issues
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-apl-guc/igt@gem_lmem_swapping@basic.html
> 
>   * igt@gem_mmap@basic:
>     - bat-dg1-5:          NOTRUN -> [SKIP][8] ([i915#4083])
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@gem_mmap@basic.html
> 
>   * igt@gem_tiled_fence_blits@basic:
>     - bat-dg1-5:          NOTRUN -> [SKIP][9] ([i915#4077]) +2 similar issues
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@gem_tiled_fence_blits@basic.html
> 
>   * igt@gem_tiled_pread_basic:
>     - bat-dg1-5:          NOTRUN -> [SKIP][10] ([i915#4079]) +1 similar issue
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@gem_tiled_pread_basic.html
> 
>   * igt@i915_pm_backlight@basic-brightness:
>     - bat-dg1-5:          NOTRUN -> [SKIP][11] ([i915#7561])
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@i915_pm_backlight@basic-brightness.html
> 
>   * igt@i915_pm_rps@basic-api:
>     - bat-dg1-5:          NOTRUN -> [SKIP][12] ([i915#6621])
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@i915_pm_rps@basic-api.html
> 
>   * igt@i915_selftest@live@gt_heartbeat:
>     - fi-apl-guc:         NOTRUN -> [DMESG-FAIL][13] ([i915#5334])
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
> 
>   * igt@kms_addfb_basic@basic-x-tiled-legacy:
>     - bat-dg1-5:          NOTRUN -> [SKIP][14] ([i915#4212]) +7 similar issues
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_addfb_basic@basic-x-tiled-legacy.html
> 
>   * igt@kms_addfb_basic@basic-y-tiled-legacy:
>     - bat-dg1-5:          NOTRUN -> [SKIP][15] ([i915#4215])
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_addfb_basic@basic-y-tiled-legacy.html
> 
>   * igt@kms_chamelium@hdmi-crc-fast:
>     - fi-apl-guc:         NOTRUN -> [SKIP][16] ([fdo#109271] / [fdo#111827]) +8 similar issues
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-apl-guc/igt@kms_chamelium@hdmi-crc-fast.html
> 
>   * igt@kms_chamelium@hdmi-hpd-fast:
>     - bat-dg1-5:          NOTRUN -> [SKIP][17] ([fdo#111827]) +8 similar issues
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_chamelium@hdmi-hpd-fast.html
> 
>   * igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
>     - bat-dg1-5:          NOTRUN -> [SKIP][18] ([i915#4103] / [i915#4213])
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
> 
>   * igt@kms_force_connector_basic@force-connector-state:
>     - fi-apl-guc:         NOTRUN -> [SKIP][19] ([fdo#109271]) +11 similar issues
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-apl-guc/igt@kms_force_connector_basic@force-connector-state.html
> 
>   * igt@kms_force_connector_basic@force-load-detect:
>     - bat-dg1-5:          NOTRUN -> [SKIP][20] ([fdo#109285])
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_force_connector_basic@force-load-detect.html
> 
>   * igt@kms_psr@sprite_plane_onoff:
>     - bat-dg1-5:          NOTRUN -> [SKIP][21] ([i915#1072] / [i915#4078]) +3 similar issues
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_psr@sprite_plane_onoff.html
> 
>   * igt@kms_setmode@basic-clone-single-crtc:
>     - bat-dg1-5:          NOTRUN -> [SKIP][22] ([i915#3555])
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html
> 
>   * igt@prime_vgem@basic-fence-read:
>     - bat-dg1-5:          NOTRUN -> [SKIP][23] ([i915#3708]) +3 similar issues
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@prime_vgem@basic-fence-read.html
> 
>   * igt@prime_vgem@basic-gtt:
>     - bat-dg1-5:          NOTRUN -> [SKIP][24] ([i915#3708] / [i915#4077]) +1 similar issue
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@prime_vgem@basic-gtt.html
> 
>   * igt@prime_vgem@basic-userptr:
>     - bat-dg1-5:          NOTRUN -> [SKIP][25] ([i915#3708] / [i915#4873])
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-5/igt@prime_vgem@basic-userptr.html
> 
>   * igt@runner@aborted:
>     - fi-skl-6600u:       NOTRUN -> [FAIL][26] ([i915#4312])
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-skl-6600u/igt@runner@aborted.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@fbdev@read:
>     - {bat-rpls-2}:       [SKIP][27] ([i915#2582]) -> [PASS][28] +4 similar issues
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12446/bat-rpls-2/igt@fbdev@read.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-rpls-2/igt@fbdev@read.html
> 
>   * igt@gem_exec_gttfill@basic:
>     - fi-pnv-d510:        [FAIL][29] ([i915#7229]) -> [PASS][30]
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12446/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
> 
>   * igt@i915_module_load@reload:
>     - {bat-rpls-2}:       [DMESG-WARN][31] ([i915#6434]) -> [PASS][32]
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12446/bat-rpls-2/igt@i915_module_load@reload.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-rpls-2/igt@i915_module_load@reload.html
> 
>   * igt@i915_selftest@live@hangcheck:
>     - {bat-dg1-7}:        [INCOMPLETE][33] ([i915#4983]) -> [PASS][34]
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12446/bat-dg1-7/igt@i915_selftest@live@hangcheck.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/bat-dg1-7/igt@i915_selftest@live@hangcheck.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
>   [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
>   [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
>   [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
>   [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
>   [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
>   [i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
>   [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
>   [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
>   [i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
>   [i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
>   [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
>   [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
>   [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
>   [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
>   [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
>   [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
>   [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
>   [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
>   [i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
>   [i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
>   [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
>   [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
>   [i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
>   [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
>   [i915#5278]: https://gitlab.freedesktop.org/drm/intel/issues/5278
>   [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
>   [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
>   [i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
>   [i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
>   [i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
>   [i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
>   [i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
>   [i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
>   [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
>   [i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
>   [i915#7348]: https://gitlab.freedesktop.org/drm/intel/issues/7348
>   [i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
>   [i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
>   [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
> 
> 
> Build changes
> -------------
> 
>   * Linux: CI_DRM_12446 -> Patchwork_111450v1
> 
>   CI-20190529: 20190529
>   CI_DRM_12446: b1f6dee65cda65d43d4774f35292b0beea28f192 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_7075: ae0ad0ffa147445cdf9d33c96a018f5a8b21a5ee @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
>   Patchwork_111450v1: b1f6dee65cda65d43d4774f35292b0beea28f192 @ git://anongit.freedesktop.org/gfx-ci/linux
> 
> 
> ### Linux commits
> 
> e0938674a397 drm/i915/hdmi: SPD infoframe update for discrete
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111450v1/index.html
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index bac85d88054f..e82f8a07e2b0 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -767,6 +767,7 @@  intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
 				 struct intel_crtc_state *crtc_state,
 				 struct drm_connector_state *conn_state)
 {
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
 	struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
 	int ret;
 
@@ -776,7 +777,11 @@  intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
 	crtc_state->infoframes.enable |=
 		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
 
-	ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
+	if (IS_DGFX(i915))
+		ret = hdmi_spd_infoframe_init(frame, "Intel", "Discrete gfx");
+	else
+		ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
+
 	if (drm_WARN_ON(encoder->base.dev, ret))
 		return false;