Skip to contentSkip to conversation

fixup! drm/i915/display: Remaining changes to make xe compile

PATCH In review Jani Nikula 3 participants 5 messages May 11, 2023 – May 17, 2023

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

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
index 437f623337e3..e36f88a39b86 100644
@@ -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
index 5d302602793c..12ba7cf78b1e 100644
@@ -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
#1 lore raw

[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

#2 lore raw

[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
Reviewed-by on v1 1/1
#3 lore raw
In reply to Jani Nikula
Quoted 4 lines · Jani Nikula

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]

ouch...

Quoted 37 lines
---
 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
index 437f623337e3..e36f88a39b86 100644
@@ -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
index 5d302602793c..12ba7cf78b1e 100644
@@ -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
#4 lore raw
Quoted 9 lines · Rodrigo Vivi
Quoted 4 lines · Jani Nikula

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]

ouch...

Thanks, pushed.

Quoted 39 lines
Quoted 39 lines
---
 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
index 437f623337e3..e36f88a39b86 100644
@@ -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
index 5d302602793c..12ba7cf78b1e 100644
@@ -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