* [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 18:22 ` Chris Wilson
0 siblings, 0 replies; 11+ messages in thread
From: Chris Wilson @ 2019-11-20 18:22 UTC (permalink / raw)
To: intel-gfx; +Cc: kbuild-all
pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
both declared and defines.
Reported-by: kbuild-all@lists.01.org
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 060ee0f44c70..982040ecbd01 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -275,7 +275,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt)
static suspend_state_t pm_suspend_target(void)
{
-#if IS_ENABLED(CONFIG_PM_SLEEP)
+#if IS_ENABLED(CONFIG_SUSPEND) && IS_ENABLED(CONFIG_PM_SLEEP)
return pm_suspend_target_state;
#else
return PM_SUSPEND_TO_IDLE;
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 18:22 ` Chris Wilson
0 siblings, 0 replies; 11+ messages in thread
From: Chris Wilson @ 2019-11-20 18:22 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
both declared and defines.
Reported-by: kbuild-all(a)lists.01.org
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 060ee0f44c70..982040ecbd01 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -275,7 +275,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt)
static suspend_state_t pm_suspend_target(void)
{
-#if IS_ENABLED(CONFIG_PM_SLEEP)
+#if IS_ENABLED(CONFIG_SUSPEND) && IS_ENABLED(CONFIG_PM_SLEEP)
return pm_suspend_target_state;
#else
return PM_SUSPEND_TO_IDLE;
--
2.24.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Intel-gfx] [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 18:22 ` Chris Wilson
0 siblings, 0 replies; 11+ messages in thread
From: Chris Wilson @ 2019-11-20 18:22 UTC (permalink / raw)
To: intel-gfx; +Cc: kbuild-all
pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
both declared and defines.
Reported-by: kbuild-all@lists.01.org
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 060ee0f44c70..982040ecbd01 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -275,7 +275,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt)
static suspend_state_t pm_suspend_target(void)
{
-#if IS_ENABLED(CONFIG_PM_SLEEP)
+#if IS_ENABLED(CONFIG_SUSPEND) && IS_ENABLED(CONFIG_PM_SLEEP)
return pm_suspend_target_state;
#else
return PM_SUSPEND_TO_IDLE;
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 19:21 ` Joonas Lahtinen
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Lahtinen @ 2019-11-20 19:21 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: kbuild-all
Quoting Chris Wilson (2019-11-20 20:22:09)
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all@lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 19:21 ` Joonas Lahtinen
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Lahtinen @ 2019-11-20 19:21 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
Quoting Chris Wilson (2019-11-20 20:22:09)
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all(a)lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-20 19:21 ` Joonas Lahtinen
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Lahtinen @ 2019-11-20 19:21 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: kbuild-all
Quoting Chris Wilson (2019-11-20 20:22:09)
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all@lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BUILD: failure for drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-21 0:07 ` Patchwork
0 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-11-21 0:07 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
URL : https://patchwork.freedesktop.org/series/69775/
State : failure
== Summary ==
Applying: drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/gt/intel_gt_pm.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
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] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-21 0:07 ` Patchwork
0 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-11-21 0:07 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
URL : https://patchwork.freedesktop.org/series/69775/
State : failure
== Summary ==
Applying: drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/gt/intel_gt_pm.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
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] 11+ messages in thread
* Re: [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-21 9:52 ` Andi Shyti
0 siblings, 0 replies; 11+ messages in thread
From: Andi Shyti @ 2019-11-21 9:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, kbuild-all
Hi Chris,
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all@lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-21 9:52 ` Andi Shyti
0 siblings, 0 replies; 11+ messages in thread
From: Andi Shyti @ 2019-11-21 9:52 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
Hi Chris,
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all(a)lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state
@ 2019-11-21 9:52 ` Andi Shyti
0 siblings, 0 replies; 11+ messages in thread
From: Andi Shyti @ 2019-11-21 9:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, kbuild-all
Hi Chris,
> pm_suspend_target_state is declared under CONFIG_PM_SLEEP but only
> defined under CONFIG_SUSPEND. Play safe and only use the symbol if it is
> both declared and defines.
>
> Reported-by: kbuild-all@lists.01.org
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Fixes: a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-11-21 9:52 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-20 18:22 [PATCH] drm/i915/gt: Fixup config ifdeffery for pm_suspend_target_state Chris Wilson
2019-11-20 18:22 ` Chris Wilson
2019-11-20 18:22 ` [Intel-gfx] " Chris Wilson
2019-11-20 19:21 ` Joonas Lahtinen
2019-11-20 19:21 ` Joonas Lahtinen
2019-11-20 19:21 ` [Intel-gfx] " Joonas Lahtinen
2019-11-21 0:07 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-11-21 0:07 ` [Intel-gfx] " Patchwork
2019-11-21 9:52 ` [PATCH] " Andi Shyti
2019-11-21 9:52 ` Andi Shyti
2019-11-21 9:52 ` [Intel-gfx] " Andi Shyti
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.