gfx: drv: save the pfit/hdmi/mipi regs along with the rest of pipe regs

Move the saving of these registers where the rest of pipe regs are
saved. This should make the next patch easier to parse and make it
clearer what is saved for each pipe.

The access order of these registers will move before the palette
register saving, but as none of these registers have a side-effect when
reading, this shouldn't matter.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c
index 0f37348..0b444ad 100644 (file)
--- a/drivers/staging/mrst/drv/psb_powermgmt.c
+++ b/drivers/staging/mrst/drv/psb_powermgmt.c
@@ -492,6 +492,7 @@ static int mdfld_save_display_registers(struct drm_device *dev, int pipe)
 
        switch (pipe) {
        case 0:
+               *mipi_val = PSB_RVDC32(mipi_reg);
                break;
        case 1:
                /* regester */
@@ -501,6 +502,11 @@ static int mdfld_save_display_registers(struct drm_device *dev, int pipe)
                /* values */
                dpll_val = &dev_priv->saveDPLL_B;
                fp_val = &dev_priv->saveFPB0;
+
+               dev_priv->savePFIT_CONTROL = PSB_RVDC32(PFIT_CONTROL);
+               dev_priv->savePFIT_PGM_RATIOS = PSB_RVDC32(PFIT_PGM_RATIOS);
+               dev_priv->saveHDMIPHYMISCCTL = PSB_RVDC32(HDMIPHYMISCCTL);
+               dev_priv->saveHDMIB_CONTROL = PSB_RVDC32(HDMIB_CONTROL);
                break;
        case 2:
                /* regester */
@@ -508,6 +514,8 @@ static int mdfld_save_display_registers(struct drm_device *dev, int pipe)
 
                /* pointer to values */
                mipi_val = &dev_priv->saveMIPI_C;
+
+               *mipi_val = PSB_RVDC32(mipi_reg);
                break;
        default:
                DRM_ERROR("%s, invalid pipe number. \n", __FUNCTION__);
@@ -539,16 +547,6 @@ static int mdfld_save_display_registers(struct drm_device *dev, int pipe)
        for (i = 0; i < ARRAY_SIZE(pr->palette); i++)
                pr->palette[i] = PSB_RVDC32(palette_reg(pipe, i));
 
-       if (pipe == 1) {
-               dev_priv->savePFIT_CONTROL = PSB_RVDC32(PFIT_CONTROL);
-               dev_priv->savePFIT_PGM_RATIOS = PSB_RVDC32(PFIT_PGM_RATIOS);
-
-               dev_priv->saveHDMIPHYMISCCTL = PSB_RVDC32(HDMIPHYMISCCTL);
-               dev_priv->saveHDMIB_CONTROL = PSB_RVDC32(HDMIB_CONTROL);
-               return 0;
-       }
-
-       *mipi_val = PSB_RVDC32(mipi_reg);
        return 0;
 }
 /*