* [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files
@ 2017-06-21 10:59 Maarten Lankhorst
2017-06-21 12:04 ` ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Maarten Lankhorst @ 2017-06-21 10:59 UTC (permalink / raw)
To: intel-gfx
When reading all debugfs files on a system with DP-MST the kernel panics
on a null pointer dereference because intel_dp is null for a DP-MST
connector. Detect this case and skip those connectors.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 1f1176b6400e..30e2e168fe92 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3812,13 +3812,18 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
if (intel_dp->compliance.test_active)
seq_puts(m, "1");
else
@@ -3858,13 +3863,18 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
if (intel_dp->compliance.test_type ==
DP_TEST_LINK_EDID_READ)
seq_printf(m, "%lx",
@@ -3911,13 +3921,18 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
seq_printf(m, "%02lx", intel_dp->compliance.test_type);
} else
seq_puts(m, "0");
--
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* ✓ Fi.CI.BAT: success for drm/i915: Prevent kernel panic on reading out compliance debugfs files
2017-06-21 10:59 [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Maarten Lankhorst
@ 2017-06-21 12:04 ` Patchwork
2017-06-21 20:57 ` [PATCH] " Pandiyan, Dhinakaran
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-06-21 12:04 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Prevent kernel panic on reading out compliance debugfs files
URL : https://patchwork.freedesktop.org/series/26139/
State : success
== Summary ==
Series 26139v1 drm/i915: Prevent kernel panic on reading out compliance debugfs files
https://patchwork.freedesktop.org/api/1.0/series/26139/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-r) fdo#100125
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:443s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:433s
fi-bsw-n3050 total:278 pass:241 dwarn:1 dfail:0 fail:0 skip:36 time:521s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:505s
fi-byt-j1900 total:278 pass:252 dwarn:2 dfail:0 fail:0 skip:24 time:488s
fi-byt-n2820 total:278 pass:248 dwarn:2 dfail:0 fail:0 skip:28 time:481s
fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:586s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:431s
fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:412s
fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:426s
fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:503s
fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:472s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:462s
fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:571s
fi-kbl-r total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:577s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:455s
fi-skl-6700hq total:278 pass:220 dwarn:3 dfail:0 fail:30 skip:24 time:340s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:461s
fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:477s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:438s
fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:539s
fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:406s
186f6503dc0750d739db5d9301dc9a507eacc6ef drm-tip: 2017y-06m-21d-10h-08m-42s UTC integration manifest
f5bba85 drm/i915: Prevent kernel panic on reading out compliance debugfs files
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5011/
_______________________________________________
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] drm/i915: Prevent kernel panic on reading out compliance debugfs files
2017-06-21 10:59 [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Maarten Lankhorst
2017-06-21 12:04 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-06-21 20:57 ` Pandiyan, Dhinakaran
2017-06-26 8:18 ` [PATCH] drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2 Maarten Lankhorst
2017-06-21 22:08 ` [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Manasi Navare
2017-06-26 11:04 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent kernel panic on reading out compliance debugfs files (rev2) Patchwork
3 siblings, 1 reply; 7+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-06-21 20:57 UTC (permalink / raw)
To: maarten.lankhorst; +Cc: intel-gfx
On Wed, 2017-06-21 at 12:59 +0200, Maarten Lankhorst wrote:
> When reading all debugfs files on a system with DP-MST the kernel panics
> on a null pointer dereference because intel_dp is null for a DP-MST
> connector. Detect this case and skip those connectors.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 33 ++++++++++++++++++++++++---------
> 1 file changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 1f1176b6400e..30e2e168fe92 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
I think you missed i915_displayport_test_active_write(). Looks good
otherwise.
-DK
> @@ -3812,13 +3812,18 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_active)
> seq_puts(m, "1");
> else
> @@ -3858,13 +3863,18 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_type ==
> DP_TEST_LINK_EDID_READ)
> seq_printf(m, "%lx",
> @@ -3911,13 +3921,18 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> seq_printf(m, "%02lx", intel_dp->compliance.test_type);
> } else
> seq_puts(m, "0");
_______________________________________________
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* [PATCH] drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2.
2017-06-21 20:57 ` [PATCH] " Pandiyan, Dhinakaran
@ 2017-06-26 8:18 ` Maarten Lankhorst
2017-06-26 17:07 ` Pandiyan, Dhinakaran
0 siblings, 1 reply; 7+ messages in thread
From: Maarten Lankhorst @ 2017-06-26 8:18 UTC (permalink / raw)
To: intel-gfx; +Cc: Dhinakaran Pandiyan
When reading all debugfs files on a system with DP-MST the kernel panics
on a null pointer dereference because intel_dp is null for a DP-MST
connector. Detect this case and skip those connectors.
Also fix the write for the DP compliance file in the same way.
Changes since v1:
- Fix i915_displayport_test_active_write too. (DK)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 44 +++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index f7aa6cbe3a2e..76b07a9b3548 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3778,13 +3778,18 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
status = kstrtoint(input_buffer, 10, &val);
if (status < 0)
break;
@@ -3816,13 +3821,18 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
if (intel_dp->compliance.test_active)
seq_puts(m, "1");
else
@@ -3862,13 +3872,18 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
if (intel_dp->compliance.test_type ==
DP_TEST_LINK_EDID_READ)
seq_printf(m, "%lx",
@@ -3915,13 +3930,18 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) {
+ struct intel_encoder *encoder;
+
if (connector->connector_type !=
DRM_MODE_CONNECTOR_DisplayPort)
continue;
- if (connector->status == connector_status_connected &&
- connector->encoder != NULL) {
- intel_dp = enc_to_intel_dp(connector->encoder);
+ encoder = to_intel_encoder(connector->encoder);
+ if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
+ continue;
+
+ if (encoder && connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(&encoder->base);
seq_printf(m, "%02lx", intel_dp->compliance.test_type);
} else
seq_puts(m, "0");
--
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] drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2.
2017-06-26 8:18 ` [PATCH] drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2 Maarten Lankhorst
@ 2017-06-26 17:07 ` Pandiyan, Dhinakaran
0 siblings, 0 replies; 7+ messages in thread
From: Pandiyan, Dhinakaran @ 2017-06-26 17:07 UTC (permalink / raw)
To: maarten.lankhorst; +Cc: intel-gfx
On Mon, 2017-06-26 at 10:18 +0200, Maarten Lankhorst wrote:
> When reading all debugfs files on a system with DP-MST the kernel panics
> on a null pointer dereference because intel_dp is null for a DP-MST
> connector. Detect this case and skip those connectors.
>
> Also fix the write for the DP compliance file in the same way.
>
> Changes since v1:
> - Fix i915_displayport_test_active_write too. (DK)
>
Avoids NULL pointer dereferences in all instances of enc_to_intel_dp()
inside compliance related functions, so
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
This is the second instance where enc_to_intel_dp(mst_encoder) has
caused kernel panics. I wonder if we should change enc_to_intel_dp() to
check for encoder type.
-DK
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Cc: Manasi Navare <manasi.d.navare@intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 44 +++++++++++++++++++++++++++----------
> 1 file changed, 32 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index f7aa6cbe3a2e..76b07a9b3548 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -3778,13 +3778,18 @@ static ssize_t i915_displayport_test_active_write(struct file *file,
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> status = kstrtoint(input_buffer, 10, &val);
> if (status < 0)
> break;
> @@ -3816,13 +3821,18 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_active)
> seq_puts(m, "1");
> else
> @@ -3862,13 +3872,18 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_type ==
> DP_TEST_LINK_EDID_READ)
> seq_printf(m, "%lx",
> @@ -3915,13 +3930,18 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> seq_printf(m, "%02lx", intel_dp->compliance.test_type);
> } else
> seq_puts(m, "0");
_______________________________________________
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] drm/i915: Prevent kernel panic on reading out compliance debugfs files
2017-06-21 10:59 [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Maarten Lankhorst
2017-06-21 12:04 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-06-21 20:57 ` [PATCH] " Pandiyan, Dhinakaran
@ 2017-06-21 22:08 ` Manasi Navare
2017-06-26 11:04 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent kernel panic on reading out compliance debugfs files (rev2) Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Manasi Navare @ 2017-06-21 22:08 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
Thanks fo rthis patch Maarten. I had noticed this while running the intel_dp_compliance
IGT tool. But I saw this with DP SST systems as well. What could be happening in that case?
Manasi
On Wed, Jun 21, 2017 at 12:59:41PM +0200, Maarten Lankhorst wrote:
> When reading all debugfs files on a system with DP-MST the kernel panics
> on a null pointer dereference because intel_dp is null for a DP-MST
> connector. Detect this case and skip those connectors.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 33 ++++++++++++++++++++++++---------
> 1 file changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 1f1176b6400e..30e2e168fe92 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -3812,13 +3812,18 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_active)
> seq_puts(m, "1");
> else
> @@ -3858,13 +3863,18 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> if (intel_dp->compliance.test_type ==
> DP_TEST_LINK_EDID_READ)
> seq_printf(m, "%lx",
> @@ -3911,13 +3921,18 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
>
> drm_connector_list_iter_begin(dev, &conn_iter);
> drm_for_each_connector_iter(connector, &conn_iter) {
> + struct intel_encoder *encoder;
> +
> if (connector->connector_type !=
> DRM_MODE_CONNECTOR_DisplayPort)
> continue;
>
> - if (connector->status == connector_status_connected &&
> - connector->encoder != NULL) {
> - intel_dp = enc_to_intel_dp(connector->encoder);
> + encoder = to_intel_encoder(connector->encoder);
> + if (encoder && encoder->type == INTEL_OUTPUT_DP_MST)
> + continue;
> +
> + if (encoder && connector->status == connector_status_connected) {
> + intel_dp = enc_to_intel_dp(&encoder->base);
> seq_printf(m, "%02lx", intel_dp->compliance.test_type);
> } else
> seq_puts(m, "0");
> --
> 2.11.0
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915: Prevent kernel panic on reading out compliance debugfs files (rev2)
2017-06-21 10:59 [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Maarten Lankhorst
` (2 preceding siblings ...)
2017-06-21 22:08 ` [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Manasi Navare
@ 2017-06-26 11:04 ` Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-06-26 11:04 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Prevent kernel panic on reading out compliance debugfs files (rev2)
URL : https://patchwork.freedesktop.org/series/26139/
State : success
== Summary ==
Series 26139v2 drm/i915: Prevent kernel panic on reading out compliance debugfs files
https://patchwork.freedesktop.org/api/1.0/series/26139/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (fi-blb-e6850) fdo#99093 +2
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-byt-j1900) fdo#101517
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#99093 https://bugs.freedesktop.org/show_bug.cgi?id=99093
fdo#101517 https://bugs.freedesktop.org/show_bug.cgi?id=101517
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:440s
fi-bdw-gvtdvm total:279 pass:257 dwarn:8 dfail:0 fail:0 skip:14 time:436s
fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:365s
fi-bsw-n3050 total:279 pass:242 dwarn:1 dfail:0 fail:0 skip:36 time:525s
fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:506s
fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:491s
fi-byt-n2820 total:279 pass:249 dwarn:2 dfail:0 fail:0 skip:28 time:482s
fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:596s
fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:435s
fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:416s
fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:421s
fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:492s
fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:470s
fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:469s
fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:569s
fi-kbl-r total:279 pass:260 dwarn:1 dfail:0 fail:0 skip:18 time:574s
fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:553s
fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:460s
fi-skl-6700hq total:279 pass:223 dwarn:1 dfail:0 fail:30 skip:24 time:339s
fi-skl-6700k total:279 pass:257 dwarn:4 dfail:0 fail:0 skip:18 time:473s
fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:473s
fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:441s
fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:544s
fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:407s
21d74e215ad650f0e8e30de609bd65601f0aa11d drm-tip: 2017y-06m-26d-09h-12m-14s UTC integration manifest
0211dae drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5040/
_______________________________________________
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:[~2017-06-26 17:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-21 10:59 [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Maarten Lankhorst
2017-06-21 12:04 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-06-21 20:57 ` [PATCH] " Pandiyan, Dhinakaran
2017-06-26 8:18 ` [PATCH] drm/i915: Prevent kernel panic when reading/writing compliance debugfs files, v2 Maarten Lankhorst
2017-06-26 17:07 ` Pandiyan, Dhinakaran
2017-06-21 22:08 ` [PATCH] drm/i915: Prevent kernel panic on reading out compliance debugfs files Manasi Navare
2017-06-26 11:04 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent kernel panic on reading out compliance debugfs files (rev2) 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.