Skip to contentSkip to conversation

drm/i915/psr: disable psr2 for resolution greater than 32X20

PATCH In review vathsala nagaraju 6 participants 12 messages May 23, 2017 – May 30, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/psr: disable psr2 for resolution greater than 32X20

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

Cc Rodrigo Vivi <[email protected]>
Cc Jim Bride <[email protected]>
Cc Yaroslav Shabalin <[email protected]>
---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +3 -2
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)

== Series Details ==

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)
URL : https://patchwork.freedesktop.org/series/17737/
State : success

== Summary ==

Series 17737v2 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/2/mbox/

fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:439s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:441s

fi-bdw-5557u failed to collect. IGT log at Patchwork_4787/fi-bdw-5557u/igt.log fi-bsw-n3050 failed to collect. IGT log at Patchwork_4787/fi-bsw-n3050/igt.log fi-bxt-j4205 failed to collect. IGT log at Patchwork_4787/fi-bxt-j4205/igt.log fi-byt-j1900 failed to collect. IGT log at Patchwork_4787/fi-byt-j1900/igt.log fi-byt-n2820 failed to collect. IGT log at Patchwork_4787/fi-byt-n2820/igt.log fi-hsw-4770 failed to collect. IGT log at Patchwork_4787/fi-hsw-4770/igt.log fi-hsw-4770r failed to collect. IGT log at Patchwork_4787/fi-hsw-4770r/igt.log fi-ilk-650 failed to collect. IGT log at Patchwork_4787/fi-ilk-650/igt.log fi-ivb-3520m failed to collect. IGT log at Patchwork_4787/fi-ivb-3520m/igt.log fi-ivb-3770 failed to collect. IGT log at Patchwork_4787/fi-ivb-3770/igt.log fi-kbl-7500u failed to collect. IGT log at Patchwork_4787/fi-kbl-7500u/igt.log fi-kbl-7560u failed to collect. IGT log at Patchwork_4787/fi-kbl-7560u/igt.log fi-skl-6260u failed to collect. IGT log at Patchwork_4787/fi-skl-6260u/igt.log fi-skl-6700hq failed to collect. IGT log at Patchwork_4787/fi-skl-6700hq/igt.log fi-skl-6700k failed to collect. IGT log at Patchwork_4787/fi-skl-6700k/igt.log fi-skl-6770hq failed to collect. IGT log at Patchwork_4787/fi-skl-6770hq/igt.log fi-snb-2520m failed to collect. IGT log at Patchwork_4787/fi-snb-2520m/igt.log fi-snb-2600 failed to collect. IGT log at Patchwork_4787/fi-snb-2600/igt.log

c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h-42m-41s UTC integration manifest 999711c drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4787/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to vathsala nagaraju

A bit of history on the commit message pointing the commit that introduced the issue is desired.

With that in place feel free to use:

Quoted 18 lines · vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

Cc Rodrigo Vivi <[email protected]>
Cc Jim Bride <[email protected]>
Cc Yaroslav Shabalin <[email protected]>
---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +0 -0
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}

drivers/gpu/drm/i915/intel_psr.c static bool intel_psr_match_conditions(struct intel_dp *intel_dp) · line 443

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3 -2
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#3 lore raw
Quoted 2 lines · Rodrigo

A bit of history on the commit message pointing the commit that introduced the issue is desired.

s/desired/absolutely required/.

BR,
Jani.

Quoted 38 lines

With that in place feel free to use:

Quoted 18 lines · vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

Cc Rodrigo Vivi <[email protected]>
Cc Jim Bride <[email protected]>
Cc Yaroslav Shabalin <[email protected]>
---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +0 -0
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}

drivers/gpu/drm/i915/intel_psr.c static bool intel_psr_match_conditions(struct intel_dp *intel_dp) · line 443

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3 -2
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)

In reply to vathsala nagaraju
== Series Details ==

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)
URL : https://patchwork.freedesktop.org/series/17737/
State : success

== Summary ==

Series 17737v2 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/2/mbox/

fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:434s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:438s

fi-bdw-5557u failed to collect. IGT log at Patchwork_4788/fi-bdw-5557u/igt.log fi-bsw-n3050 failed to collect. IGT log at Patchwork_4788/fi-bsw-n3050/igt.log fi-bxt-j4205 failed to collect. IGT log at Patchwork_4788/fi-bxt-j4205/igt.log fi-byt-j1900 failed to collect. IGT log at Patchwork_4788/fi-byt-j1900/igt.log fi-byt-n2820 failed to collect. IGT log at Patchwork_4788/fi-byt-n2820/igt.log fi-hsw-4770 failed to collect. IGT log at Patchwork_4788/fi-hsw-4770/igt.log fi-hsw-4770r failed to collect. IGT log at Patchwork_4788/fi-hsw-4770r/igt.log fi-ilk-650 failed to collect. IGT log at Patchwork_4788/fi-ilk-650/igt.log fi-ivb-3520m failed to collect. IGT log at Patchwork_4788/fi-ivb-3520m/igt.log fi-ivb-3770 failed to collect. IGT log at Patchwork_4788/fi-ivb-3770/igt.log fi-kbl-7500u failed to collect. IGT log at Patchwork_4788/fi-kbl-7500u/igt.log fi-kbl-7560u failed to collect. IGT log at Patchwork_4788/fi-kbl-7560u/igt.log fi-skl-6260u failed to collect. IGT log at Patchwork_4788/fi-skl-6260u/igt.log fi-skl-6700hq failed to collect. IGT log at Patchwork_4788/fi-skl-6700hq/igt.log fi-skl-6700k failed to collect. IGT log at Patchwork_4788/fi-skl-6700k/igt.log fi-skl-6770hq failed to collect. IGT log at Patchwork_4788/fi-skl-6770hq/igt.log fi-snb-2520m failed to collect. IGT log at Patchwork_4788/fi-snb-2520m/igt.log fi-snb-2600 failed to collect. IGT log at Patchwork_4788/fi-snb-2600/igt.log

