From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org,
Alban Browaeys <prahal@yahoo.com>,
stable@kernel.org
Subject: Re: [PATCH] drm/i915: Prevent a machine hang by checking crtc->active before loading lut
Date: Fri, 24 Feb 2012 09:27:44 -0800 [thread overview]
Message-ID: <20120224092744.65c77284@jbarnes-desktop> (raw)
In-Reply-To: <1330103565-2472-1-git-send-email-chris@chris-wilson.co.uk>
[-- Attachment #1.1: Type: text/plain, Size: 1327 bytes --]
On Fri, 24 Feb 2012 17:12:45 +0000
Chris Wilson <chris@chris-wilson.co.uk> wrote:
> From: Alban Browaeys <prahal@yahoo.com>
>
> Before loading the lut (gamma), check the active state of intel_crtc,
> otherwise at least on gen2 hang ensue.
>
> This is reproducible in Xorg via:
> xset dpms force off
> then
> xgamma -rgamma 2.0 # freeze.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44505
> Signed-off-by: Alban Browaeys <prahal@yahoo.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index cdcf99b..4b48de5 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6268,7 +6268,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
> int i;
>
> /* The clocks have to be on to load the palette. */
> - if (!crtc->enabled)
> + if (!crtc->enabled || !intel_crtc->active)
> return;
>
> /* use legacy palette for Ironlake */
Yeah seems reasonable, thanks Chris.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2012-02-24 17:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-24 17:12 [PATCH] drm/i915: Prevent a machine hang by checking crtc->active before loading lut Chris Wilson
2012-02-24 17:27 ` Jesse Barnes [this message]
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=20120224092744.65c77284@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=prahal@yahoo.com \
--cc=stable@kernel.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