diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
| commit | 5f3dbedf2770cf6aeb5547b3c56734dee4e5186b (patch) | |
| tree | e4930f7f4fe27b06079d2df8072a2bdf6457c666 /drivers/gpu/drm/i915/intel_crt.c | |
| parent | 7a1fb5d06d3936c0982e2cf8b53b046244a9aad6 (diff) | |
| parent | 1055f9ddad093f54dfd708a0f976582034d4ce1a (diff) | |
| download | talos-op-linux-5f3dbedf2770cf6aeb5547b3c56734dee4e5186b.tar.gz talos-op-linux-5f3dbedf2770cf6aeb5547b3c56734dee4e5186b.zip | |
Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 2b6d44381c31..9bdd959260a5 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -41,7 +41,7 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode) temp = I915_READ(ADPA); temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE); - temp &= ~ADPA_DAC_ENABLE; + temp |= ADPA_DAC_ENABLE; switch(mode) { case DRM_MODE_DPMS_ON: @@ -158,7 +158,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) else tries = 1; hotplug_en = I915_READ(PORT_HOTPLUG_EN); - hotplug_en &= ~(CRT_HOTPLUG_MASK); + hotplug_en &= CRT_FORCE_HOTPLUG_MASK; hotplug_en |= CRT_HOTPLUG_FORCE_DETECT; if (IS_GM45(dev)) |
