* [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
@ 2018-04-11 13:15 Jani Nikula
2018-04-11 13:15 ` [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port() Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jani Nikula @ 2018-04-11 13:15 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Chris Wilson, stable, Fei Li
The VBT contains the DDC pin to use for specific ports. Alas, sometimes
the field appears to contain bogus data, and while we check for it later
on in intel_gmbus_get_adapter() we fail to check the returned NULL on
errors. Oops results.
The simplest approach seems to be to catch and ignore the bogus DDC pins
already at the VBT parsing phase, reverting to fixed per port default
pins. This doesn't guarantee display working, but at least it prevents
the oops. And we continue to be fuzzed by VBT.
One affected machine is Dell Latitude 5590 where a BIOS upgrade added
invalid DDC pins.
Typical backtrace:
[ 35.461411] WARN_ON(!intel_gmbus_is_valid_pin(dev_priv, pin))
[ 35.461432] WARNING: CPU: 6 PID: 411 at drivers/gpu/drm/i915/intel_i2c.c:844 intel_gmbus_get_adapter+0x32/0x37 [i915]
[ 35.461437] Modules linked in: i915 ahci libahci dm_snapshot dm_bufio dm_raid raid456 async_raid6_recov async_pq raid6_pq async_xor xor async_memcpy async_tx
[ 35.461445] CPU: 6 PID: 411 Comm: kworker/u16:2 Not tainted 4.16.0-rc7.x64-g1cda370ffded #1
[ 35.461447] Hardware name: Dell Inc. Latitude 5590/0MM81M, BIOS 1.1.9 03/13/2018
[ 35.461450] Workqueue: events_unbound async_run_entry_fn
[ 35.461465] RIP: 0010:intel_gmbus_get_adapter+0x32/0x37 [i915]
[ 35.461467] RSP: 0018:ffff9b4e43d47c40 EFLAGS: 00010286
[ 35.461469] RAX: 0000000000000000 RBX: ffff98f90639f800 RCX: ffffffffae051960
[ 35.461471] RDX: 0000000000000001 RSI: 0000000000000092 RDI: 0000000000000246
[ 35.461472] RBP: ffff98f905410000 R08: 0000004d062a83f6 R09: 00000000000003bd
[ 35.461474] R10: 0000000000000031 R11: ffffffffad4eda58 R12: ffff98f905410000
[ 35.461475] R13: ffff98f9064c1000 R14: ffff9b4e43d47cf0 R15: ffff98f905410000
[ 35.461477] FS: 0000000000000000(0000) GS:ffff98f92e580000(0000) knlGS:0000000000000000
[ 35.461479] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 35.461481] CR2: 00007f5682359008 CR3: 00000001b700c005 CR4: 00000000003606e0
[ 35.461483] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 35.461484] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 35.461486] Call Trace:
[ 35.461501] intel_hdmi_set_edid+0x37/0x27f [i915]
[ 35.461515] intel_hdmi_detect+0x7c/0x97 [i915]
[ 35.461518] drm_helper_probe_single_connector_modes+0xe1/0x6c0
[ 35.461521] drm_setup_crtcs+0x129/0xa6a
[ 35.461523] ? __switch_to_asm+0x34/0x70
[ 35.461525] ? __switch_to_asm+0x34/0x70
[ 35.461527] ? __switch_to_asm+0x40/0x70
[ 35.461528] ? __switch_to_asm+0x34/0x70
[ 35.461529] ? __switch_to_asm+0x40/0x70
[ 35.461531] ? __switch_to_asm+0x34/0x70
[ 35.461532] ? __switch_to_asm+0x40/0x70
[ 35.461534] ? __switch_to_asm+0x34/0x70
[ 35.461536] __drm_fb_helper_initial_config_and_unlock+0x34/0x46f
[ 35.461538] ? __switch_to_asm+0x40/0x70
[ 35.461541] ? _cond_resched+0x10/0x33
[ 35.461557] intel_fbdev_initial_config+0xf/0x1c [i915]
[ 35.461560] async_run_entry_fn+0x2e/0xf5
[ 35.461563] process_one_work+0x15b/0x364
[ 35.461565] worker_thread+0x2c/0x3a0
[ 35.461567] ? process_one_work+0x364/0x364
[ 35.461568] kthread+0x10c/0x122
[ 35.461570] ? _kthread_create_on_node+0x5d/0x5d
[ 35.461572] ret_from_fork+0x35/0x40
[ 35.461574] Code: 74 16 89 f6 48 8d 04 b6 48 c1 e0 05 48 29 f0 48 8d 84 c7 e8 11 00 00 c3 48 c7 c6 b0 19 1e c0 48 c7 c7 64 8a 1c c0 e8 47 88 ed ec <0f> 0b 31 c0 c3 8b 87 a4 04 00 00 80 e4 fc 09 c6 89 b7 a4 04 00
[ 35.461604] WARNING: CPU: 6 PID: 411 at drivers/gpu/drm/i915/intel_i2c.c:844 intel_gmbus_get_adapter+0x32/0x37 [i915]
[ 35.461606] ---[ end trace 4fe1e63e2dd93373 ]---
[ 35.461609] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
[ 35.461613] IP: i2c_transfer+0x4/0x86
[ 35.461614] PGD 0 P4D 0
[ 35.461616] Oops: 0000 [#1] SMP PTI
[ 35.461618] Modules linked in: i915 ahci libahci dm_snapshot dm_bufio dm_raid raid456 async_raid6_recov async_pq raid6_pq async_xor xor async_memcpy async_tx
[ 35.461624] CPU: 6 PID: 411 Comm: kworker/u16:2 Tainted: G W 4.16.0-rc7.x64-g1cda370ffded #1
[ 35.461625] Hardware name: Dell Inc. Latitude 5590/0MM81M, BIOS 1.1.9 03/13/2018
[ 35.461628] Workqueue: events_unbound async_run_entry_fn
[ 35.461630] RIP: 0010:i2c_transfer+0x4/0x86
[ 35.461631] RSP: 0018:ffff9b4e43d47b30 EFLAGS: 00010246
[ 35.461633] RAX: ffff9b4e43d47b6e RBX: 0000000000000005 RCX: 0000000000000001
[ 35.461635] RDX: 0000000000000002 RSI: ffff9b4e43d47b80 RDI: 0000000000000000
[ 35.461636] RBP: ffff9b4e43d47bd8 R08: 0000004d062a83f6 R09: 00000000000003bd
[ 35.461638] R10: 0000000000000031 R11: ffffffffad4eda58 R12: 0000000000000002
[ 35.461639] R13: 0000000000000001 R14: ffff9b4e43d47b6f R15: ffff9b4e43d47c07
[ 35.461641] FS: 0000000000000000(0000) GS:ffff98f92e580000(0000) knlGS:0000000000000000
[ 35.461643] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 35.461645] CR2: 0000000000000010 CR3: 00000001b700c005 CR4: 00000000003606e0
[ 35.461646] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 35.461647] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 35.461649] Call Trace:
[ 35.461652] drm_do_probe_ddc_edid+0xb3/0x128
[ 35.461654] drm_get_edid+0xe5/0x38d
[ 35.461669] intel_hdmi_set_edid+0x45/0x27f [i915]
[ 35.461684] intel_hdmi_detect+0x7c/0x97 [i915]
[ 35.461687] drm_helper_probe_single_connector_modes+0xe1/0x6c0
[ 35.461689] drm_setup_crtcs+0x129/0xa6a
[ 35.461691] ? __switch_to_asm+0x34/0x70
[ 35.461693] ? __switch_to_asm+0x34/0x70
[ 35.461694] ? __switch_to_asm+0x40/0x70
[ 35.461696] ? __switch_to_asm+0x34/0x70
[ 35.461697] ? __switch_to_asm+0x40/0x70
[ 35.461698] ? __switch_to_asm+0x34/0x70
[ 35.461700] ? __switch_to_asm+0x40/0x70
[ 35.461701] ? __switch_to_asm+0x34/0x70
[ 35.461703] __drm_fb_helper_initial_config_and_unlock+0x34/0x46f
[ 35.461705] ? __switch_to_asm+0x40/0x70
[ 35.461707] ? _cond_resched+0x10/0x33
[ 35.461724] intel_fbdev_initial_config+0xf/0x1c [i915]
[ 35.461727] async_run_entry_fn+0x2e/0xf5
[ 35.461729] process_one_work+0x15b/0x364
[ 35.461731] worker_thread+0x2c/0x3a0
[ 35.461733] ? process_one_work+0x364/0x364
[ 35.461734] kthread+0x10c/0x122
[ 35.461736] ? _kthread_create_on_node+0x5d/0x5d
[ 35.461738] ret_from_fork+0x35/0x40
[ 35.461739] Code: 5c fa e1 ad 48 89 df e8 ea fb ff ff e9 2a ff ff ff 0f 1f 44 00 00 31 c0 e9 43 fd ff ff 31 c0 45 31 e4 e9 c5 fd ff ff 41 54 55 53 <48> 8b 47 10 48 83 78 10 00 74 70 41 89 d4 48 89 f5 48 89 fb 65
[ 35.461756] RIP: i2c_transfer+0x4/0x86 RSP: ffff9b4e43d47b30
[ 35.461757] CR2: 0000000000000010
[ 35.461759] ---[ end trace 4fe1e63e2dd93374 ]---
Based on a patch by Fei Li.
v2: s/reverting/sticking/ (Chris)
Cc: stable@vger.kernel.org
Cc: Fei Li <fei.li@intel.com>
Co-developed-by: Fei Li <fei.li@intel.com>
Reported-by: Pavel Nakonechnyi <zorg1331@gmail.com>
Reported-and-tested-by: Seweryn Kokot <sewkokot@gmail.com>
Reported-and-tested-by: Laszlo Valko <valko@linux.karinthy.hu>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105549
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105961
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index c5c7530ba157..447b721c3be9 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1256,7 +1256,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
return;
aux_channel = child->aux_channel;
- ddc_pin = child->ddc_pin;
is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
@@ -1303,9 +1302,15 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
if (is_dvi) {
- info->alternate_ddc_pin = map_ddc_pin(dev_priv, ddc_pin);
-
- sanitize_ddc_pin(dev_priv, port);
+ ddc_pin = map_ddc_pin(dev_priv, child->ddc_pin);
+ if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) {
+ info->alternate_ddc_pin = ddc_pin;
+ sanitize_ddc_pin(dev_priv, port);
+ } else {
+ DRM_DEBUG_KMS("Port %c has invalid DDC pin %d, "
+ "sticking to defaults\n",
+ port_name(port), ddc_pin);
+ }
}
if (is_dp) {
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()
2018-04-11 13:15 [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Jani Nikula
@ 2018-04-11 13:15 ` Jani Nikula
2018-04-11 13:17 ` Chris Wilson
2018-04-11 14:28 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2018-04-11 13:15 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
No functional changes.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 447b721c3be9..036307af8419 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1215,10 +1215,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
{
struct child_device_config *it, *child = NULL;
struct ddi_vbt_port_info *info = &dev_priv->vbt.ddi_port_info[port];
- uint8_t hdmi_level_shift;
int i, j;
bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
- uint8_t aux_channel, ddc_pin;
/* Each DDI port can have more than one value on the "DVO Port" field,
* so look for all the possible values for each port.
*/
@@ -1255,8 +1253,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
if (!child)
return;
- aux_channel = child->aux_channel;
-
is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
@@ -1302,6 +1298,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
if (is_dvi) {
+ u8 ddc_pin;
+
ddc_pin = map_ddc_pin(dev_priv, child->ddc_pin);
if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) {
info->alternate_ddc_pin = ddc_pin;
@@ -1314,14 +1312,14 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
}
if (is_dp) {
- info->alternate_aux_channel = aux_channel;
+ info->alternate_aux_channel = child->aux_channel;
sanitize_aux_ch(dev_priv, port);
}
if (bdb_version >= 158) {
/* The VBT HDMI level shift values match the table we have. */
- hdmi_level_shift = child->hdmi_level_shifter_value;
+ u8 hdmi_level_shift = child->hdmi_level_shifter_value;
DRM_DEBUG_KMS("VBT HDMI level shift for port %c: %d\n",
port_name(port),
hdmi_level_shift);
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()
2018-04-11 13:15 ` [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port() Jani Nikula
@ 2018-04-11 13:17 ` Chris Wilson
2018-04-12 9:29 ` Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2018-04-11 13:17 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Quoting Jani Nikula (2018-04-11 14:15:19)
> No functional changes.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_bios.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 447b721c3be9..036307af8419 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1215,10 +1215,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
> {
> struct child_device_config *it, *child = NULL;
> struct ddi_vbt_port_info *info = &dev_priv->vbt.ddi_port_info[port];
> - uint8_t hdmi_level_shift;
> int i, j;
> bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
> - uint8_t aux_channel, ddc_pin;
> /* Each DDI port can have more than one value on the "DVO Port" field,
> * so look for all the possible values for each port.
> */
> @@ -1255,8 +1253,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
> if (!child)
> return;
>
> - aux_channel = child->aux_channel;
> -
> is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
> is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
> is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
> @@ -1302,6 +1298,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
> DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
>
> if (is_dvi) {
> + u8 ddc_pin;
> +
> ddc_pin = map_ddc_pin(dev_priv, child->ddc_pin);
> if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) {
> info->alternate_ddc_pin = ddc_pin;
> @@ -1314,14 +1312,14 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
> }
>
> if (is_dp) {
> - info->alternate_aux_channel = aux_channel;
> + info->alternate_aux_channel = child->aux_channel;
>
> sanitize_aux_ch(dev_priv, port);
> }
>
> if (bdb_version >= 158) {
> /* The VBT HDMI level shift values match the table we have. */
> - hdmi_level_shift = child->hdmi_level_shifter_value;
> + u8 hdmi_level_shift = child->hdmi_level_shifter_value;
checkpatch will ask for a \n,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
2018-04-11 13:15 [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Jani Nikula
2018-04-11 13:15 ` [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port() Jani Nikula
@ 2018-04-11 14:28 ` Patchwork
2018-04-11 14:44 ` ✓ Fi.CI.BAT: success " Patchwork
2018-04-11 18:12 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-04-11 14:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
URL : https://patchwork.freedesktop.org/series/41547/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c57f8a17744e drm/i915/bios: filter out invalid DDC pins from VBT child devices
-:124: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-developed-by:
#124:
Co-developed-by: Fei Li <fei.li@intel.com>
total: 0 errors, 1 warnings, 0 checks, 25 lines checked
91e50de23ce3 drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
2018-04-11 13:15 [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Jani Nikula
2018-04-11 13:15 ` [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port() Jani Nikula
2018-04-11 14:28 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Patchwork
@ 2018-04-11 14:44 ` Patchwork
2018-04-11 18:12 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-04-11 14:44 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
URL : https://patchwork.freedesktop.org/series/41547/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4046 -> Patchwork_8668 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8668/
== Known issues ==
Here are the changes found in Patchwork_8668 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-cfl-s3: INCOMPLETE (fdo#105641) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#105641 https://bugs.freedesktop.org/show_bug.cgi?id=105641
== Participating hosts (34 -> 32) ==
Missing (2): fi-ilk-m540 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4046 -> Patchwork_8668
CI_DRM_4046: d123888920ccd112851ade43a3bf1c25627c2316 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4422: a914075d55dd089095121906bf4c3e825a3cecf2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8668: 91e50de23ce3a255e5c8f1c3d5a783a1ca39954a @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4422: 45e115f293fd6acc0c9647cf2d3b76be78819ba5 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
91e50de23ce3 drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()
c57f8a17744e drm/i915/bios: filter out invalid DDC pins from VBT child devices
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8668/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
2018-04-11 13:15 [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Jani Nikula
` (2 preceding siblings ...)
2018-04-11 14:44 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-04-11 18:12 ` Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-04-11 18:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices
URL : https://patchwork.freedesktop.org/series/41547/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4046_full -> Patchwork_8668_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8668_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_8668_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://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8668/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8668_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS +2
== Known issues ==
Here are the changes found in Patchwork_8668_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_cursor_crc@cursor-256x256-dpms:
shard-apl: PASS -> FAIL (fdo#104645)
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: PASS -> FAIL (fdo#100368) +2
igt@kms_rotation_crc@primary-rotation-180:
shard-hsw: PASS -> FAIL (fdo#103925)
==== Possible fixes ====
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-hsw: FAIL (fdo#102887) -> PASS
igt@kms_flip@flip-vs-panning:
shard-apl: DMESG-WARN (fdo#104727) -> PASS
igt@kms_flip@flip-vs-panning-vs-hang:
shard-snb: DMESG-WARN (fdo#103821) -> PASS
igt@kms_flip@plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_flip@wf_vblank-ts-check:
shard-kbl: FAIL (fdo#105346) -> PASS
igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-render:
shard-kbl: DMESG-WARN (fdo#103558) -> PASS +2
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
igt@kms_vblank@pipe-b-accuracy-idle:
shard-hsw: FAIL (fdo#102583) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103821 https://bugs.freedesktop.org/show_bug.cgi?id=103821
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#104645 https://bugs.freedesktop.org/show_bug.cgi?id=104645
fdo#104727 https://bugs.freedesktop.org/show_bug.cgi?id=104727
fdo#105346 https://bugs.freedesktop.org/show_bug.cgi?id=105346
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_4046 -> Patchwork_8668
CI_DRM_4046: d123888920ccd112851ade43a3bf1c25627c2316 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4422: a914075d55dd089095121906bf4c3e825a3cecf2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8668: 91e50de23ce3a255e5c8f1c3d5a783a1ca39954a @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4422: 45e115f293fd6acc0c9647cf2d3b76be78819ba5 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8668/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()
2018-04-11 13:17 ` Chris Wilson
@ 2018-04-12 9:29 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2018-04-12 9:29 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Wed, 11 Apr 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2018-04-11 14:15:19)
>> No functional changes.
>>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_bios.c | 10 ++++------
>> 1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 447b721c3be9..036307af8419 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1215,10 +1215,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> {
>> struct child_device_config *it, *child = NULL;
>> struct ddi_vbt_port_info *info = &dev_priv->vbt.ddi_port_info[port];
>> - uint8_t hdmi_level_shift;
>> int i, j;
>> bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
>> - uint8_t aux_channel, ddc_pin;
>> /* Each DDI port can have more than one value on the "DVO Port" field,
>> * so look for all the possible values for each port.
>> */
>> @@ -1255,8 +1253,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> if (!child)
>> return;
>>
>> - aux_channel = child->aux_channel;
>> -
>> is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
>> is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
>> is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
>> @@ -1302,6 +1298,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
>>
>> if (is_dvi) {
>> + u8 ddc_pin;
>> +
>> ddc_pin = map_ddc_pin(dev_priv, child->ddc_pin);
>> if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) {
>> info->alternate_ddc_pin = ddc_pin;
>> @@ -1314,14 +1312,14 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> }
>>
>> if (is_dp) {
>> - info->alternate_aux_channel = aux_channel;
>> + info->alternate_aux_channel = child->aux_channel;
>>
>> sanitize_aux_ch(dev_priv, port);
>> }
>>
>> if (bdb_version >= 158) {
>> /* The VBT HDMI level shift values match the table we have. */
>> - hdmi_level_shift = child->hdmi_level_shifter_value;
>> + u8 hdmi_level_shift = child->hdmi_level_shifter_value;
>
> checkpatch will ask for a \n,
Happily not, pushed as-is, thanks for the review.
BR,
Jani.
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-04-12 9:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-11 13:15 [PATCH v2 1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Jani Nikula
2018-04-11 13:15 ` [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port() Jani Nikula
2018-04-11 13:17 ` Chris Wilson
2018-04-12 9:29 ` Jani Nikula
2018-04-11 14:28 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/2] drm/i915/bios: filter out invalid DDC pins from VBT child devices Patchwork
2018-04-11 14:44 ` ✓ Fi.CI.BAT: success " Patchwork
2018-04-11 18:12 ` ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.