[Intel-gfx] linux-next: Tree for Nov 19 (i915)

[Randy Dunlap]

On 11/20/19 8:56 AM, Chris Wilson wrote:
> Quoting Jani Nikula (2019-11-20 16:15:08)
>> On Tue, 19 Nov 2019, Randy Dunlap <rdunlap at infradead.org> wrote:
>>> On 11/19/19 12:46 AM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20191118:
>>>
>>>
>>> on x86_64:
>>>
>>> ERROR: "pm_suspend_target_state" [drivers/gpu/drm/i915/i915.ko] undefined!
>>>
>>> # CONFIG_SUSPEND is not set
>>
>> a70a9e998e8e ("drm/i915: Defer rc6 shutdown to suspend_late")
> 
> 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)
> 
> Declared under PM_SLEEP.
> Defined under SUSPEND.
> -Chris

Aside from being a slightly incomplete patch (missing 3 ending context lines),
this works fine.  Thanks.

Acked-by: Randy Dunlap <rdunlap at infradead.org> # build-tested

-- 
~Randy