[PATCH] drm/xe: Fix merge fails related to display runtime PM

[PATCH] drm/xe: Fix merge fails related to display runtime PM

[Maarten Lankhorst]

The most recent merge commits introduced some fails to drm/drm-next,
I've noticed these when looking at the xe patches.

Solve it!

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 2 --
 drivers/gpu/drm/xe/xe_pm.c              | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 78a884ddd499a..710b1e2170c13 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -341,8 +341,6 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
 
 	xe_display_flush_cleanup_work(xe);
 
-	xe_display_flush_cleanup_work(xe);
-
 	intel_dp_mst_suspend(xe);
 
 	intel_hpd_cancel_work(xe);
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 2e2accd76fb2b..39e0a8774a104 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -392,8 +392,6 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
 	xe_display_pm_runtime_suspend(xe);
 
 	if (xe->d3cold.allowed) {
-		xe_display_pm_suspend(xe, true);
-
 		err = xe_bo_evict_all(xe);
 		if (err)
 			goto out;
@@ -411,7 +409,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
 		xe_display_pm_suspend_late(xe);
 out:
 	if (err)
-		xe_display_pm_resume(xe, true);
+		xe_display_pm_runtime_resume(xe);
 	xe_rpm_lockmap_release(xe);
 	xe_pm_write_callback_task(xe, NULL);
 	return err;
-- 
2.45.2

✗ CI.Patch_applied: failure for drm/xe: Fix merge fails related to display runtime PM

[Patchwork]

== Series Details ==

Series: drm/xe: Fix merge fails related to display runtime PM
URL   : https://patchwork.freedesktop.org/series/138087/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 007f07b7fe11 drm-tip: 2024y-09m-02d-09h-54m-49s UTC integration manifest
=== git am output follows ===
error: patch failed: drivers/gpu/drm/xe/display/xe_display.c:341
error: drivers/gpu/drm/xe/display/xe_display.c: patch does not apply
error: patch failed: drivers/gpu/drm/xe/xe_pm.c:392
error: drivers/gpu/drm/xe/xe_pm.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Applying: drm/xe: Fix merge fails related to display runtime PM
Patch failed at 0001 drm/xe: Fix merge fails related to display runtime PM

Re: [PATCH] drm/xe: Fix merge fails related to display runtime PM

[Daniel Vetter]

On Mon, Sep 02, 2024 at 01:20:02PM +0200, Maarten Lankhorst wrote:
> The most recent merge commits introduced some fails to drm/drm-next,
> I've noticed these when looking at the xe patches.
> 
> Solve it!
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

I dropped the first hunk, since that was broken in drm-tip too. So
separate bugfix that should go in with proper review and Fixes: tag and
all that imo.

Otherwise with this drm-next now matches what was in drm-tip.

Thanks for the quick fix!

Cheers, Sima
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 2 --
>  drivers/gpu/drm/xe/xe_pm.c              | 4 +---
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 78a884ddd499a..710b1e2170c13 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -341,8 +341,6 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
>  
>  	xe_display_flush_cleanup_work(xe);
>  
> -	xe_display_flush_cleanup_work(xe);
> -
>  	intel_dp_mst_suspend(xe);
>  
>  	intel_hpd_cancel_work(xe);
> diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
> index 2e2accd76fb2b..39e0a8774a104 100644
> --- a/drivers/gpu/drm/xe/xe_pm.c
> +++ b/drivers/gpu/drm/xe/xe_pm.c
> @@ -392,8 +392,6 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
>  	xe_display_pm_runtime_suspend(xe);
>  
>  	if (xe->d3cold.allowed) {
> -		xe_display_pm_suspend(xe, true);
> -
>  		err = xe_bo_evict_all(xe);
>  		if (err)
>  			goto out;
> @@ -411,7 +409,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
>  		xe_display_pm_suspend_late(xe);
>  out:
>  	if (err)
> -		xe_display_pm_resume(xe, true);
> +		xe_display_pm_runtime_resume(xe);
>  	xe_rpm_lockmap_release(xe);
>  	xe_pm_write_callback_task(xe, NULL);
>  	return err;
> -- 
> 2.45.2
> 

-- 
Simona Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch