diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-07-09 14:53:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-07-09 14:53:47 +1000 |
| commit | 2556341f8baf0e0b7b5f7843135e43e662751af0 (patch) | |
| tree | 84b591787aa036959e56c490b38dbf9e191c76dd /linux-core/dvo_ivch.c | |
| parent | 38a5f6686cd38d5204e240f30006538bcf70f5ac (diff) | |
| parent | 0b7d9a97bd2383fe4382fc1b1b266542020f0c4e (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/dvo_ivch.c')
| -rw-r--r-- | linux-core/dvo_ivch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/dvo_ivch.c b/linux-core/dvo_ivch.c index 5af7a9b1..788b0721 100644 --- a/linux-core/dvo_ivch.c +++ b/linux-core/dvo_ivch.c @@ -321,13 +321,13 @@ static void ivch_dpms(struct intel_dvo_device *dvo, int mode) if (!ivch_read(dvo, VR01, &vr01)) return; - if (mode == DPMSModeOn) + if (mode == DRM_MODE_DPMS_ON) backlight = 1; else backlight = 0; ivch_write(dvo, VR80, backlight); - if (mode == DPMSModeOn) + if (mode == DRM_MODE_DPMS_ON) vr01 |= VR01_LCD_ENABLE | VR01_DVO_ENABLE; else vr01 &= ~(VR01_LCD_ENABLE | VR01_DVO_ENABLE); @@ -339,7 +339,7 @@ static void ivch_dpms(struct intel_dvo_device *dvo, int mode) if (!ivch_read(dvo, VR30, &vr30)) break; - if (((vr30 & VR30_PANEL_ON) != 0) == (mode == DPMSModeOn)) + if (((vr30 & VR30_PANEL_ON) != 0) == (mode == DRM_MODE_DPMS_ON)) break; udelay(1000); } |