[PATCH 0/3] Fixes for PSR work implementation

[PATCH 0/3] Fixes for PSR work implementation

[Jouni Högander]

This patch set is fixing couple of issues in PSR work implementation:

1. Do not re-activate PSR in case pause_counter > 0
2. Do not re-activate PSR if disabled due to PSR aux error

Add also drm_WARN_ON if disabled PSR is being activated.

Jouni Högander (3):
  drm/i915/psr: drm_WARN_ON when activating disabled PSR
  drm/i915/psr: Do not activate disabled PSR on irq_aux_error
  drm/i915/psr: Check pause counter before continuing to PSR activation

 drivers/gpu/drm/i915/display/intel_psr.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-- 
2.43.0

[PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating disabled PSR

[Jouni Högander]

Add drm_WARN_ON for scenario where PSR is activated while it is disabled.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 8bea2b8188a7..226d4d1c7c82 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1787,6 +1787,8 @@ static void intel_psr_activate(struct intel_dp *intel_dp)
 
 	drm_WARN_ON(display->drm, intel_dp->psr.active);
 
+	drm_WARN_ON(display->drm, !intel_dp->psr.enabled);
+
 	lockdep_assert_held(&intel_dp->psr.lock);
 
 	/* psr1, psr2 and panel-replay are mutually exclusive.*/
-- 
2.43.0

[PATCH 2/3] drm/i915/psr: Do not activate disabled PSR on irq_aux_error

[Jouni Högander]

Currently intel_psr_work is continuing to activation of PSR which was just
disabled when irq_aux_error == true.

Fix this by skipping everything else than intel_psr_handle_irq in
intel_psr_work when irq_aux_error == true.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 226d4d1c7c82..3930d28e3486 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -3209,8 +3209,10 @@ static void intel_psr_work(struct work_struct *work)
 	if (!intel_dp->psr.enabled)
 		goto unlock;
 
-	if (READ_ONCE(intel_dp->psr.irq_aux_error))
+	if (READ_ONCE(intel_dp->psr.irq_aux_error)) {
 		intel_psr_handle_irq(intel_dp);
+		goto unlock;
+	}
 
 	/*
 	 * We have to make sure PSR is ready for re-enable
-- 
2.43.0

[PATCH 3/3] drm/i915/psr: Check pause counter before continuing to PSR activation

[Jouni Högander]

Currently intel_psr_work is re-activating PSR even when pause_counter > 0
which is incorrect. Fix this by checking pause_counter before re-activating
PSR.

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14822
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 3930d28e3486..c6715dd44418 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -3214,6 +3214,9 @@ static void intel_psr_work(struct work_struct *work)
 		goto unlock;
 	}
 
+	if (intel_dp->psr.pause_counter)
+		goto unlock;
+
 	/*
 	 * We have to make sure PSR is ready for re-enable
 	 * otherwise it keeps disabled until next full enable/disable cycle.
-- 
2.43.0

✗ i915.CI.BAT: failure for Fixes for PSR work implementation

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 5696 bytes --]

== Series Details ==

Series: Fixes for PSR work implementation
URL   : https://patchwork.freedesktop.org/series/152981/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_17005 -> Patchwork_152981v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_152981v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_152981v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/index.html

Participating hosts (43 -> 42)
------------------------------

  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_152981v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@mman:
    - bat-mtlp-8:         NOTRUN -> [INCOMPLETE][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-mtlp-8/igt@i915_selftest@live@mman.html

  
Known issues
------------

  Here are the changes found in Patchwork_152981v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@dmabuf@all-tests:
    - bat-apl-1:          [PASS][2] -> [ABORT][3] ([i915#12904]) +1 other test abort
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-apl-1/igt@dmabuf@all-tests.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-apl-1/igt@dmabuf@all-tests.html

  * igt@gem_lmem_swapping@parallel-random-engines:
    - bat-mtlp-8:         NOTRUN -> [SKIP][4] ([i915#4613]) +3 other tests skip
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-mtlp-8/igt@gem_lmem_swapping@parallel-random-engines.html
    - bat-arlh-3:         NOTRUN -> [SKIP][5] ([i915#11671]) +3 other tests skip
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-arlh-3/igt@gem_lmem_swapping@parallel-random-engines.html

  * igt@i915_selftest@live:
    - bat-mtlp-8:         NOTRUN -> [INCOMPLETE][6] ([i915#14765])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-mtlp-8/igt@i915_selftest@live.html

  * igt@i915_selftest@live@guc_multi_lrc:
    - bat-dg2-11:         [PASS][7] -> [ABORT][8] ([i915#14201])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-dg2-11/igt@i915_selftest@live@guc_multi_lrc.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-dg2-11/igt@i915_selftest@live@guc_multi_lrc.html

  * igt@i915_selftest@live@workarounds:
    - bat-arlh-3:         NOTRUN -> [DMESG-FAIL][9] ([i915#12061]) +1 other test dmesg-fail
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-arlh-3/igt@i915_selftest@live@workarounds.html
    - bat-dg2-14:         [PASS][10] -> [DMESG-FAIL][11] ([i915#12061]) +1 other test dmesg-fail
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-dg2-14/igt@i915_selftest@live@workarounds.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-dg2-14/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@core_hotunplug@unbind-rebind:
    - bat-mtlp-8:         [ABORT][12] ([i915#14804]) -> [PASS][13]
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-mtlp-8/igt@core_hotunplug@unbind-rebind.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-mtlp-8/igt@core_hotunplug@unbind-rebind.html

  * igt@dmabuf@all-tests@dma_fence_chain:
    - fi-bsw-n3050:       [INCOMPLETE][14] ([i915#12904]) -> [PASS][15] +1 other test pass
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/fi-bsw-n3050/igt@dmabuf@all-tests@dma_fence_chain.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/fi-bsw-n3050/igt@dmabuf@all-tests@dma_fence_chain.html

  * igt@i915_module_load@reload:
    - bat-arlh-3:         [ABORT][16] ([i915#14804]) -> [PASS][17]
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-arlh-3/igt@i915_module_load@reload.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-arlh-3/igt@i915_module_load@reload.html

  
#### Warnings ####

  * igt@i915_selftest@live:
    - bat-dg2-11:         [DMESG-FAIL][18] ([i915#12061]) -> [ABORT][19] ([i915#12061])
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17005/bat-dg2-11/igt@i915_selftest@live.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/bat-dg2-11/igt@i915_selftest@live.html

  
  [i915#11671]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11671
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#12904]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12904
  [i915#14201]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14201
  [i915#14765]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14765
  [i915#14804]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14804
  [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613


Build changes
-------------

  * Linux: CI_DRM_17005 -> Patchwork_152981v1

  CI-20190529: 20190529
  CI_DRM_17005: 64e4d78f789527aa9c5cb94395c3387443ba6da5 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8494: 8494
  Patchwork_152981v1: 64e4d78f789527aa9c5cb94395c3387443ba6da5 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v1/index.html

[-- Attachment #2: Type: text/html, Size: 6928 bytes --]

✓ i915.CI.BAT: success for Fixes for PSR work implementation (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

== Series Details ==

Series: Fixes for PSR work implementation (rev2)
URL   : https://patchwork.freedesktop.org/series/152981/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_17020 -> Patchwork_152981v2
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v2/index.html

Participating hosts (43 -> 42)
------------------------------

  Missing    (1): fi-snb-2520m 


Changes
-------

  No changes found


Build changes
-------------

  * Linux: CI_DRM_17020 -> Patchwork_152981v2

  CI-20190529: 20190529
  CI_DRM_17020: e96ac495247bb459351af3e70cad06769afbb1a2 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8495: b412b144685feadfd5675f3108de3d6820a4d1db @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_152981v2: e96ac495247bb459351af3e70cad06769afbb1a2 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_152981v2/index.html

[-- Attachment #2: Type: text/html, Size: 1644 bytes --]

✓ i915.CI.Full: success for Fixes for PSR work implementation (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 1133 bytes --]

== Series Details ==

Series: Fixes for PSR work implementation (rev2)
URL   : https://patchwork.freedesktop.org/series/152981/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_17020_full -> Patchwork_152981v2_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Participating hosts (14 -> 14)
------------------------------

  Additional (1): shard-snb-0 
  Missing    (1): shard-dg2-set2 


Changes
-------

  No changes found


Build changes
-------------

  * Linux: CI_DRM_17020 -> Patchwork_152981v2

  CI-20190529: 20190529
  CI_DRM_17020: e96ac495247bb459351af3e70cad06769afbb1a2 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8495: b412b144685feadfd5675f3108de3d6820a4d1db @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_152981v2: e96ac495247bb459351af3e70cad06769afbb1a2 @ 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_152981v2/index.html

[-- Attachment #2: Type: text/html, Size: 1702 bytes --]

RE: [PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating disabled PSR

[Kahola, Mika]

> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jouni Högander
> Sent: Friday, 15 August 2025 11.46
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Hogander, Jouni <jouni.hogander@intel.com>
> Subject: [PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating disabled PSR
> 
> Add drm_WARN_ON for scenario where PSR is activated while it is disabled.
> 

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_psr.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 8bea2b8188a7..226d4d1c7c82 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1787,6 +1787,8 @@ static void intel_psr_activate(struct intel_dp *intel_dp)
> 
>  	drm_WARN_ON(display->drm, intel_dp->psr.active);
> 
> +	drm_WARN_ON(display->drm, !intel_dp->psr.enabled);
> +
>  	lockdep_assert_held(&intel_dp->psr.lock);
> 
>  	/* psr1, psr2 and panel-replay are mutually exclusive.*/
> --
> 2.43.0

RE: [PATCH 2/3] drm/i915/psr: Do not activate disabled PSR on irq_aux_error

[Kahola, Mika]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jouni Högander
> Sent: Friday, 15 August 2025 11.46
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Hogander, Jouni <jouni.hogander@intel.com>
> Subject: [PATCH 2/3] drm/i915/psr: Do not activate disabled PSR on irq_aux_error
> 
> Currently intel_psr_work is continuing to activation of PSR which was just disabled when irq_aux_error == true.
> 
> Fix this by skipping everything else than intel_psr_handle_irq in intel_psr_work when irq_aux_error == true.
> 

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_psr.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 226d4d1c7c82..3930d28e3486 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -3209,8 +3209,10 @@ static void intel_psr_work(struct work_struct *work)
>  	if (!intel_dp->psr.enabled)
>  		goto unlock;
> 
> -	if (READ_ONCE(intel_dp->psr.irq_aux_error))
> +	if (READ_ONCE(intel_dp->psr.irq_aux_error)) {
>  		intel_psr_handle_irq(intel_dp);
> +		goto unlock;
> +	}
> 
>  	/*
>  	 * We have to make sure PSR is ready for re-enable
> --
> 2.43.0

RE: [PATCH 3/3] drm/i915/psr: Check pause counter before continuing to PSR activation

[Kahola, Mika]

> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jouni Högander
> Sent: Friday, 15 August 2025 11.46
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Hogander, Jouni <jouni.hogander@intel.com>
> Subject: [PATCH 3/3] drm/i915/psr: Check pause counter before continuing to PSR activation
> 
> Currently intel_psr_work is re-activating PSR even when pause_counter > 0 which is incorrect. Fix this by checking pause_counter
> before re-activating PSR.
> 
> Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14822

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_psr.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 3930d28e3486..c6715dd44418 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -3214,6 +3214,9 @@ static void intel_psr_work(struct work_struct *work)
>  		goto unlock;
>  	}
> 
> +	if (intel_dp->psr.pause_counter)
> +		goto unlock;
> +
>  	/*
>  	 * We have to make sure PSR is ready for re-enable
>  	 * otherwise it keeps disabled until next full enable/disable cycle.
> --
> 2.43.0

Re: [PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating disabled PSR

[Hogander, Jouni]

On Wed, 2025-08-20 at 10:19 +0000, Kahola, Mika wrote:
> > -----Original Message-----
> > From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf
> > Of Jouni Högander
> > Sent: Friday, 15 August 2025 11.46
> > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> > Cc: Hogander, Jouni <jouni.hogander@intel.com>
> > Subject: [PATCH 1/3] drm/i915/psr: drm_WARN_ON when activating
> > disabled PSR
> > 
> > Add drm_WARN_ON for scenario where PSR is activated while it is
> > disabled.
> > 
> 
> Reviewed-by: Mika Kahola <mika.kahola@intel.com>

Thank you Mika for the review. These are now pushed to drm-intel-next.

BR,

Jouni Högander

> 
> > Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_psr.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> > b/drivers/gpu/drm/i915/display/intel_psr.c
> > index 8bea2b8188a7..226d4d1c7c82 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -1787,6 +1787,8 @@ static void intel_psr_activate(struct
> > intel_dp *intel_dp)
> > 
> >  	drm_WARN_ON(display->drm, intel_dp->psr.active);
> > 
> > +	drm_WARN_ON(display->drm, !intel_dp->psr.enabled);
> > +
> >  	lockdep_assert_held(&intel_dp->psr.lock);
> > 
> >  	/* psr1, psr2 and panel-replay are mutually exclusive.*/
> > --
> > 2.43.0
>