fixup! drm/i915/display: Remaining changes to make xe compile
Subsystems (3)
PATCH 1/1 fixup! drm/i915/display: Remaining changes to make xe compile
The dsparb_lock may be coming back with [1] later, but adding it here is probably just a rebase leftover. Drop it.
[1] https://patchwork.freedesktop.org/patch/msgid/[email protected]
--- drivers/gpu/drm/i915/display/intel_display_core.h | 3 --- drivers/gpu/drm/i915/i915_driver.c | 1 - 2 files changed, 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +0 -3
@@ -264,9 +264,6 @@ struct intel_wm {*/ struct mutex wm_mutex; -/* protects DSPARB registers on pre-g4x/vlv/chv */ -spinlock_t dsparb_lock; -bool ipc_enabled; };
drivers/gpu/drm/i915/i915_driver.c +0 -1
@@ -215,7 +215,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);spin_lock_init (&dev_priv->display.fb_tracking.lock); -spin_lock_init (&dev_priv->display.wm.dsparb_lock);mutex_init (&dev_priv->display.backlight.lock);mutex_init (&dev_priv->sb_lock);
Signature · 1 line
2.39.2
Patchwork
CI[Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/i915/display: Remaining changes to make xe compile
== Series Details ==
== Series Details ==
Series: fixup! drm/i915/display: Remaining changes to make xe compile
URL : https://patchwork.freedesktop.org/series/117621/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: b35e2dccc fixup! drm/xe/display: Implement display support === git am output follows ===
Applying: fixup! drm/i915/display: Remaining changes to make xe compile
Patchwork
CI[Intel-xe] ✗ CI.KUnit: failure for fixup! drm/i915/display: Remaining changes to make xe compile
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: fixup! drm/i915/display: Remaining changes to make xe compile
URL : https://patchwork.freedesktop.org/series/117621/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig ERROR:root:make[1]: Entering directory '/kernel/.kunit'
***
*** The source tree is not clean, please run 'make ARCH=um mrproper'
*** in /kernel
***
make[1]: *** [/kernel/Makefile:646: outputmakefile] Error 1
make[1]: Leaving directory '/kernel/.kunit'
make: *** [Makefile:226: __sub-make] Error 2
[09:32:16] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig + cleanup ++ stat -c %u:%g /kernel + chown -R 1003:1003 /kernel
Quoted 4 lines · Jani Nikula
The
dsparb_lockmay be coming back with [1] later, but adding it here is probably just a rebase leftover. Drop it.[1] https://patchwork.freedesktop.org/patch/msgid/[email protected]
ouch...
Quoted 37 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_core.h | 3 --- drivers/gpu/drm/i915/i915_driver.c | 1 - 2 files changed, 4 deletions(-)drivers/gpu/drm/i915/display/intel_display_core.h +0
-3@@ -264,9 +264,6 @@ struct intel_wm {*/ struct mutex wm_mutex; -/* protects DSPARB registers on pre-g4x/vlv/chv */ -spinlock_t dsparb_lock; -bool ipc_enabled; };drivers/gpu/drm/i915/i915_driver.c +0
-1@@ -215,7 +215,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);spin_lock_init (&dev_priv->display.fb_tracking.lock); -spin_lock_init (&dev_priv->display.wm.dsparb_lock);mutex_init (&dev_priv->display.backlight.lock);mutex_init (&dev_priv->sb_lock);Signature · 1 line
2.39.2
Quoted 9 lines · Rodrigo Vivi
Quoted 4 lines · Jani Nikula
The
dsparb_lockmay be coming back with [1] later, but adding it here is probably just a rebase leftover. Drop it.[1] https://patchwork.freedesktop.org/patch/msgid/[email protected]
ouch...
Reviewed-by Rodrigo Vivi <[email protected]>
Thanks, pushed.
Quoted 39 lines
Quoted 39 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_core.h | 3 --- drivers/gpu/drm/i915/i915_driver.c | 1 - 2 files changed, 4 deletions(-)drivers/gpu/drm/i915/display/intel_display_core.h +0
-3@@ -264,9 +264,6 @@ struct intel_wm {*/ struct mutex wm_mutex; -/* protects DSPARB registers on pre-g4x/vlv/chv */ -spinlock_t dsparb_lock; -bool ipc_enabled; };drivers/gpu/drm/i915/i915_driver.c +0
-1@@ -215,7 +215,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);spin_lock_init (&dev_priv->display.fb_tracking.lock); -spin_lock_init (&dev_priv->display.wm.dsparb_lock);mutex_init (&dev_priv->display.backlight.lock);mutex_init (&dev_priv->sb_lock);Signature · 1 line
2.39.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center