From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fix VGA_DISP_DISABLE check
Date: Fri, 4 Oct 2013 11:07:19 -0700 [thread overview]
Message-ID: <20131004110719.08ba832e@jbarnes-desktop> (raw)
In-Reply-To: <1380907945-1994-1-git-send-email-ville.syrjala@linux.intel.com>
On Fri, 4 Oct 2013 20:32:25 +0300
ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> The VGACNTRL register contains a bunch of other stuff besides
> the VGA_DISP_DISABLE bit. When we write the register we always set those
> other bits to zero, so normally the current check would work.
>
> However on HSW disabling and re-enabling the power well will reset the
> VGACNTRL register to its default value, which has several of the other
> bits set as well.
>
> So only look at the VGA_DISP_DISABLE bit when checking whether the VGA
> plane needs re-disabling.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0ba0af4..925a387 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10659,7 +10659,7 @@ void i915_redisable_vga(struct drm_device *dev)
> (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)
> return;
>
> - if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {
> + if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
> DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
> i915_disable_vga(dev);
> i915_disable_vga_mem(dev);
Looks good.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, 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:[~2013-10-04 18:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 17:32 [PATCH] drm/i915: Fix VGA_DISP_DISABLE check ville.syrjala
2013-10-04 18:07 ` Jesse Barnes [this message]
2013-10-04 19:06 ` 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=20131004110719.08ba832e@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox