| Message ID | 1381945164-22093-1-git-send-email-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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;
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> --- drivers/gpu/drm/i915/intel_crt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)