summaryrefslogtreecommitdiff
path: root/src/radeon.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-12-07 14:45:04 +1000
committerDave Airlie <airlied@redhat.com>2007-12-07 14:45:04 +1000
commit0dcd926d3092100854b3e362d6659d4950508aeb (patch)
tree69f61a581747ead9d8cdf47f82d0a89f6523702f /src/radeon.h
parentbb5ede557bf32a42eef158ff0fbcfe1c6ede098a (diff)
radeon: bring back zaphod all is forgiven.
You've whined, you've cried, you've nagged, and you're guilt trippin has made me do it... It actually wasn't as hard as I thought it would be. Still not perfect, couple of things to fix yet
Diffstat (limited to 'src/radeon.h')
-rw-r--r--src/radeon.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/radeon.h b/src/radeon.h
index 529374ec..5c3bf868 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -681,6 +681,10 @@ typedef struct {
Rotation rotation;
void (*PointerMoved)(int, int, int);
CreateScreenResourcesProcPtr CreateScreenResources;
+
+
+ Bool IsSecondary;
+ Bool IsPrimary;
} RADEONInfoRec, *RADEONInfoPtr;
#define RADEONWaitForFifo(pScrn, entries) \
@@ -801,7 +805,7 @@ extern void RADEONBlank(ScrnInfoPtr pScrn);
extern void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn,
int PowerManagementMode,
int flags);
-extern Bool RADEONAllocateControllers(ScrnInfoPtr pScrn);
+extern Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask);
extern Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn);
extern int RADEONValidateMergeModes(ScrnInfoPtr pScrn);
extern int RADEONValidateDDCModes(ScrnInfoPtr pScrn1, char **ppModeName,