From: Keith Packard <keithp@keithp.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Alan Stern <stern@rowland.harvard.edu>
Cc: Kernel development list <linux-kernel@vger.kernel.org>,
dri-devel@lists.freedesktop.org
Subject: Re: Oops in i915 intel_init_clock_gating
Date: Wed, 22 Jun 2011 11:12:51 -0700 [thread overview]
Message-ID: <yun4o3h68gs.fsf@aiko.keithp.com> (raw)
In-Reply-To: <20110615133256.113293a0@jbarnes-desktop>
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
On Wed, 15 Jun 2011 13:32:56 -0700, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 0defd42..a1a28fb 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -429,6 +429,9 @@ static int i915_drm_thaw(struct drm_device *dev)
> /* KMS EnterVT equivalent */
> if (drm_core_check_feature(dev, DRIVER_MODESET)) {
> mutex_lock(&dev->struct_mutex);
> +
> + intel_init_clock_gating(dev);
> +
> dev_priv->mm.suspended = 0;
>
> error = i915_gem_init_ringbuffer(dev);
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 60a94d2..b478d16 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -863,8 +863,6 @@ int i915_restore_state(struct drm_device *dev)
> I915_WRITE(IMR, dev_priv->saveIMR);
> }
>
> - intel_init_clock_gating(dev);
> -
> if (IS_IRONLAKE_M(dev)) {
> ironlake_enable_drps(dev);
> intel_init_emon(dev);
>
I haven't seen any comments as to whether this patch needs to be merged
into the kernel. Has anyone tested this?
--
keith.packard@intel.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2011-06-22 18:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-15 20:08 Oops in i915 intel_init_clock_gating Alan Stern
2011-06-15 20:32 ` Jesse Barnes
2011-06-15 21:14 ` Alan Stern
2011-06-22 18:12 ` Keith Packard [this message]
2011-06-22 19:04 ` Alan Stern
2011-06-23 16:52 ` Florian Mickler
2011-06-23 17:11 ` Alan Stern
-- strict thread matches above, loose matches on Subject: below --
2011-06-05 0:02 Scott Ashcroft
2011-06-05 6:22 ` Keith Packard
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=yun4o3h68gs.fsf@aiko.keithp.com \
--to=keithp@keithp.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox