✗ Ro.CI.BAT: failure for series starting with [01/28] drm/i915: Keep RP SW Mode enabled while disabling rps

[Patchwork]

== Series Details ==

Series: series starting with [01/28] drm/i915: Keep RP SW Mode enabled while disabling rps
URL   : https://patchwork.freedesktop.org/series/9574/
State : failure

== Summary ==

Applying: drm/i915: Remove RPM suspend dependency on rps.enabled and related changes
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Applying: drm/i915/slpc: Expose guc functions for use with SLPC
Applying: drm/i915/slpc: Add has_slpc capability flag
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Applying: drm/i915/slpc: Add SKL SLPC Support
Applying: drm/i915/slpc: Add enable_slpc module parameter
Applying: drm/i915/slpc: Sanitize SLPC version
Applying: drm/i915/slpc: Use intel_slpc_* functions if supported
Applying: drm/i915/slpc: Enable SLPC in guc if supported
Applying: drm/i915/slpc: If using SLPC, do not set frequency
Applying: drm/i915/slpc: Allocate/Release/Initialize SLPC shared data
Applying: drm/i915/slpc: Setup rps frequency values during SLPC enabling
Applying: drm/i915/slpc: Update current requested frequency
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_sysfs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_sysfs.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Applying: drm/i915/slpc: Send reset event
Applying: drm/i915/slpc: Send shutdown event
Applying: drm/i915/slpc: Add Display mode event related data structures
Applying: drm/i915/slpc: Notification of Display mode change
Applying: drm/i915/slpc: Notification of Refresh Rate change
Applying: drm/i915/slpc: Add slpc_status enum values
Applying: drm/i915/slpc: Add parameter unset/set/get functions
Applying: drm/i915/slpc: Add slpc support for max/min freq
Applying: drm/i915/slpc: Add enable/disable debugfs for slpc
Applying: drm/i915/slpc: Add i915_slpc_info to debugfs
Applying: drm/i915/slpc: Add broxton support
Applying: drm/i915/slpc: Enable SLPC, where supported
Applying: drm/i915: Check GuC load status for Host to GuC action and SLPC status
Applying: drm/i915: Mark GuC load status as PENDING in i915_drm_resume_early
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
Patch failed at 0027 drm/i915: Mark GuC load status as PENDING in i915_drm_resume_early
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".