diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2009-06-30 12:57:03 +0200 |
|---|---|---|
| committer | Matthias Hopf <mhopf@suse.de> | 2009-06-30 19:22:30 +0200 |
| commit | 09a62f9426ccf5c6cbcc19cb9fd7ba66c3231002 (patch) | |
| tree | 1f8b818076c39f43b7ede5c2cca66b217f12fd27 | |
| parent | 3e0d3aab927db2def6375b11fa97e788d1b6dcec (diff) | |
Fix build with --disable-atombios
| -rw-r--r-- | src/rhd_pm.c | 4 | ||||
| -rw-r--r-- | src/rhd_randr.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/rhd_pm.c b/src/rhd_pm.c index a063d06..c5d30b4 100644 --- a/src/rhd_pm.c +++ b/src/rhd_pm.c @@ -105,6 +105,7 @@ RHDPmSetClock(RHDPtr rhdPtr) RHDFUNC(Pm); +#ifdef ATOM_BIOS /* ATM unconditionally enable power management features * if low power mode requested */ if (rhdPtr->atomBIOS) { @@ -119,6 +120,7 @@ RHDPmSetClock(RHDPtr rhdPtr) ATOM_PM_CLOCKGATING_SETUP, &data); } } +#endif if (Pm->ForcedEngineClock) { RHDSetEngineClock(rhdPtr, Pm->ForcedEngineClock); @@ -182,6 +184,7 @@ RHDPmRestore(RHDPtr rhdPtr) RHDGetMemoryClock(rhdPtr); #endif +#ifdef ATOM_BIOS /* Don't know how to save state yet - unconditionally disable */ if (rhdPtr->atomBIOS) { union AtomBiosArg data; @@ -195,6 +198,7 @@ RHDPmRestore(RHDPtr rhdPtr) ATOM_PM_CLOCKGATING_SETUP, &data); } } +#endif } unsigned long diff --git a/src/rhd_randr.c b/src/rhd_randr.c index 3ad0363..1ed9562 100644 --- a/src/rhd_randr.c +++ b/src/rhd_randr.c @@ -1414,6 +1414,7 @@ rhdRROutputSetProperty(xf86OutputPtr out, Atom property, RHD_OUTPUT_HDMI, NULL); } return FALSE; +#if ENABLE_PROPERTY_ATOMBIOS } else if (property == atom_AtomBIOS) { if (value->type != XA_STRING || value->format != 8) return FALSE; @@ -1424,6 +1425,7 @@ rhdRROutputSetProperty(xf86OutputPtr out, Atom property, return TRUE; } return FALSE; +#endif } else if (property == atom_EDID || property == atom_EDID2) { /* Don't do anything, but allow change */ return TRUE; @@ -1464,8 +1466,8 @@ rhdRRCrtcShadowAllocate(xf86CrtcPtr crtc, int Width, int Height) return ((char *)rhdPtr->FbBase + rhdRRCrtc->u.MemEXA->offset); } - #endif /* USE_EXA */ + if (rhdPtr->AccelMethod == RHD_ACCEL_XAA) { int Align = (4096 + OctPerPixel - 1) / OctPerPixel; Size = (Size + OctPerPixel - 1) / OctPerPixel; |