Outputs/AtomBIOS: Some cleanup.

10 files changed, 33 insertions, 8 deletions

diff --git a/src/rhd_atompll.c b/src/rhd_atompll.c
index 90f9238..d4c84e7 100644
--- a/src/rhd_atompll.c
+++ b/src/rhd_atompll.c
@@ -43,8 +43,9 @@
 #include "rhd_output.h"
 #include "rhd_crtc.h"
 #include "rhd_regs.h"
-#include "rhd_atombios.h"
-#include "rhd_biosscratch.h"
+#ifdef ATOM_BIOS
+# include "rhd_atombios.h"
+# include "rhd_biosscratch.h"
 
 struct atomPLLPrivate {
     enum atomPxclk Pxclk;
@@ -419,3 +420,5 @@ RHDAtomPLLsInit(RHDPtr rhdPtr)
 
     return TRUE;
 }
+
+#endif /* AtomBIOS */
diff --git a/src/rhd_biosscratch.c b/src/rhd_biosscratch.c
index 2140c26..39c3980 100644
--- a/src/rhd_biosscratch.c
+++ b/src/rhd_biosscratch.c
@@ -465,7 +465,7 @@ RHDRestoreBiosScratchRegisters(RHDPtr rhdPtr, struct rhdBiosScratchRegisters *re
     xfree(regs);
 }
 