c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h-42m-41s UTC integration manifest a293db4 drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4788/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Re: ✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)

Hi,

Quoted 16 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Patchwork
Sent: Tuesday, May 23, 2017 10:27 PM
To: [email protected]; Nagaraju, Vathsala <[email protected]>
Cc: [email protected]
Subject: [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)
URL : https://patchwork.freedesktop.org/series/17737/
State : success

Quoted 8 lines

== Summary ==

Series 17737v2 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/2/mbox/

fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:434s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:438s

fi-bdw-5557u failed to collect. IGT log at Patchwork_4788/fi-bdw-5557u/igt.log

Something wrong in CI. This was just test to see if one occurrence but no. Investigating...

Quoted 18 lines

fi-bsw-n3050 failed to collect. IGT log at Patchwork_4788/fi-bsw-n3050/igt.log fi-bxt-j4205 failed to collect. IGT log at Patchwork_4788/fi-bxt-j4205/igt.log fi-byt-j1900 failed to collect. IGT log at Patchwork_4788/fi-byt-j1900/igt.log fi-byt-n2820 failed to collect. IGT log at Patchwork_4788/fi-byt-n2820/igt.log fi-hsw-4770 failed to collect. IGT log at Patchwork_4788/fi-hsw-4770/igt.log fi-hsw-4770r failed to collect. IGT log at Patchwork_4788/fi-hsw-4770r/igt.log fi-ilk-650 failed to collect. IGT log at Patchwork_4788/fi-ilk-650/igt.log fi-ivb- 3520m failed to collect. IGT log at Patchwork_4788/fi-ivb-3520m/igt.log fi-ivb-3770 failed to collect. IGT log at Patchwork_4788/fi-ivb-3770/igt.log fi-kbl-7500u failed to collect. IGT log at Patchwork_4788/fi-kbl-7500u/igt.log fi-kbl-7560u failed to collect. IGT log at Patchwork_4788/fi-kbl-7560u/igt.log fi-skl-6260u failed to collect. IGT log at Patchwork_4788/fi-skl-6260u/igt.log fi-skl-6700hq failed to collect. IGT log at Patchwork_4788/fi-skl-6700hq/igt.log fi-skl-6700k failed to collect. IGT log at Patchwork_4788/fi-skl-6700k/igt.log fi-skl-6770hq failed to collect. IGT log at Patchwork_4788/fi-skl-6770hq/igt.log fi-snb-2520m failed to collect. IGT log at Patchwork_4788/fi-snb-2520m/igt.log fi-snb-2600 failed to collect. IGT log at Patchwork_4788/fi-snb-2600/igt.log

Quoted 7 lines

c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h- 42m-41s UTC integration manifest
a293db4 drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4788/

Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)

In reply to vathsala nagaraju
== Series Details ==

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2)
URL : https://patchwork.freedesktop.org/series/17737/
State : success

== Summary ==

Series 17737v2 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/2/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                pass       -> FAIL       (fi-snb-2600) fdo#100007

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:445s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:431s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:589s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:513s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:495s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:487s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:416s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:413s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:418s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:498s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:465s
fi-kbl-7500u     total:278  pass:255  dwarn:5   dfail:0   fail:0   skip:18  time:464s
fi-kbl-7560u     total:278  pass:263  dwarn:5   dfail:0   fail:0   skip:10  time:569s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:459s
fi-skl-6700hq    total:278  pass:239  dwarn:0   dfail:1   fail:17  skip:21  time:435s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:464s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:499s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:442s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:528s
fi-snb-2600      total:278  pass:247  dwarn:1   dfail:0   fail:1   skip:29  time:409s

c8f2238b9cbfef358e61596cd49b1f648c85811e drm-tip: 2017y-05m-24d-08h-04m-41s UTC integration manifest 8d1f8d6 drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4796/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

PATCH 1/1 drm/i915/psr: disable psr2 for resolution greater than 32X20

In reply to vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

issue was introduced by
commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba" commit message: "PSR2 is restricted to work with panel resolutions upto 3200x2000, move the check to intel_psr_match_conditions and fully block psr."

