Fix build with --disable-atombios. Again.

5 files changed, 16 insertions, 5 deletions

diff --git a/src/rhd_ddia.c b/src/rhd_ddia.c
index effd0b7..e8ab5e8 100644
--- a/src/rhd_ddia.c
+++ b/src/rhd_ddia.c
@@ -60,6 +60,7 @@ struct DDIAPrivate
     CARD32 DdiaBitDepthControl;
 };
 
+#ifdef ATOM_BIOS
 /*
  *
  */
@@ -321,6 +322,7 @@ DDIADestroy(struct rhdOutput *Output)
     xfree(Private);
     Output->Private = NULL;
 }
+#endif
 
 /*
  *
diff --git a/src/rhd_dig.c b/src/rhd_dig.c
index 1fa5cdf..7f7c8be 100644
--- a/src/rhd_dig.c
+++ b/src/rhd_dig.c
@@ -1571,8 +1571,10 @@ DigDestroy(struct rhdOutput *Output)
 
     Encoder->Destroy(Output);
     Transmitter->Destroy(Output);
+#ifdef ATOM_BIOS
     if (Transmitter->PropertyPrivate)
 	RhdAtomDestroyBacklightControlProperty(Output, Transmitter->PropertyPrivate);
+#endif
     xfree(Private);
     Output->Private = NULL;
 }
@@ -1670,6 +1672,7 @@ DigAllocFree(struct rhdOutput *Output, enum rhdOutputAllocation Alloc)
     }
 }
 
+#ifdef ATOM_BIOS
 /*
  *
  */
@@ -1691,6 +1694,7 @@ digTransmitterPropertyWrapper(struct rhdOutput *Output,
 
     return ret;
 }
+#endif
 
 /*
  *
diff --git a/src/rhd_i2c.c b/src/rhd_i2c.c
index 0d3553b..8cc3504 100644
--- a/src/rhd_i2c.c
+++ b/src/rhd_i2c.c
@@ -262,6 +262,7 @@ enum rv620I2CBits {
     RV62_GENERIC_I2C_SDA_PIN_SEL      = (0x7f << RV62_GENERIC_I2C_SDA_PIN_SEL_SHIFT)
 };
 
+#ifdef ATOM_BIOS
 /*
  *
  */
@@ -339,6 +340,7 @@ getDDCLineFromGPIO(int scrnIndex, CARD32 gpio, int shift)
 	       __func__, (unsigned int) gpio, shift);
     return rhdDdcUnknown;
 }
+#endif
 
 /*
  *
diff --git a/src/rhd_lvtma.c b/src/rhd_lvtma.c
index a4aeb9e..9aa68a7 100644
--- a/src/rhd_lvtma.c
+++ b/src/rhd_lvtma.c
@@ -742,8 +742,10 @@ LVDSDestroy(struct rhdOutput *Output)
     if (!Private)
 	return;
 
+#ifdef ATOM_BIOS
     if (Private->PropertyPrivate)
 	RhdAtomDestroyBacklightControlProperty(Output, Private->PropertyPrivate);
+#endif
     xfree(Private);
     Output->Private = NULL;
 }
@@ -1339,6 +1341,7 @@ TMDSBDestroy(struct rhdOutput *Output)
     Output->Private = NULL;
 }
 
+#ifdef ATOM_BIOS
 static Bool
 LVDSPropertyWrapper(struct rhdOutput *Output,
 		    enum rhdPropertyAction Action,
@@ -1357,6 +1360,7 @@ LVDSPropertyWrapper(struct rhdOutput *Output,
 
     return ret;
 }
+#endif
 
 /*
  *
diff --git a/src/rhd_pm.c b/src/rhd_pm.c
index d126518..6a2f15f 100644
--- a/src/rhd_pm.c
+++ b/src/rhd_pm.c
@@ -413,10 +413,10 @@ RHDPmInit (RHDPtr rhdPtr)
 void
 RHDPmSave (RHDPtr rhdPtr)
 {
+#ifdef ATOM_BIOS
     struct rhdPm *Pm = rhdPtr->Pm;
     RHDFUNC(rhdPtr);
 
-#ifdef ATOM_BIOS
     /* ATM unconditionally enable power management features
      * if low power mode requested */
     if (rhdPtr->atomBIOS) {
@@ -431,13 +431,13 @@ RHDPmSave (RHDPtr rhdPtr)
 			     ATOM_PM_CLOCKGATING_SETUP, &data);
 	}
     }
-#endif
 
     if (!Pm) return;
 
     memcpy (&Pm->Stored, &Pm->Default, sizeof (Pm->Default));
     rhdPmGetRawState (rhdPtr, &Pm->Stored);
     rhdPmValidateClearSetting (Pm, &Pm->Stored);
+#endif
 }
 
 /*
@@ -446,11 +446,10 @@ RHDPmSave (RHDPtr rhdPtr)
 void
 RHDPmRestore (RHDPtr rhdPtr)
 {
+#ifdef ATOM_BIOS
     struct rhdPm *Pm = rhdPtr->Pm;
-
     RHDFUNC(rhdPtr);
 
-#ifdef ATOM_BIOS
     /* Don't know how to save state yet - unconditionally disable */
     if (rhdPtr->atomBIOS) {
 	union AtomBiosArg data;
@@ -464,7 +463,6 @@ RHDPmRestore (RHDPtr rhdPtr)
 			     ATOM_PM_CLOCKGATING_SETUP, &data);
 	}
     }
-#endif
 
     if (!Pm)
 	return;
@@ -475,5 +473,6 @@ RHDPmRestore (RHDPtr rhdPtr)
         return;
     }
     rhdPmSetRawState (rhdPtr, &Pm->Stored);
+#endif
 }