From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>,
Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Unhook legacy suspend/resume when KMS is enabled
Date: Tue, 25 Aug 2015 19:41:00 +0300 [thread overview]
Message-ID: <87bndvuxr7.fsf@intel.com> (raw)
In-Reply-To: <20150825143338.GK20434@phenom.ffwll.local>
On Tue, 25 Aug 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Aug 25, 2015 at 10:51:10AM +0200, Patrik Jakobsson wrote:
>> It's not allowed to have legacy suspend/resume hooked up when
>> DRIVER_MODESET is set. Doing so results in a warning introduced by the
>> commit below.
>>
>> commit e8b4855b5dd3e285d0ec18ed15468025abc1be9a
>> Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>> Date: Thu Aug 13 17:06:39 2015 -0300
>>
>> drm: WARN_ON if a modeset driver uses legacy suspend/resume helpers
>>
>> Legacy s/r hooks are only used for shadow-attaching drivers, warn
>> when a KMS driver tries to use them.
>>
>> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> Signed-off-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
>
> There is no legacy KMS any more, please just kill the hooks entirely.
http://mid.gmane.org/55D1B0C6.3030906@linux.intel.com
BR,
Jani.
> -Daniel
>
>> ---
>> drivers/gpu/drm/i915/i915_drv.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 1d88745..6e3391c 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1706,6 +1706,12 @@ static int __init i915_init(void)
>> if (i915.modeset == 0)
>> driver.driver_features &= ~DRIVER_MODESET;
>>
>> + /* Unhook legacy suspend and resume when KMS is enabled */
>> + if (driver.driver_features & DRIVER_MODESET) {
>> + driver.suspend = NULL;
>> + driver.resume = NULL;
>> + }
>> +
>> #ifdef CONFIG_VGA_CONSOLE
>> if (vgacon_text_force() && i915.modeset == -1)
>> driver.driver_features &= ~DRIVER_MODESET;
>> --
>> 2.1.4
>>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-08-25 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 8:51 [PATCH] drm/i915: Unhook legacy suspend/resume when KMS is enabled Patrik Jakobsson
2015-08-25 14:33 ` Daniel Vetter
2015-08-25 16:41 ` Jani Nikula [this message]
2015-08-25 18:22 ` Patrik Jakobsson
2015-08-29 7:00 ` shuang.he
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bndvuxr7.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patrik.jakobsson@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.