Merging the ati-4-1-0 branch onto the trunk.ati-4-1-0-20000613-merge

1 files changed, 30 insertions, 1 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
index 29fa87a5b..e948cb6b9 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
@@ -103,7 +103,7 @@ typedef struct {
     CARD32     amcgpio_en_reg;
     CARD32     amcgpio_mask;
 
-				/* Crtc registers */
+				/* CRTC registers */
     CARD32     crtc_gen_cntl;
     CARD32     crtc_ext_cntl;
     CARD32     dac_cntl;
@@ -115,6 +115,21 @@ typedef struct {
     CARD32     crtc_offset_cntl;
     CARD32     crtc_pitch;
 
+				/* CRTC2 registers */
+    CARD32     crtc2_gen_cntl;
+
+				/* Flat panel registers */
+    CARD32     fp_crtc_h_total_disp;
+    CARD32     fp_crtc_v_total_disp;
+    CARD32     fp_gen_cntl;
+    CARD32     fp_h_sync_strt_wid;
+    CARD32     fp_horz_stretch;
+    CARD32     fp_panel_cntl;
+    CARD32     fp_v_sync_strt_wid;
+    CARD32     fp_vert_stretch;
+    CARD32     lvds_gen_cntl;
+    CARD32     tmds_crc;
+
 				/* Computed values for PLL */
     int        dot_clock_freq;
     int        pll_output_freq;
@@ -164,6 +179,20 @@ typedef struct {
     unsigned long     FbMapSize;  /* Size of frame buffer, in bytes          */
     int               Flags;	  /* Saved copy of mode flags                */
     
+    Bool              EnableFP;     /* Enable use of FP registers            */
+    Bool              CRTOnly;      /* Only use External CRT instead of FP   */
+    Bool              HasPanelRegs; /* Current chip can connect to a FP      */
+
+				/* Computed values for FPs */
+    int               PanelXRes;
+    int               PanelYRes;
+    int               PanelHNonVis;
+    int               PanelHOverPlus;
+    int               PanelHSyncWidth;
+    int               PanelVNonVis;
+    int               PanelVOverPlus;
+    int               PanelVSyncWidth;
+
     R128PLLRec        pll;
     R128RAMPtr        ram;