From: Daniel Vetter <daniel@ffwll.ch>
To: Imre Deak <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: vlv: fix VGA hotplug after modeset
Date: Wed, 16 Oct 2013 22:03:12 +0200 [thread overview]
Message-ID: <20131016200311.GP4830@phenom.ffwll.local> (raw)
In-Reply-To: <1381945164-22093-1-git-send-email-imre.deak@intel.com>
On Wed, Oct 16, 2013 at 08:39:24PM +0300, Imre Deak wrote:
> Since
>
> commit 912d812e84cea8689a2bf3dd13b11dfe191f0f1e
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Thu Oct 11 20:08:23 2012 +0200
>
> drm/i915/crt: don't set HOTPLUG bits on !PCH
>
> on VLV we don't detect any VGA unplug event after a modeset, since there we
> reset the ADPA hotplug bits. Fix it by preserving the hotplug bits on VLV as
> well.
>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
Queued for -next (with a bikeshed to make it consistent with Chris'
equivalent fix in intel_crt_reset), thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_crt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index becb311..bd37685 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -274,7 +274,7 @@ static void intel_crt_mode_set(struct intel_encoder *encoder)
> struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode;
> u32 adpa;
>
> - if (HAS_PCH_SPLIT(dev))
> + if (HAS_PCH_SPLIT(dev) || IS_VALLEYVIEW(dev))
> adpa = ADPA_HOTPLUG_BITS;
> else
> adpa = 0;
> --
> 1.8.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
prev parent reply other threads:[~2013-10-16 20:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 17:39 [PATCH] drm/i915: vlv: fix VGA hotplug after modeset Imre Deak
2013-10-16 20:03 ` Daniel Vetter [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=20131016200311.GP4830@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=imre.deak@intel.com \
--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 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.