From: Chris Wilson <chris@chris-wilson.co.uk>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH] drm/i915: re-init modeset hw state after gpu reset
Date: Tue, 10 Apr 2012 15:10:23 +0100 [thread overview]
Message-ID: <1334067022_346667@CP5-2952> (raw)
In-Reply-To: <1334065811-13697-1-git-send-email-daniel.vetter@ffwll.ch>
On Tue, 10 Apr 2012 15:50:11 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> After a gpu reset we need to re-init some of the hw state we only
> initialize when modeset is enabled, like rc6, hw contexts or render/GT
> core clock gating and workaround register settings.
>
> Note that this patch has a small change in the resume code:
> - rc6 on gen6+ is only restored for the modeset case (for more
> consistency with other callsites). This is no problem because recent
> kernels refuse to load drm/i915 without kms on gen6+
> - rc6/emon on ilk is only restored for the modeset case. This is no
> problem because rc6 is disabled by default on ilk, and ums on ilk
> has never really been a supported option outside of horrible rhel
> backports.
>
> v2: Chris Wilson noticed that we not only fail to restore the clock
> gating settings after gpu reset.
>
> v3: Move the call to modeset_init_hw in _reset out of the
> struct_mutext protected area - other callers don't hold it, too.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
I don't think it makes the locking any worse than it already is, but it
is becoming more and more suspect.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2012-04-10 14:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 12:39 [PATCH] drm/i915: re-run init_clock_gating after gpu reset Daniel Vetter
2012-04-10 12:53 ` Chris Wilson
2012-04-10 13:46 ` [PATCH] drm/i915: re-init modeset hw state " Daniel Vetter
2012-04-10 13:50 ` Daniel Vetter
2012-04-10 14:10 ` Chris Wilson [this message]
2012-04-11 10:09 ` Daniel Vetter
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=1334067022_346667@CP5-2952 \
--to=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/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