* [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
@ 2019-11-13 2:19 Lucas De Marchi
2019-11-13 2:19 ` [Intel-gfx] " Lucas De Marchi
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Lucas De Marchi @ 2019-11-13 2:19 UTC (permalink / raw)
To: intel-gfx
Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
says regarding HDMI to workaround broken VBTs, see commit
2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
gen12+ so they inherit the TGL behavior.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 7c0ca733bef8..e6da98729e1f 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
- if (port == PORT_A && is_dvi) {
+ if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
is_hdmi ? "/HDMI" : "");
is_dvi = false;
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index ed4a68fb351f..659a03b08849 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
intel_encoder->base.base.id, intel_encoder->base.name);
- if (WARN_ON(port == PORT_A))
+ if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
return;
if (WARN(intel_dig_port->max_lanes < 4,
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
@ 2019-11-13 2:19 ` Lucas De Marchi
2019-11-13 2:25 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Lucas De Marchi @ 2019-11-13 2:19 UTC (permalink / raw)
To: intel-gfx
Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
says regarding HDMI to workaround broken VBTs, see commit
2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
gen12+ so they inherit the TGL behavior.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 7c0ca733bef8..e6da98729e1f 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
- if (port == PORT_A && is_dvi) {
+ if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
is_hdmi ? "/HDMI" : "");
is_dvi = false;
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index ed4a68fb351f..659a03b08849 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
intel_encoder->base.base.id, intel_encoder->base.name);
- if (WARN_ON(port == PORT_A))
+ if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
return;
if (WARN(intel_dig_port->max_lanes < 4,
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
2019-11-13 2:19 ` [Intel-gfx] " Lucas De Marchi
@ 2019-11-13 2:25 ` Patchwork
2019-11-13 2:25 ` [Intel-gfx] " Patchwork
2019-11-13 2:50 ` ✗ Fi.CI.BAT: failure " Patchwork
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Patchwork @ 2019-11-13 2:25 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/tgl: allow DVI/HDMI on port A
URL : https://patchwork.freedesktop.org/series/69387/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
5569c16a4f30 drm/i915/tgl: allow DVI/HDMI on port A
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#6:
Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
-:8: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A")'
#8:
2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
total: 1 errors, 1 warnings, 0 checks, 16 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:25 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-11-13 2:25 ` Patchwork
0 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-11-13 2:25 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/tgl: allow DVI/HDMI on port A
URL : https://patchwork.freedesktop.org/series/69387/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
5569c16a4f30 drm/i915/tgl: allow DVI/HDMI on port A
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#6:
Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
-:8: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A")'
#8:
2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
total: 1 errors, 1 warnings, 0 checks, 16 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
2019-11-13 2:19 ` [Intel-gfx] " Lucas De Marchi
2019-11-13 2:25 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-11-13 2:50 ` Patchwork
2019-11-13 2:50 ` [Intel-gfx] " Patchwork
2019-11-13 16:23 ` [PATCH] " Matt Roper
2019-11-14 12:43 ` Jani Nikula
4 siblings, 1 reply; 12+ messages in thread
From: Patchwork @ 2019-11-13 2:50 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/tgl: allow DVI/HDMI on port A
URL : https://patchwork.freedesktop.org/series/69387/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7324 -> Patchwork_15247
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15247 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15247, 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_15247/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15247:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-hsw-peppy/igt@i915_selftest@live_blt.html
Known issues
------------
Here are the changes found in Patchwork_15247 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-7500u: [DMESG-WARN][3] ([fdo#107139]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
* igt@kms_busy@basic-flip-pipe-a:
- fi-icl-u2: [INCOMPLETE][5] ([fdo#107713]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#110343]: https://bugs.freedesktop.org/show_bug.cgi?id=110343
Participating hosts (51 -> 46)
------------------------------
Additional (1): fi-skl-6770hq
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7324 -> Patchwork_15247
CI-20190529: 20190529
CI_DRM_7324: dd07789205270dd69eca30ef7d123b5d2322d7a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5274: 1345346c97c630563aae08cc2f1276c70b90378d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15247: 5569c16a4f300e07ec55ed4327423b2cdb4265f3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5569c16a4f30 drm/i915/tgl: allow DVI/HDMI on port A
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:50 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-11-13 2:50 ` Patchwork
0 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-11-13 2:50 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/tgl: allow DVI/HDMI on port A
URL : https://patchwork.freedesktop.org/series/69387/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7324 -> Patchwork_15247
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15247 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15247, 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_15247/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15247:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-hsw-peppy/igt@i915_selftest@live_blt.html
Known issues
------------
Here are the changes found in Patchwork_15247 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-7500u: [DMESG-WARN][3] ([fdo#107139]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
* igt@kms_busy@basic-flip-pipe-a:
- fi-icl-u2: [INCOMPLETE][5] ([fdo#107713]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7324/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#110343]: https://bugs.freedesktop.org/show_bug.cgi?id=110343
Participating hosts (51 -> 46)
------------------------------
Additional (1): fi-skl-6770hq
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7324 -> Patchwork_15247
CI-20190529: 20190529
CI_DRM_7324: dd07789205270dd69eca30ef7d123b5d2322d7a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5274: 1345346c97c630563aae08cc2f1276c70b90378d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15247: 5569c16a4f300e07ec55ed4327423b2cdb4265f3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5569c16a4f30 drm/i915/tgl: allow DVI/HDMI on port A
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15247/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
` (2 preceding siblings ...)
2019-11-13 2:50 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-11-13 16:23 ` Matt Roper
2019-11-13 16:23 ` [Intel-gfx] " Matt Roper
2019-11-14 12:43 ` Jani Nikula
4 siblings, 1 reply; 12+ messages in thread
From: Matt Roper @ 2019-11-13 16:23 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
On Tue, Nov 12, 2019 at 06:19:35PM -0800, Lucas De Marchi wrote:
> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
> says regarding HDMI to workaround broken VBTs, see commit
> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
> gen12+ so they inherit the TGL behavior.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 7c0ca733bef8..e6da98729e1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>
> - if (port == PORT_A && is_dvi) {
> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
> is_hdmi ? "/HDMI" : "");
> is_dvi = false;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index ed4a68fb351f..659a03b08849 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
> intel_encoder->base.base.id, intel_encoder->base.name);
>
> - if (WARN_ON(port == PORT_A))
> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
> return;
>
> if (WARN(intel_dig_port->max_lanes < 4,
> --
> 2.24.0
>
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 16:23 ` [PATCH] " Matt Roper
@ 2019-11-13 16:23 ` Matt Roper
0 siblings, 0 replies; 12+ messages in thread
From: Matt Roper @ 2019-11-13 16:23 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
On Tue, Nov 12, 2019 at 06:19:35PM -0800, Lucas De Marchi wrote:
> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
> says regarding HDMI to workaround broken VBTs, see commit
> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
> gen12+ so they inherit the TGL behavior.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 7c0ca733bef8..e6da98729e1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>
> - if (port == PORT_A && is_dvi) {
> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
> is_hdmi ? "/HDMI" : "");
> is_dvi = false;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index ed4a68fb351f..659a03b08849 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
> intel_encoder->base.base.id, intel_encoder->base.name);
>
> - if (WARN_ON(port == PORT_A))
> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
> return;
>
> if (WARN(intel_dig_port->max_lanes < 4,
> --
> 2.24.0
>
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
` (3 preceding siblings ...)
2019-11-13 16:23 ` [PATCH] " Matt Roper
@ 2019-11-14 12:43 ` Jani Nikula
2019-11-14 12:43 ` [Intel-gfx] " Jani Nikula
2019-11-14 17:31 ` Lucas De Marchi
4 siblings, 2 replies; 12+ messages in thread
From: Jani Nikula @ 2019-11-14 12:43 UTC (permalink / raw)
To: Lucas De Marchi, intel-gfx
On Tue, 12 Nov 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
> says regarding HDMI to workaround broken VBTs, see commit
> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
> gen12+ so they inherit the TGL behavior.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Do *NOT* merge patches without full IGT results. BAT is *NOT* enough,
and this did not even pass BAT.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 7c0ca733bef8..e6da98729e1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>
> - if (port == PORT_A && is_dvi) {
> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
> is_hdmi ? "/HDMI" : "");
> is_dvi = false;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index ed4a68fb351f..659a03b08849 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
> intel_encoder->base.base.id, intel_encoder->base.name);
>
> - if (WARN_ON(port == PORT_A))
> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
> return;
>
> if (WARN(intel_dig_port->max_lanes < 4,
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-14 12:43 ` Jani Nikula
@ 2019-11-14 12:43 ` Jani Nikula
2019-11-14 17:31 ` Lucas De Marchi
1 sibling, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2019-11-14 12:43 UTC (permalink / raw)
To: Lucas De Marchi, intel-gfx
On Tue, 12 Nov 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
> says regarding HDMI to workaround broken VBTs, see commit
> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
> gen12+ so they inherit the TGL behavior.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Do *NOT* merge patches without full IGT results. BAT is *NOT* enough,
and this did not even pass BAT.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 7c0ca733bef8..e6da98729e1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>
> - if (port == PORT_A && is_dvi) {
> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
> is_hdmi ? "/HDMI" : "");
> is_dvi = false;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index ed4a68fb351f..659a03b08849 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
> intel_encoder->base.base.id, intel_encoder->base.name);
>
> - if (WARN_ON(port == PORT_A))
> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
> return;
>
> if (WARN(intel_dig_port->max_lanes < 4,
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-14 12:43 ` Jani Nikula
2019-11-14 12:43 ` [Intel-gfx] " Jani Nikula
@ 2019-11-14 17:31 ` Lucas De Marchi
2019-11-14 17:31 ` [Intel-gfx] " Lucas De Marchi
1 sibling, 1 reply; 12+ messages in thread
From: Lucas De Marchi @ 2019-11-14 17:31 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, Nov 14, 2019 at 02:43:17PM +0200, Jani Nikula wrote:
>On Tue, 12 Nov 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
>> says regarding HDMI to workaround broken VBTs, see commit
>> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
>> gen12+ so they inherit the TGL behavior.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
>Do *NOT* merge patches without full IGT results. BAT is *NOT* enough,
>and this did not even pass BAT.
same as on other patch, I should have waited. I did look to the BAT
results though and it could not be related. The only gen12 machine is
currently disabled in CI and even when enabled it doesn't provide a
success/result feedback so we have to look to the tests themselves.
This is no excuse not to wait though, agreed. I will be more careful
next times.
Lucas De Marchi
>
>BR,
>Jani.
>
>
>> ---
>> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> index 7c0ca733bef8..e6da98729e1f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
>> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
>> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
>> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>>
>> - if (port == PORT_A && is_dvi) {
>> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
>> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
>> is_hdmi ? "/HDMI" : "");
>> is_dvi = false;
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> index ed4a68fb351f..659a03b08849 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
>> intel_encoder->base.base.id, intel_encoder->base.name);
>>
>> - if (WARN_ON(port == PORT_A))
>> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
>> return;
>>
>> if (WARN(intel_dig_port->max_lanes < 4,
>
>--
>Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/tgl: allow DVI/HDMI on port A
2019-11-14 17:31 ` Lucas De Marchi
@ 2019-11-14 17:31 ` Lucas De Marchi
0 siblings, 0 replies; 12+ messages in thread
From: Lucas De Marchi @ 2019-11-14 17:31 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, Nov 14, 2019 at 02:43:17PM +0200, Jani Nikula wrote:
>On Tue, 12 Nov 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> Tiger Lake supports HDMI on port A. For other platforms we ignore what the VBT
>> says regarding HDMI to workaround broken VBTs, see commit
>> 2ba7d7e04371 ("drm/i915/bios: ignore HDMI on port A"). Make this apply
>> gen12+ so they inherit the TGL behavior.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
>Do *NOT* merge patches without full IGT results. BAT is *NOT* enough,
>and this did not even pass BAT.
same as on other patch, I should have waited. I did look to the BAT
results though and it could not be related. The only gen12 machine is
currently disabled in CI and even when enabled it doesn't provide a
success/result feedback so we have to look to the tests themselves.
This is no excuse not to wait though, agreed. I will be more careful
next times.
Lucas De Marchi
>
>BR,
>Jani.
>
>
>> ---
>> drivers/gpu/drm/i915/display/intel_bios.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> index 7c0ca733bef8..e6da98729e1f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
>> @@ -1450,7 +1450,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
>> is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
>> is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>>
>> - if (port == PORT_A && is_dvi) {
>> + if (port == PORT_A && is_dvi && INTEL_GEN(dev_priv) < 12) {
>> DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
>> is_hdmi ? "/HDMI" : "");
>> is_dvi = false;
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> index ed4a68fb351f..659a03b08849 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> @@ -3140,7 +3140,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>> DRM_DEBUG_KMS("Adding HDMI connector on [ENCODER:%d:%s]\n",
>> intel_encoder->base.base.id, intel_encoder->base.name);
>>
>> - if (WARN_ON(port == PORT_A))
>> + if (INTEL_GEN(dev_priv) < 12 && WARN_ON(port == PORT_A))
>> return;
>>
>> if (WARN(intel_dig_port->max_lanes < 4,
>
>--
>Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-11-14 17:32 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-13 2:19 [PATCH] drm/i915/tgl: allow DVI/HDMI on port A Lucas De Marchi
2019-11-13 2:19 ` [Intel-gfx] " Lucas De Marchi
2019-11-13 2:25 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-11-13 2:25 ` [Intel-gfx] " Patchwork
2019-11-13 2:50 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-11-13 2:50 ` [Intel-gfx] " Patchwork
2019-11-13 16:23 ` [PATCH] " Matt Roper
2019-11-13 16:23 ` [Intel-gfx] " Matt Roper
2019-11-14 12:43 ` Jani Nikula
2019-11-14 12:43 ` [Intel-gfx] " Jani Nikula
2019-11-14 17:31 ` Lucas De Marchi
2019-11-14 17:31 ` [Intel-gfx] " Lucas De Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).