From e57669ed08e898d1bbad49200978c47cc91b16a2 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 11 Oct 2012 20:08:23 +0200 Subject: [PATCH] --- yaml --- r: 345123 b: refs/heads/master c: 912d812e84cea8689a2bf3dd13b11dfe191f0f1e h: refs/heads/master i: 345121: dd0fa2f7fecd9783e038c7e7326da0aef598bd85 345119: 2f2e29948b1f08e544673cf56461685a7d905c37 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cfce54554670..a99bcd6649e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c630119f43471a8ece356b01dabf07f944f453b3 +refs/heads/master: 912d812e84cea8689a2bf3dd13b11dfe191f0f1e diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c index c42b9809f86d..46c90f532f9c 100644 --- a/trunk/drivers/gpu/drm/i915/intel_crt.c +++ b/trunk/drivers/gpu/drm/i915/intel_crt.c @@ -235,7 +235,11 @@ static void intel_crt_mode_set(struct drm_encoder *encoder, dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK); } - adpa = ADPA_HOTPLUG_BITS; + if (HAS_PCH_SPLIT(dev)) + adpa = ADPA_HOTPLUG_BITS; + else + adpa = 0; + if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) adpa |= ADPA_HSYNC_ACTIVE_HIGH; if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)