All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/selftests: Fix runtime PM imbalance on error
@ 2020-05-24  2:08 ` Dinghao Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Dinghao Liu @ 2020-05-24  2:08 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
	Daniel Vetter, Chris Wilson, Tvrtko Ursulin, Matthew Auld,
	Andi Shyti, Mika Kuoppala, Daniele Ceraolo Spurio,
	Abdiel Janulgue, intel-gfx, dri-devel, linux-kernel

When drm_dev_init() returns an error code, a pairing
runtime PM usage counter decrement is needed to keep
the counter balanced. For error paths after this call,
things are the same.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 754d0eb6beaa..fdf01461acc6 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -200,6 +200,7 @@ struct drm_i915_private *mock_gem_device(void)
 	drm_mode_config_cleanup(&i915->drm);
 	drm_dev_fini(&i915->drm);
 put_device:
+	pm_runtime_put_noidle(&pdev->dev);
 	put_device(&pdev->dev);
 err:
 	return NULL;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] drm/i915/selftests: Fix runtime PM imbalance on error
@ 2020-05-24  2:08 ` Dinghao Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Dinghao Liu @ 2020-05-24  2:08 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Abdiel Janulgue, Andi Shyti, dri-devel, Tvrtko Ursulin,
	David Airlie, Mika Kuoppala, intel-gfx, linux-kernel,
	Chris Wilson, Daniele Ceraolo Spurio, Matthew Auld, Rodrigo Vivi

When drm_dev_init() returns an error code, a pairing
runtime PM usage counter decrement is needed to keep
the counter balanced. For error paths after this call,
things are the same.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 754d0eb6beaa..fdf01461acc6 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -200,6 +200,7 @@ struct drm_i915_private *mock_gem_device(void)
 	drm_mode_config_cleanup(&i915->drm);
 	drm_dev_fini(&i915->drm);
 put_device:
+	pm_runtime_put_noidle(&pdev->dev);
 	put_device(&pdev->dev);
 err:
 	return NULL;
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/selftests: Fix runtime PM imbalance on error
@ 2020-05-24  2:08 ` Dinghao Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Dinghao Liu @ 2020-05-24  2:08 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Abdiel Janulgue, dri-devel, David Airlie, intel-gfx,
	linux-kernel, Chris Wilson, Matthew Auld

When drm_dev_init() returns an error code, a pairing
runtime PM usage counter decrement is needed to keep
the counter balanced. For error paths after this call,
things are the same.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 754d0eb6beaa..fdf01461acc6 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -200,6 +200,7 @@ struct drm_i915_private *mock_gem_device(void)
 	drm_mode_config_cleanup(&i915->drm);
 	drm_dev_fini(&i915->drm);
 put_device:
+	pm_runtime_put_noidle(&pdev->dev);
 	put_device(&pdev->dev);
 err:
 	return NULL;
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/selftests: Fix runtime PM imbalance on error
  2020-05-24  2:08 ` Dinghao Liu
  (?)
  (?)
@ 2020-05-26 17:05 ` Patchwork
  -1 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-05-26 17:05 UTC (permalink / raw)
  To: Dinghao Liu; +Cc: intel-gfx

== Series Details ==

Series: drm/i915/selftests: Fix runtime PM imbalance on error
URL   : https://patchwork.freedesktop.org/series/77667/
State : failure

== Summary ==

Applying: drm/i915/selftests: Fix runtime PM imbalance on error
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/selftests/mock_gem_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/selftests: Fix runtime PM imbalance on error
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".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-26 17:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-24  2:08 [PATCH] drm/i915/selftests: Fix runtime PM imbalance on error Dinghao Liu
2020-05-24  2:08 ` [Intel-gfx] " Dinghao Liu
2020-05-24  2:08 ` Dinghao Liu
2020-05-26 17:05 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.