v2: (Rodrigo)
Add previous commit details which introduced the issue

---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +3 -2
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

I believe we need to cc:stable on this right?!

Jani, is this ok to go ahead and merge after stable is cc'ed?

Quoted 46 lines · vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

issue was introduced by
commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba" commit message: "PSR2 is restricted to work with panel resolutions upto 3200x2000, move the check to intel_psr_match_conditions and fully block psr."

v2: (Rodrigo)
Add previous commit details which introduced the issue

---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +3 -3
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
        }
 
        /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-       if (intel_crtc->config->pipe_src_w > 3200 ||
-                               intel_crtc->config->pipe_src_h > 2000) {
+       if (dev_priv->psr.psr2_support &&
+           (intel_crtc->config->pipe_src_w > 3200 ||
+            intel_crtc->config->pipe_src_h > 2000)) {
                dev_priv->psr.psr2_support = false;
                return false;
        }
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#9 lore raw
Quoted 3 lines · Rodrigo Vivi

I believe we need to cc:stable on this right?!

Jani, is this ok to go ahead and merge after stable is cc'ed?

Please add this, and it'll all happen automagically.

Fixes acf45d11050a ("drm/i915/psr: disable psr2 for resolution greater than 32X20")
Cc Rodrigo Vivi <[email protected]>
Cc Jim Bride <[email protected]>
Cc Vathsala Nagaraju <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc <[email protected]> # v4.11+

BR,
Jani.

Quoted 49 lines
Quoted 46 lines · vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

issue was introduced by
commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba" commit message: "PSR2 is restricted to work with panel resolutions upto 3200x2000, move the check to intel_psr_match_conditions and fully block psr."

v2: (Rodrigo)
Add previous commit details which introduced the issue

---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +3 -3
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
        }
 
        /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-       if (intel_crtc->config->pipe_src_w > 3200 ||
-                               intel_crtc->config->pipe_src_h > 2000) {
+       if (dev_priv->psr.psr2_support &&
+           (intel_crtc->config->pipe_src_w > 3200 ||
+            intel_crtc->config->pipe_src_h > 2000)) {
                dev_priv->psr.psr2_support = false;
                return false;
        }
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

Patch merged to dinq, thanks.

I didn't put on fixes nor Cc'ed stable after chatting with Daniel about that. Since PSR is currently disabled on 4.11 there is no risk of this blowing anything nor changing the expected default behaviour.
So dinq seemed to be the right place for this patch.

Thanks,
Rodrigo.

Quoted 72 lines · Jani Nikula
Quoted 3 lines · Rodrigo Vivi

I believe we need to cc:stable on this right?!

Jani, is this ok to go ahead and merge after stable is cc'ed?

Please add this, and it'll all happen automagically.

Fixes acf45d11050a ("drm/i915/psr: disable psr2 for resolution greater than 32X20")
Cc Rodrigo Vivi <[email protected]>
Cc Jim Bride <[email protected]>
Cc Vathsala Nagaraju <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc <[email protected]> # v4.11+

BR,
Jani.

Quoted 45 lines
Quoted 42 lines · vathsala nagaraju

psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20.

issue was introduced by
commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba" commit message: "PSR2 is restricted to work with panel resolutions upto 3200x2000, move the check to intel_psr_match_conditions and fully block psr."

v2: (Rodrigo)
Add previous commit details which introduced the issue

---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +3 -3
index c3780d0..559f1ab 100644
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
        }
 
        /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-       if (intel_crtc->config->pipe_src_w > 3200 ||
-                               intel_crtc->config->pipe_src_h > 2000) {
+       if (dev_priv->psr.psr2_support &&
+           (intel_crtc->config->pipe_src_w > 3200 ||
+            intel_crtc->config->pipe_src_h > 2000)) {
                dev_priv->psr.psr2_support = false;
                return false;
        }
--

1.9.1

Quoted 4 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Jani Nikula, Intel Open Source Technology Center

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev3)

In reply to vathsala nagaraju
== Series Details ==

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev3)
URL : https://patchwork.freedesktop.org/series/17737/
State : success

== Summary ==

Series 17737v3 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/3/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                fail       -> PASS       (fi-snb-2600) fdo#100007
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                fail       -> PASS       (fi-snb-2600) fdo#100215

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
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:442s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:431s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:581s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:507s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:487s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:476s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:419s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:416s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:416s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:489s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:462s
fi-kbl-7500u     total:278  pass:255  dwarn:5   dfail:0   fail:0   skip:18  time:465s
fi-kbl-7560u     total:278  pass:263  dwarn:5   dfail:0   fail:0   skip:10  time:567s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:453s
fi-skl-6700hq    total:278  pass:239  dwarn:0   dfail:1   fail:17  skip:21  time:436s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:466s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:496s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:439s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:533s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:401s

028a0b3762b318a72ab04675355db97c854c230b drm-tip: 2017y-05m-25d-11h-47m-22s UTC integration manifest 162525b drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4810/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx