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_ch7xxx.c | |
| parent | 38a5f6686cd38d5204e240f30006538bcf70f5ac (diff) | |
| parent | 0b7d9a97bd2383fe4382fc1b1b266542020f0c4e (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/dvo_ch7xxx.c')
| -rw-r--r-- | linux-core/dvo_ch7xxx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/dvo_ch7xxx.c b/linux-core/dvo_ch7xxx.c index f9beac0b..77c86395 100644 --- a/linux-core/dvo_ch7xxx.c +++ b/linux-core/dvo_ch7xxx.c @@ -289,10 +289,10 @@ static void ch7xxx_mode_set(struct intel_dvo_device *dvo, ch7xxx_readb(dvo, CH7xxx_IDF, &idf); idf &= ~(CH7xxx_IDF_HSP | CH7xxx_IDF_VSP); - if (mode->flags & V_PHSYNC) + if (mode->flags & DRM_MODE_FLAG_PHSYNC) idf |= CH7xxx_IDF_HSP; - if (mode->flags & V_PVSYNC) + if (mode->flags & DRM_MODE_FLAG_PVSYNC) idf |= CH7xxx_IDF_HSP; ch7xxx_writeb(dvo, CH7xxx_IDF, idf); @@ -301,7 +301,7 @@ static void ch7xxx_mode_set(struct intel_dvo_device *dvo, /* set the CH7xxx power state */ static void ch7xxx_dpms(struct intel_dvo_device *dvo, int mode) { - if (mode == DPMSModeOn) + if (mode == DRM_MODE_DPMS_ON) ch7xxx_writeb(dvo, CH7xxx_PM, CH7xxx_PM_DVIL | CH7xxx_PM_DVIP); else ch7xxx_writeb(dvo, CH7xxx_PM, CH7xxx_PM_FPD); |