drm/i915/psr: Split sink status into a separate debugfs node
Subsystems (2)
PATCH 1/1 drm/i915/psr: Split sink status into a separate debugfs node
This allows to read i915_edp_psr_status from tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.
--- drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +39 -30
@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ; + +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); + } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +static void psr_source_status (struct drm_i915_private *dev_priv,struct seq_file *m) {
@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m)seq_printf (m,"Source PSR status: 0x%x [%s]\n" , psr_status,"unknown" ); } -static const char *psr_sink_status (u8 val) -{ -static const char *const sink_status[] = { -"inactive" , -"transition to active, capture and display" , -"active, display from RFB" , -"active, capture and display on sink device timings" , -"transition to inactive, capture and display, timing re-sync" , -"reserved" , -"reserved" , -"sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int i915_edp_psr_status (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) }psr_source_status (dev_priv, m); - -if (dev_priv->psr.enabled) { -struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; -u8 val; - -if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) -seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, -psr_sink_status (val)); - }mutex_unlock (&dev_priv->psr.lock);if (READ_ONCE (dev_priv->psr.debug)) {
@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector)debugfs_create_file ("i915_dpcd" ,S_IRUGO , root, connector, &i915_dpcd_fops); -if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {debugfs_create_file ("i915_panel_timings" ,S_IRUGO , root, connector, &i915_panel_fops); +debugfs_create_file ("i915_psr_sink_status" ,S_IRUGO , root, + connector, &i915_psr_sink_status_fops); + }return 0 ; }
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915/psr: Split sink status into a separate debugfs node
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Split sink status into a separate debugfs node
URL : https://patchwork.freedesktop.org/series/45952/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
687e1ec30b27 drm/i915/psr: Split sink status into a separate debugfs node
-:115: WARNING:SYMBOLIC_PERMS: Symbolic permissions 'S_IRUGO' are not preferred. Consider using octal permissions '0444'.
#115: FILE: drivers/gpu/drm/i915/i915_debugfs.c:4983:
+ debugfs_create_file("i915_psr_sink_status", S_IRUGO, root,-:116: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #116: FILE: drivers/gpu/drm/i915/i915_debugfs.c:4984:
+ debugfs_create_file("i915_psr_sink_status", S_IRUGO, root,
+ connector, &i915_psr_sink_status_fops);
total: 0 errors, 1 warnings, 1 checks, 95 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: Split sink status into a separate debugfs node
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Split sink status into a separate debugfs node
URL : https://patchwork.freedesktop.org/series/45952/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4428 -> Patchwork_9529 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45952/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9529 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASSfdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
== Participating hosts (46 -> 41) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4428 -> Patchwork_9529
CI_DRM_4428: 7bc1be8128e30b4d581b913feff5c78909c00945 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4536: aaa23eff21a148809beb22e928f3cd72530ea3de @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9529: 687e1ec30b274d3e69509de0b4b873a2db0333cc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
687e1ec30b27 drm/i915/psr: Split sink status into a separate debugfs node
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9529/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915/psr: Split sink status into a separate debugfs node
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Split sink status into a separate debugfs node
URL : https://patchwork.freedesktop.org/series/45952/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4428_full -> Patchwork_9529_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9529_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9529_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9529_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_gtt:
shard-glk: NOTRUN -> DMESG-FAIL
igt@drv_selftest@mock_requests:
shard-glk: NOTRUN -> DMESG-WARN
==== Warnings ====
igt@drv_selftest@live_gtt:
shard-apl: INCOMPLETE (fdo#103927) -> DMESG-FAIL
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: SKIP -> PASS +2
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
shard-snb: SKIP -> PASS +1== Known issues ==
Here are the changes found in Patchwork_9529_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@mock_scatterlist:
shard-glk: NOTRUN -> DMESG-WARN (fdo#103667)
igt@drv_suspend@shrink:
shard-snb: PASS -> FAIL (fdo#106886)
igt@gem_exec_schedule@pi-ringfull-render:
shard-glk: NOTRUN -> FAIL (fdo#103158)
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: NOTRUN -> FAIL (fdo#104724)
igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
shard-glk: NOTRUN -> FAIL (fdo#104724, fdo#103167)
igt@kms_frontbuffer_tracking@fbc-suspend:
shard-kbl: PASS -> INCOMPLETE (fdo#105959, fdo#103665)
igt@prime_vgem@coherency-gtt:
shard-glk: NOTRUN -> FAIL (fdo#100587)
igt@testdisplay:
shard-glk: NOTRUN -> INCOMPLETE (k.org#198133, fdo#103359)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-kbl: INCOMPLETE (fdo#106886, fdo#103665) -> PASS
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS
==== Warnings ====
igt@drv_selftest@live_gtt:
shard-kbl: DMESG-FAIL -> INCOMPLETE (fdo#103665) fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#100587 https://bugs.freedesktop.org/show_bug.cgi?id=100587
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103667 https://bugs.freedesktop.org/show_bug.cgi?id=103667
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105959 https://bugs.freedesktop.org/show_bug.cgi?id=105959
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4428 -> Patchwork_9529
CI_DRM_4428: 7bc1be8128e30b4d581b913feff5c78909c00945 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4536: aaa23eff21a148809beb22e928f3cd72530ea3de @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9529: 687e1ec30b274d3e69509de0b4b873a2db0333cc @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9529/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 89 lines · Dhinakaran Pandiyan
This allows to read
i915_edp_psr_statusfrom tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +35
-20@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ; + +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); + } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +static void psr_source_status (struct drm_i915_private *dev_priv,struct seq_file *m) {@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m)seq_printf (m,"Source PSR status: 0x%x [%s]\n" , psr_status,"unknown" ); } -static const char *psr_sink_status (u8 val) -{ -static const char *const sink_status[] = { -"inactive" , -"transition to active, capture and display" , -"active, display from RFB" , -"active, capture and display on sink device timings" , -"transition to inactive, capture and display, timing re-sync" , -"reserved" , -"reserved" , -"sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int i915_edp_psr_status (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) }psr_source_status (dev_priv, m);
drivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file *m, void *data) · line 2724
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-9- -if (dev_priv->psr.enabled) { -struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; -u8 val; - -if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) -seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, -psr_sink_status (val)); - }mutex_unlock (&dev_priv->psr.lock);
I wonder if we shouldn't get this lock there to make sure that no PSR transition from our driver is getting called.
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4980
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1if (READ_ONCE (dev_priv->psr.debug)) {@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector)debugfs_create_file ("i915_dpcd" ,S_IRUGO , root, connector, &i915_dpcd_fops); -if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
it seems that we should also move the other status file here to this block...
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4984
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0debugfs_create_file ("i915_panel_timings" ,S_IRUGO , root, connector, &i915_panel_fops); +debugfs_create_file ("i915_psr_sink_status" ,S_IRUGO , root, + connector, &i915_psr_sink_status_fops);
... and also rename the other 2 entries to be in pair with this new one:
or all i915_edp_psr or all i915_psr...
Quoted 11 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ }return 0 ; }Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 62 lines · PDT Rodrigo Vivi
Quoted 61 lines · Dhinakaran Pandiyan
This allows to read
i915_edp_psr_statusfrom tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 69+++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_debugfs.cindexf6142d78ede4..5069d5dedafe100644drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2592,6 +2592,41 @@ static const struct file_operations
i915_guc_log_relay_fops= {>drivers/gpu/drm/i915/i915_debugfs.c +35
-0.release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ; + +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); + } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c psr_source_status(struct drm_i915_private · line 2679
Quoted 7 lines
static void
psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m){drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m)> seq_printf(m, "Source PSR status: 0x%x [%s]\n", psr_status,
"unknown");
Quoted 45 lines
Quoted 45 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-20} -static const char *psr_sink_status (u8 val) -{ -static const char *const sink_status[] = { -"inactive" , -"transition to active, capture and display" , -"active, display from RFB" , -"active, capture and display on sink device timings" , -"transition to inactive, capture and display, timing re-sync" , -"reserved" , -"reserved" , -"sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int i915_edp_psr_status (struct seq_file *m,void *data){
drivers/gpu/drm/i915/i915_debugfs.c +0
-0struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m,void *data)>
drivers/gpu/drm/i915/i915_debugfs.c +0
-9}psr_source_status (dev_priv, m); - -if (dev_priv->psr.enabled) { -struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; -u8 val; - -if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) -seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, -psr_sink_status (val)); - }
Quoted 5 lines
Quoted 1 line
mutex_unlock(&dev_priv->psr.lock);I wonder if we shouldn't get this lock there to make sure taat no PSR transition from our driver is getting called.
This lock was useful as we wanted dev_priv->psr.enabled == intel_dp to be valid. I don't see why we have to serialize sink DPCD reads w.r.t the driver's PSR state transitions.
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0if (READ_ONCE (dev_priv->psr.debug)) {@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector)> debugfs_create_file("i915_dpcd", S_IRUGO, root,
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4980
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1connector, &i915_dpcd_fops); -if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {it seems that we should also move the other status file here to this block...
Do you mean i915_edp_psr_status? As I see it, that is a feature specific debugfs node that includes source information as well. The ones under $debugfs/eDP-1/ are all panel related.
Quoted 11 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector)
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0debugfs_create_file ("i915_panel_timings" ,S_IRUGO , root, connector, &i915_panel_fops); +debugfs_create_file ("i915_psr_sink_status" ,S_IRUGO , root, + connector, &i915_psr_sink_status_fops);... and also rename the other 2 entries to be in pair with this new one:
or all
i915_edp_psror alli915_psr...
I wrote this as i915_psr and realized that it might get confusing since we also have i915_edp_psr_status for feature status. And "_edp_" is redundant because all the nodes are under the eDP-1 directory. But, yeah I can change it to "i915_psr" if you think that is better.
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4988
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ }return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 116 lines · Dhinakaran Pandiyan
Quoted 62 lines · PDT Rodrigo Vivi
Quoted 61 lines · Dhinakaran Pandiyan
This allows to read
i915_edp_psr_statusfrom tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 69+++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_debugfs.cindexf6142d78ede4..5069d5dedafe100644drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2592,6 +2592,41 @@ static const struct file_operations
i915_guc_log_relay_fops= {>drivers/gpu/drm/i915/i915_debugfs.c +35
-0.release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ; + +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); + } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c psr_source_status(struct drm_i915_private · line 2679
Quoted 7 lines
static void
psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m){drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m)> seq_printf(m, "Source PSR status: 0x%x [%s]\n", psr_status,"unknown");
Quoted 45 lines
Quoted 45 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-20} -static const char *psr_sink_status (u8 val) -{ -static const char *const sink_status[] = { -"inactive" , -"transition to active, capture and display" , -"active, display from RFB" , -"active, capture and display on sink device timings" , -"transition to inactive, capture and display, timing re-sync" , -"reserved" , -"reserved" , -"sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int i915_edp_psr_status (struct seq_file *m,void *data){
drivers/gpu/drm/i915/i915_debugfs.c +0
-0struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m,void *data)>
drivers/gpu/drm/i915/i915_debugfs.c +0
-9}psr_source_status (dev_priv, m); - -if (dev_priv->psr.enabled) { -struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; -u8 val; - -if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) -seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, -psr_sink_status (val)); - }
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
mutex_unlock(&dev_priv->psr.lock);I wonder if we shouldn't get this lock there to make sure taat no PSR transition from our driver is getting called.
This lock was useful as we wanted
dev_priv->psr.enabled==intel_dpto be valid. I don't see why we have to serialize sink DPCD reads w.r.t the driver's PSR state transitions.
hm... makes sense...
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0if (READ_ONCE (dev_priv->psr.debug)) {@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector)> debugfs_create_file("i915_dpcd", S_IRUGO, root,Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4980
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1connector, &i915_dpcd_fops); -if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {it seems that we should also move the other status file here to this block...
Quoted 3 lines
Do you mean
i915_edp_psr_status? As I see it, that is a feature specific debugfs node that includes source information as well. The ones under $debugfs/eDP-1/ are all panel related.
oh good point...
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector)
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0debugfs_create_file ("i915_panel_timings" ,S_IRUGO , root, connector, &i915_panel_fops); +debugfs_create_file ("i915_psr_sink_status" ,S_IRUGO , root, + connector, &i915_psr_sink_status_fops);... and also rename the other 2 entries to be in pair with this new one:
Quoted 6 lines
Quoted 2 lines
or all
i915_edp_psror alli915_psr...I wrote this as
i915_psrand realized that it might get confusing since we also havei915_edp_psr_statusfor feature status. And "_edp_" is redundant because all the nodes are under the eDP-1 directory. But, yeah I can change it to "i915_psr" if you think that is better.
well, the i915_edp_psr_status is before we had this directory I think
and the idea of having the "_edp_" was to name it as eDP-1 when we had multiple cases...
So, whatever we decide for that... move or not to eDP-1, remove or not "_edp_" I think we should do in a separated patch...
So, for this one here:
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4988
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ }return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: Split sink status into a separate debugfs node
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Split sink status into a separate debugfs node
URL : https://patchwork.freedesktop.org/series/45952/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4438 -> Patchwork_9555 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45952/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9555 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-FAIL (fdo#106103, fdo#102614) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (47 -> 42) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4438 -> Patchwork_9555
CI_DRM_4438: b689733af687b4b8072fb62a6bfe267c4e888f5f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4539: 8b3cc74c6911e9b2835fe6e160f84bae463a70ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9555: 1fa6ece46478fac57189bac261cece9348ba807e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1fa6ece46478 drm/i915/psr: Split sink status into a separate debugfs node
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9555/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/psr: Split sink status into a separate debugfs node
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Split sink status into a separate debugfs node
URL : https://patchwork.freedesktop.org/series/45952/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4438_full -> Patchwork_9555_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9555_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9555_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9555_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-blt:
shard-kbl: PASS -> SKIP +2
igt@gem_mocs_settings@mocs-rc6-bsd1:
shard-kbl: SKIP -> PASS +1== Known issues ==
Here are the changes found in Patchwork_9555_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@wf_vblank-ts-check:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: PASS -> FAIL (fdo#103822)
igt@kms_rotation_crc@sprite-rotation-180:
shard-hsw: PASS -> FAIL (fdo#103925)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@kms_flip@2x-plain-flip-ts-check:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL -> PASS
==== Warnings ====
igt@drv_selftest@live_gtt:
shard-kbl: INCOMPLETE (fdo#107127, fdo#103665) -> FAIL (fdo#107127, fdo#105347) fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#107127 https://bugs.freedesktop.org/show_bug.cgi?id=107127
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4438 -> Patchwork_9555
CI_DRM_4438: b689733af687b4b8072fb62a6bfe267c4e888f5f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4539: 8b3cc74c6911e9b2835fe6e160f84bae463a70ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9555: 1fa6ece46478fac57189bac261cece9348ba807e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9555/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 102 lines · Dhinakaran Pandiyan
This allows to read
i915_edp_psr_statusfrom tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +35
-29@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ; + +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS ); + } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +static void psr_source_status (struct drm_i915_private *dev_priv,struct seq_file *m) {@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m)seq_printf (m,"Source PSR status: 0x%x [%s]\n" , psr_status,"unknown" ); } -static const char *psr_sink_status (u8 val) -{ -static const char *const sink_status[] = { -"inactive" , -"transition to active, capture and display" , -"active, display from RFB" , -"active, capture and display on sink device timings" , -"transition to inactive, capture and display, timing re-sync" , -"reserved" , -"reserved" , -"sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int i915_edp_psr_status (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) }psr_source_status (dev_priv, m); - -if (dev_priv->psr.enabled) { -struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; -u8 val; - -if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) -seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, -psr_sink_status (val)); - }mutex_unlock (&dev_priv->psr.lock);if (READ_ONCE (dev_priv->psr.debug)) {
drivers/gpu/drm/i915/i915_debugfs.c int i915_debugfs_connector_add(struct drm_connector *connector) · line 4984
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-1@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector)debugfs_create_file ("i915_dpcd" ,S_IRUGO , root, connector, &i915_dpcd_fops); -if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {debugfs_create_file ("i915_panel_timings" ,S_IRUGO , root, connector, &i915_panel_fops); +debugfs_create_file ("i915_psr_sink_status" ,S_IRUGO , root, + connector, &i915_psr_sink_status_fops);
my OCD on names here about i915_psr vs i915_edp_psr is still a real thing although they are on different places ;)
We could probably remove "_edp" from the others, because psr is an edp only after all....
Anyways let's not block the progress here ;)
Quoted 11 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ }return 0 ; }Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 142 lines · Rodrigo Vivi
Quoted 136 lines · Dhinakaran Pandiyan
This allows to read
i915_edp_psr_statusfrom tests without triggering
any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++--
--------------1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, };
+static inti915_psr_sink_status_show(struct seq_file *m, void *data)drivers/gpu/drm/i915/i915_debugfs.c +7
-0+{ + u8 val; + static const char * const sink_status[] = { + "inactive", + "transition to active, capture and display", + "active, display from RFB", + "active, capture and display on sink devicetimings",
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ "transition to inactive, capture and display,timing re-sync",
drivers/gpu/drm/i915/i915_debugfs.c +12
-1+"reserved" , +"reserved" , + "sink internal error", + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector) ->base); + + if (connector->status != connector_status_connected) + return -ENODEV; + + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val)== 1) {
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; + seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val,str);
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ }else { + DRM_ERROR("dpcd read (at %u) failed\n",
DP_PSR_STATUS);drivers/gpu/drm/i915/i915_debugfs.c +6
-0+ } + +return 0 ; +} +DEFINE_SHOW_ATTRIBUTE (i915_psr_sink_status); +static void
psr_source_status(structdrm_i915_private*dev_priv, structseq_file*m)
{drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2643,26 +2678,6 @@ psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m) seq_printf(m, "Source PSR status: 0x%x [%s]\n", psr_status,"unknown" ); }drivers/gpu/drm/i915/i915_debugfs.c +0
-7-static const char *psr_sink_status(u8 val) -{ - static const char * const sink_status[] = { - "inactive", - "transition to active, capture and display", - "active, display from RFB", - "active, capture and display on sink devicetimings",
drivers/gpu/drm/i915/i915_debugfs.c +0
-1- "transition to inactive, capture and display,timing re-sync",
drivers/gpu/drm/i915/i915_debugfs.c +0
-12-"reserved" , -"reserved" , - "sink internal error" - }; - - val &=DP_PSR_SINK_STATE_MASK ; -if (val <ARRAY_SIZE (sink_status)) -return sink_status[val]; - -return "unknown" ; -} -static int
i915_edp_psr_status(struct seq_file *m, void *data){
structdrm_i915_private*dev_priv= node_to_i915(m-Quoted 1 line
private);
drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2706,15 +2721,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) }
psr_source_status(dev_priv, m);drivers/gpu/drm/i915/i915_debugfs.c +0
-3- -if (dev_priv->psr.enabled) { - struct drm_dp_aux *aux = &dev_priv->psr.enabled-Quoted 1 line
aux;
drivers/gpu/drm/i915/i915_debugfs.c +0
-3-u8 val; - - if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val) ==1)
drivers/gpu/drm/i915/i915_debugfs.c +0
-1- seq_printf(m, "Sink PSR status: 0x%x[%s]\n", val,
drivers/gpu/drm/i915/i915_debugfs.c +0
-2- psr_sink_status(val)); - }
mutex_unlock(&dev_priv->psr.lock);
if (READ_ONCE(dev_priv->psr.debug)) {drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -4971,9 +4977,12 @@ int i915_debugfs_connector_add(struct drm_connector *connector) debugfs_create_file("i915_dpcd", S_IRUGO, root, connector, &i915_dpcd_fops);drivers/gpu/drm/i915/i915_debugfs.c +1
-1-if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {debugfs_create_file("i915_panel_timings",
S_IRUGO, root,
connector,&i915_panel_fops);drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ debugfs_create_file("i915_psr_sink_status",
S_IRUGO, root,drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ connector,Quoted 1 line
&i915_psr_sink_status_fops);my OCD on names here about
i915_psrvsi915_edp_psris still a real thing although
they are on different places ;)
Quoted 7 lines
We could probably remove "
_edp" from the others, because psr is an edp only after all....Anyways let's not block the progress here ;)
Reviewed-by Rodrigo Vivi <[email protected]>
Thank you, I pushed this to -queued.
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ }
return 0;
}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Dhinakaran Pandiyan (2018-07-05 01:31:21)
Quoted 39 lines
This allows to read
i915_edp_psr_statusfrom tests without triggering any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +19
-0@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, }; +static int i915_psr_sink_status_show (struct seq_file *m,void *data) +{ +u8 val; +static const char *const sink_status[] = { +"inactive" , +"transition to active, capture and display" , +"active, display from RFB" , +"active, capture and display on sink device timings" , +"transition to inactive, capture and display, timing re-sync" , +"reserved" , +"reserved" , +"sink internal error" , + }; +struct drm_connector *connector = m->private; +struct intel_dp *intel_dp = +enc_to_intel_dp (&intel_attached_encoder (connector)->base); + +if (connector->status != connector_status_connected) +return -ENODEV ;
drivers/gpu/drm/i915/i915_debugfs.c static const struct file_operations i915_guc_log_relay_fops = { · line 2623
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+ +if (drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_STATUS , &val) ==1 ) { +const char *str ="unknown" ; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) + str = sink_status[val]; +seq_printf (m,"Sink PSR status: 0x%x [%s]\n" , val, str); + }else { +DRM_ERROR ("dpcd read (at %u) failed\n" ,DP_PSR_STATUS );
Why is this common occurrence (any DP that doesn't support PSR) an error? Why report it via a backchannel when you are already directly communicating with the user?!!!
Please fix this mess.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 56 lines · Chris Wilson
Quoting Dhinakaran Pandiyan (2018-07-05 01:31:21)
Quoted 55 lines
This allows to read
i915_edp_psr_statusfrom tests without triggering
any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++--
--------------1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, };
+static inti915_psr_sink_status_show(struct seq_file *m, void *data)
+{
+ u8 val;
+ static const char * const sink_status[] = {
+ "inactive",
+ "transition to active, capture and display", + "active, display from RFB",
+ "active, capture and display on sink device timings",
+ "transition to inactive, capture and display, timing re-sync",
+ "reserved",
+ "reserved",
+ "sink internal error",
+ };
+ structdrm_connector*connector =m->private;
+ structintel_dp*intel_dp=
+ enc_to_intel_dp(&intel_attached_encoder(connector)-Quoted 1 line
base);
drivers/gpu/drm/i915/i915_debugfs.c +5
-0+ + if (connector->status != connector_status_connected) + return -ENODEV; + + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val)== 1) {
+ const char *str = "unknown"; +
+ val &=DP_PSR_SINK_STATE_MASK; + if (val <ARRAY_SIZE(sink_status))
Quoted 8 lines
Quoted 6 lines
+ str = sink_status[val];
+ seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str);
+ } else {
+ DRM_ERROR("dpcd read (at %u) failed\n",DP_PSR_STATUS);Why is this common occurrence (any DP that doesn't support PSR) an error?
We create this file only for eDPs and I did not think dpcd_read would return an error if the panel did not support PSR. Do you happen to have any logs?
Quoted 3 lines
Why report it via a backchannel when you are already directly communicating with the user?!!!
You are right, i915_dpcd_show() also has the same issue. How about returning the error to the user?
@@ -2595,6 +2595,7 @@ static const struct file_operations i915_guc_log_relay_fops = {
static int i915_psr_sink_status_show(struct seq_file *m, void *data) {
u8 val;
+ int ret;
static const char * const sink_status[] = { "inactive",
"transition to active, capture and display", @@ -2605,6 +2606,7 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
"reserved",
"sink internal error",
};
+ const char *str = "unknown";
struct drm_connector *connector = m->private; struct intel_dp *intel_dp = enc_to_intel_dp(&intel_attached_encoder(connector)-
Quoted 1 line
base);
@@ -2612,17 +2614,16 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data)
if (connector->status != connector_status_connected) return -ENODEV;
- if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val) ==
1) {
- const char *str = "unknown";
+ ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val);
+ if (ret < 0) {
+ return ret;
+ } else if (ret == 1) {
val &= DP_PSR_SINK_STATE_MASK;
if (val < ARRAY_SIZE(sink_status))
str = sink_status[val];
- seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str);
- } else {
- DRM_ERROR("dpcd read (at %u) failed\n", DP_PSR_STATUS); }
-
+ seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str); return 0;
}
Quoted 2 lines
Please fix this mess.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 117 lines · Dhinakaran Pandiyan
Quoted 56 lines · Chris Wilson
Quoting Dhinakaran Pandiyan (2018-07-05 01:31:21)
Quoted 55 lines
This allows to read
i915_edp_psr_statusfrom tests without triggering
any AUX communication. Take this opportunity to move this under the eDP-1 connector directory as the status we print is of the sink.Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 69 +++++++++++++++++++++--
--------------1 file changed, 39 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2592,6 +2592,41 @@ static const struct file_operations i915_guc_log_relay_fops = { .release = i915_guc_log_relay_release, };
+static inti915_psr_sink_status_show(struct seq_file *m, void *data)
+{
+ u8 val;
+ static const char * const sink_status[] = {
+ "inactive",
+ "transition to active, capture and display", + "active, display from RFB",
+ "active, capture and display on sink device timings",
+ "transition to inactive, capture and display, timing re-sync",
+ "reserved",
+ "reserved",
+ "sink internal error",
+ };
+ structdrm_connector*connector =m->private;
+ structintel_dp*intel_dp=
+ enc_to_intel_dp(&intel_attached_encoder(connector)-Quoted 1 line
base);
drivers/gpu/drm/i915/i915_debugfs.c +5
-0+ + if (connector->status != connector_status_connected) + return -ENODEV; + + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val)== 1) {
+ const char *str = "unknown"; +
+ val &=DP_PSR_SINK_STATE_MASK; + if (val <ARRAY_SIZE(sink_status))Quoted 8 lines
Quoted 6 lines
+ str = sink_status[val];
+ seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str);
+ } else {
+ DRM_ERROR("dpcd read (at %u) failed\n",DP_PSR_STATUS);Why is this common occurrence (any DP that doesn't support PSR) an error?
We create this file only for eDPs and I did not think
dpcd_readwould return an error if the panel did not support PSR. Do you happen to have any logs?Quoted 3 lines
Why report it via a backchannel when you are already directly communicating with the user?!!!
You are right,
i915_dpcd_show()also has the same issue. How about returning the error to the user?(quoted diff) +1
-0@@ -2595,6 +2595,7 @@ static const struct file_operations i915_guc_log_relay_fops = { static int i915_psr_sink_status_show(struct seq_file *m, void *data) { u8 val; + int ret; static const char * const sink_status[] = { "inactive","transition to active, capture and display",
(quoted diff) +1
-0@@ -2605,6 +2606,7 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data) "reserved", "sink internal error", }; + const char *str = "unknown"; struct drm_connector *connector = m->private;struct
intel_dp*intel_dp= enc_to_intel_dp(&intel_attached_encoder(connector)-Quoted 1 line
base);
(quoted diff) +5
-6@@ -2612,17 +2614,16 @@ static int i915_psr_sink_status_show(struct seq_file *m, void *data) if (connector->status != connector_status_connected) return -ENODEV; - if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val) == 1) { - const char *str = "unknown"; + ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_PSR_STATUS, &val); + if (ret < 0) { + return ret; + } else if (ret == 1) { val &= DP_PSR_SINK_STATE_MASK; if (val < ARRAY_SIZE(sink_status)) str = sink_status[val]; - seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str); - } else { - DRM_ERROR("dpcd read (at %u) failed\n", DP_PSR_STATUS); } - + seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val, str);
Quoted 2 lines
return 0;
}
ops, just saw this after sending the patch...
I think this should work as well.
However I believe it is better not even read the dpcd if psr is not supported.
Quoted 3 lines
Quoted 3 lines
Please fix this mess.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx