Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [Intel-gfx] linux-next: Tree for Nov 19 (i915)
To:     Chris Wilson <chris@chris-wilson.co.uk>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     intel-gfx <intel-gfx@lists.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        dri-devel <dri-devel@lists.freedesktop.org>
References: <20191119194658.39af50d0@canb.auug.org.au>
 <1d30acd4-9947-d228-967f-c4e76ebca832@infradead.org>
 <87k17uwmlv.fsf@intel.com>
 <157426899658.13839.6346197595846229766@skylake-alporthouse-com>
From:   Randy Dunlap <rdunlap@infradead.org>
Message-ID: <fd7a54c4-99b4-abb2-15d1-96324fdff111@infradead.org>
Date:   Wed, 20 Nov 2019 13:54:29 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.1.1
MIME-Version: 1.0
In-Reply-To: <157426899658.13839.6346197595846229766@skylake-alporthouse-com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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@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@infradead.org> # build-tested

-- 
~Randy