-#endif
+#endif /* ATOM_BIOS */
 
 #if 0
 enum atomScratchInfo {
diff --git a/src/rhd_biosscratch.h b/src/rhd_biosscratch.h
index ca7a875..4d7f7eb 100644
--- a/src/rhd_biosscratch.h
+++ b/src/rhd_biosscratch.h
@@ -26,6 +26,8 @@
 #ifndef RHD_BIOSSCRATCH_H_
 # define RHD_BIOSSCRATCH_H_
 
+# ifdef ATOM_BIOS
+
 enum rhdBIOSScratchBlAction {
     rhdBIOSScratchBlGet,
     rhdBIOSScratchBlSet
@@ -33,12 +35,13 @@ enum rhdBIOSScratchBlAction {
 
 extern enum rhdSensedOutput rhdAtomBIOSScratchDACSenseResults(struct rhdOutput *Output,
 							      enum atomDAC DAC, enum atomDevice Device);
-extern void RHDAtomUpdateBIOSScratchForOutput(struct rhdOutput *Output);
 extern enum atomDevice RHDGetDeviceOnCrtc(RHDPtr rhdPtr, enum atomCrtc Crtc);
 extern struct rhdBiosScratchRegisters *RHDSaveBiosScratchRegisters(RHDPtr rhdPtr);
 extern void RHDRestoreBiosScratchRegisters(RHDPtr rhdPtr, struct rhdBiosScratchRegisters * regs);
+extern void RHDAtomUpdateBIOSScratchForOutput(struct rhdOutput *Output);
 extern void RHDAtomBIOSScratchBlLevel(RHDPtr rhdPtr, enum rhdBIOSScratchBlAction action, int *val);
 
+# endif
 #if 0
 extern void rhdAtomBIOSScratchUpdateAttachedState(RHDPtr rhdPtr, enum atomDevice dev, Bool attached);
 extern void rhdAtomBIOSScratchUpdateOnState(RHDPtr rhdPtr, enum atomDevice dev, Bool on);
diff --git a/src/rhd_crtc.c b/src/rhd_crtc.c
index 9205924..89df3eb 100644
--- a/src/rhd_crtc.c
+++ b/src/rhd_crtc.c
@@ -44,7 +44,6 @@
 #include "rhd_modes.h"
 #ifdef ATOM_BIOS
 #include "rhd_atombios.h"
-#endif
 
 #define D1_REG_OFFSET 0x0000
 #define D2_REG_OFFSET 0x0800
@@ -1434,3 +1433,4 @@ RHDCrtcsDestroy(RHDPtr rhdPtr)
 	xfree(Crtc);
     }
 }
+#endif /* ATOM_BIOS */
diff --git a/src/rhd_dac.c b/src/rhd_dac.c
index fb5f7e5..34e85ac 100644
--- a/src/rhd_dac.c
+++ b/src/rhd_dac.c
@@ -44,6 +44,10 @@
 #include "rhd_crtc.h"
 #include "rhd_regs.h"
 
+#ifdef ATOM_BIOS
+#include "rhd_atombios.h"
+#include "rhd_biosscratch.h"
+#endif
 
 #define REG_DACA_OFFSET 0
 #define RV620_REG_DACA_OFFSET 0
diff --git a/src/rhd_ddia.c b/src/rhd_ddia.c
index 3880c9b..b3b1757 100644
--- a/src/rhd_ddia.c
+++ b/src/rhd_ddia.c
@@ -44,6 +44,7 @@
 #include "rhd_card.h"
 #ifdef ATOM_BIOS
 #include "rhd_atombios.h"
+#include "rhd_biosscratch.h"
 #endif
 
 struct DDIAPrivate
@@ -218,7 +219,9 @@ DDIAPower(struct rhdOutput *Output, int Power)
     RHDDebug(Output->scrnIndex, "%s(%s,%s)\n",__func__,Output->Name,
 	     rhdPowerString[Power]);
 
+#ifdef ATOM_BIOS
     RHDAtomUpdateBIOSScratchForOutput(Output);
+#endif
 
     switch (Power) {
 	case RHD_POWER_ON:
diff --git a/src/rhd_dig.c b/src/rhd_dig.c
index 2b173ad..a541b24 100644
--- a/src/rhd_dig.c
+++ b/src/rhd_dig.c
@@ -44,6 +44,7 @@
 #include "rhd_card.h"
 #ifdef ATOM_BIOS
 #include "rhd_atombios.h"
+#include "rhd_biosscratch.h"
 #endif
 
 #define FMT2_OFFSET 0x800
@@ -769,8 +770,10 @@ ATOMTransmitterPower(struct rhdOutput *Output, int Power)
 
     RHDFUNC(Output);
 
+#ifdef ATOM_BIOS
     RHDAtomUpdateBIOSScratchForOutput(Output);
-
+#endif
+    
     if (Private->RunDualLink)
 	atc->LinkCnt = atomDualLink;
     else
diff --git a/src/rhd_lvtma.c b/src/rhd_lvtma.c
index 5c7aee6..5d602a0 100644
--- a/src/rhd_lvtma.c
+++ b/src/rhd_lvtma.c
@@ -50,6 +50,7 @@
 #include "rhd_card.h"
 #ifdef ATOM_BIOS
 #include "rhd_atombios.h"
+#include "rhd_biosscratch.h"
 #endif
 
 /*
@@ -481,7 +482,9 @@ LVDSPower(struct rhdOutput *Output, int Power)
     RHDDebug(Output->scrnIndex, "%s(%s,%s)\n",__func__,Output->Name,
 	     rhdPowerString[Power]);
 
+#ifdef ATOM_BIOS
     RHDAtomUpdateBIOSScratchForOutput(Output);
+#endif
 
     switch (Power) {
     case RHD_POWER_ON:
diff --git a/src/rhd_output.h b/src/rhd_output.h
index 03476d1..cf54146 100644
--- a/src/rhd_output.h
+++ b/src/rhd_output.h
@@ -113,6 +113,6 @@ struct rhdOutput *RHDDIGInit(RHDPtr rhdPtr,  enum rhdOutputType outputType, CARD
 struct rhdOutput *RHDDDIAInit(RHDPtr rhdPtr, enum rhdOutputType outputType);
 struct rhdOutput *RHDAtomOutputInit(RHDPtr rhdPtr, rhdConnectorType ConnectorType, rhdOutputType OutputType);
 
-void RHDAtomUpdateBIOSScratchForOutput(struct rhdOutput *Output);
+extern int RhdAtomSetupBacklightControlProperty(struct rhdOutput *Output);
 
 #endif /* _RHD_OUTPUT_H */
diff --git a/src/rhd_tmds.c b/src/rhd_tmds.c
index f9115d0..a66c54c 100644
--- a/src/rhd_tmds.c
+++ b/src/rhd_tmds.c
@@ -47,6 +47,11 @@
 #include "rhd_output.h"
 #include "rhd_regs.h"
 
+#ifdef ATOM_BIOS
+#include "rhd_atombios.h"
+#include "rhd_biosscratch.h"
+#endif
+
 struct rhdTMDSPrivate {
     Bool RunsDualLink;
     DisplayModePtr Mode;
@@ -345,8 +350,9 @@ TMDSAPower(struct rhdOutput *Output, int Power)
     RHDDebug(Output->scrnIndex, "%s(%s,%s)\n",__func__,Output->Name,
 	     rhdPowerString[Power]);
 
+#ifdef ATOM_BIOS
     RHDAtomUpdateBIOSScratchForOutput(Output);
-
+#endif
     switch (Power) {
     case RHD_POWER_ON:
 	if (Private->PowerState == RHD_POWER_SHUTDOWN