gma500: introduce a structure describing each pipe

This starts the move away from lots of confused unions of per driver stuff
inherited when we merged the drivers together.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 31 insertions, 105 deletions

diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 309a6427584a..e25f9a124796 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -286,45 +286,37 @@ struct intel_gmbus {
  *      yet) include screen blank. Operations occuring during the save
  *      update the register cache instead.
  */
+
+/*
+ *      Common status for pipes.
+ */
+struct psb_pipe {
+        u32     fp0;
+        u32     fp1;
+        u32     cntr;
+        u32     conf;
+        u32     src;
+        u32     dpll;
+        u32     dpll_md;
+        u32     htotal;
+        u32     hblank;
+        u32     hsync;
+        u32     vtotal;
+        u32     vblank;
+        u32     vsync;
+        u32     stride;
+        u32     size;
+        u32     pos;
+        u32     base;
+        u32     surf;
+        u32     addr;
+        u32     status;
+        u32     linoff;
+        u32     tileoff;
+        u32     palette[256];
+};
+
 struct psb_state {
-        uint32_t saveDSPACNTR;
-        uint32_t saveDSPBCNTR;
-        uint32_t savePIPEACONF;
-        uint32_t savePIPEBCONF;
-        uint32_t savePIPEASRC;
-        uint32_t savePIPEBSRC;
-        uint32_t saveFPA0;
-        uint32_t saveFPA1;
-        uint32_t saveDPLL_A;
-        uint32_t saveDPLL_A_MD;
-        uint32_t saveHTOTAL_A;
-        uint32_t saveHBLANK_A;
-        uint32_t saveHSYNC_A;
-        uint32_t saveVTOTAL_A;
-        uint32_t saveVBLANK_A;
-        uint32_t saveVSYNC_A;
-        uint32_t saveDSPASTRIDE;
-        uint32_t saveDSPASIZE;
-        uint32_t saveDSPAPOS;
-        uint32_t saveDSPABASE;
-        uint32_t saveDSPASURF;
-        uint32_t saveDSPASTATUS;
-        uint32_t saveFPB0;
-        uint32_t saveFPB1;
-        uint32_t saveDPLL_B;
-        uint32_t saveDPLL_B_MD;
-        uint32_t saveHTOTAL_B;
-        uint32_t saveHBLANK_B;
-        uint32_t saveHSYNC_B;
-        uint32_t saveVTOTAL_B;
-        uint32_t saveVBLANK_B;
-        uint32_t saveVSYNC_B;
-        uint32_t saveDSPBSTRIDE;
-        uint32_t saveDSPBSIZE;
-        uint32_t saveDSPBPOS;
-        uint32_t saveDSPBBASE;
-        uint32_t saveDSPBSURF;
-        uint32_t saveDSPBSTATUS;
         uint32_t saveVCLK_DIVISOR_VGA0;
         uint32_t saveVCLK_DIVISOR_VGA1;
         uint32_t saveVCLK_POST_DIV;
@@ -339,14 +331,8 @@ struct psb_state {
         uint32_t savePP_CONTROL;
         uint32_t savePP_CYCLE;
         uint32_t savePFIT_CONTROL;
-        uint32_t savePaletteA[256];
-        uint32_t savePaletteB[256];
         uint32_t saveCLOCKGATING;
         uint32_t saveDSPARB;
-        uint32_t saveDSPATILEOFF;
-        uint32_t saveDSPBTILEOFF;
-        uint32_t saveDSPAADDR;
-        uint32_t saveDSPBADDR;
         uint32_t savePFIT_AUTO_RATIOS;
         uint32_t savePFIT_PGM_RATIOS;
         uint32_t savePP_ON_DELAYS;
@@ -354,8 +340,6 @@ struct psb_state {
         uint32_t savePP_DIVISOR;
         uint32_t saveBCLRPAT_A;
         uint32_t saveBCLRPAT_B;
-        uint32_t saveDSPALINOFF;
-        uint32_t saveDSPBLINOFF;
         uint32_t savePERF_MODE;
         uint32_t saveDSPFW1;
         uint32_t saveDSPFW2;
@@ -370,8 +354,6 @@ struct psb_state {
         uint32_t saveDSPBCURSOR_BASE;
         uint32_t saveDSPACURSOR_POS;
         uint32_t saveDSPBCURSOR_POS;
-        uint32_t save_palette_a[256];
-        uint32_t save_palette_b[256];
         uint32_t saveOV_OVADD;
         uint32_t saveOV_OGAMC0;
         uint32_t saveOV_OGAMC1;
@@ -394,64 +376,7 @@ struct psb_state {
 };
 
 struct medfield_state {
-        uint32_t saveDPLL_A;
-        uint32_t saveFPA0;
-        uint32_t savePIPEACONF;
-        uint32_t saveHTOTAL_A;
-        uint32_t saveHBLANK_A;
-        uint32_t saveHSYNC_A;
-        uint32_t saveVTOTAL_A;
-        uint32_t saveVBLANK_A;
-        uint32_t saveVSYNC_A;
-        uint32_t savePIPEASRC;
-        uint32_t saveDSPASTRIDE;
-        uint32_t saveDSPALINOFF;
-        uint32_t saveDSPATILEOFF;
-        uint32_t saveDSPASIZE;
-        uint32_t saveDSPAPOS;
-        uint32_t saveDSPASURF;
-        uint32_t saveDSPACNTR;
-        uint32_t saveDSPASTATUS;
-        uint32_t save_palette_a[256];
         uint32_t saveMIPI;
-
-        uint32_t saveDPLL_B;
-        uint32_t saveFPB0;
-        uint32_t savePIPEBCONF;
-        uint32_t saveHTOTAL_B;
-        uint32_t saveHBLANK_B;
-        uint32_t saveHSYNC_B;
-        uint32_t saveVTOTAL_B;
-        uint32_t saveVBLANK_B;
-        uint32_t saveVSYNC_B;
-        uint32_t savePIPEBSRC;
-        uint32_t saveDSPBSTRIDE;
-        uint32_t saveDSPBLINOFF;
-        uint32_t saveDSPBTILEOFF;
-        uint32_t saveDSPBSIZE;
-        uint32_t saveDSPBPOS;
-        uint32_t saveDSPBSURF;
-        uint32_t saveDSPBCNTR;
-        uint32_t saveDSPBSTATUS;
-        uint32_t save_palette_b[256];
-
-        uint32_t savePIPECCONF;
-        uint32_t saveHTOTAL_C;
-        uint32_t saveHBLANK_C;
-        uint32_t saveHSYNC_C;
-        uint32_t saveVTOTAL_C;
-        uint32_t saveVBLANK_C;
-        uint32_t saveVSYNC_C;
-        uint32_t savePIPECSRC;
-        uint32_t saveDSPCSTRIDE;
-        uint32_t saveDSPCLINOFF;
-        uint32_t saveDSPCTILEOFF;
-        uint32_t saveDSPCSIZE;
-        uint32_t saveDSPCPOS;
-        uint32_t saveDSPCSURF;
-        uint32_t saveDSPCCNTR;
-        uint32_t saveDSPCSTATUS;
-        uint32_t save_palette_c[256];
         uint32_t saveMIPI_C;
 
         uint32_t savePFIT_CONTROL;
@@ -480,6 +405,7 @@ struct cdv_state {
 };
 
 struct psb_save_area {
+        struct psb_pipe pipe[3];
         uint32_t saveBSM;
         uint32_t saveVBT;
         union {