drm/i915: don't bother saving mode set regs
Subsystems (2)
PATCH 1/2 drm/i915: don't bother saving mode set regs
Save/restore of state like this won't work on recent chips anyway, and we'll clobber all this when mode setting, so don't bother with it.
Signed-off-by Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/i915_suspend.c | 464 ----------------------------------- 1 files changed, 0 insertions(+), 464 deletions(-)
drivers/gpu/drm/i915/i915_suspend.c +0 -464
@@ -29,64 +29,6 @@#include "i915_drm.h" #include "intel_drv.h" -static bool i915_pipe_enabled (struct drm_device *dev,enum pipe pipe) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -u32 dpll_reg; - -if (HAS_PCH_SPLIT (dev)) { - dpll_reg = (pipe ==PIPE_A ) ?PCH_DPLL_A :PCH_DPLL_B ; - }else { - dpll_reg = (pipe ==PIPE_A ) ?DPLL_A :DPLL_B ; - } - -return (I915_READ (dpll_reg) &DPLL_VCO_ENABLE ); -} - -static void i915_save_palette (struct drm_device *dev,enum pipe pipe) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -unsigned long reg = (pipe ==PIPE_A ?PALETTE_A :PALETTE_B ); -u32 *array; -int i; - -if (!i915_pipe_enabled (dev, pipe)) -return ; - -if (HAS_PCH_SPLIT (dev)) - reg = (pipe ==PIPE_A ) ?LGC_PALETTE_A :LGC_PALETTE_B ; - -if (pipe ==PIPE_A ) - array = dev_priv->save_palette_a; -else - array = dev_priv->save_palette_b; - -for (i =0 ; i <256 ; i++) - array[i] =I915_READ (reg + (i <<2 )); -} - -static void i915_restore_palette (struct drm_device *dev,enum pipe pipe) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -unsigned long reg = (pipe ==PIPE_A ?PALETTE_A :PALETTE_B ); -u32 *array; -int i; - -if (!i915_pipe_enabled (dev, pipe)) -return ; - -if (HAS_PCH_SPLIT (dev)) - reg = (pipe ==PIPE_A ) ?LGC_PALETTE_A :LGC_PALETTE_B ; - -if (pipe ==PIPE_A ) - array = dev_priv->save_palette_a; -else - array = dev_priv->save_palette_b; - -for (i =0 ; i <256 ; i++) -I915_WRITE (reg + (i <<2 ), array[i]); -} -static u8 i915_read_indexed (struct drm_device *dev,u16 index_port,u16 data_port,u8 reg) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -232,372 +174,6 @@ static void i915_restore_vga(struct drm_device *dev)I915_WRITE8 (VGA_DACMASK , dev_priv->saveDACMASK); } -static void i915_save_modeset_reg (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -int i; - -if (drm_core_check_feature (dev,DRIVER_MODESET )) -return ; - -/* Cursor state */ - dev_priv->saveCURACNTR =I915_READ (CURACNTR ); - dev_priv->saveCURAPOS =I915_READ (CURAPOS ); - dev_priv->saveCURABASE =I915_READ (CURABASE ); - dev_priv->saveCURBCNTR =I915_READ (CURBCNTR ); - dev_priv->saveCURBPOS =I915_READ (CURBPOS ); - dev_priv->saveCURBBASE =I915_READ (CURBBASE ); -if (IS_GEN2 (dev)) - dev_priv->saveCURSIZE =I915_READ (CURSIZE ); - -if (HAS_PCH_SPLIT (dev)) { - dev_priv->savePCH_DREF_CONTROL =I915_READ (PCH_DREF_CONTROL ); - dev_priv->saveDISP_ARB_CTL =I915_READ (DISP_ARB_CTL ); - } - -/* Pipe & plane A info */ - dev_priv->savePIPEACONF =I915_READ (PIPEACONF ); - dev_priv->savePIPEASRC =I915_READ (PIPEASRC ); -if (HAS_PCH_SPLIT (dev)) { - dev_priv->saveFPA0 =I915_READ (PCH_FPA0 ); - dev_priv->saveFPA1 =I915_READ (PCH_FPA1 ); - dev_priv->saveDPLL_A =I915_READ (PCH_DPLL_A ); - }else { - dev_priv->saveFPA0 =I915_READ (FPA0 ); - dev_priv->saveFPA1 =I915_READ (FPA1 ); - dev_priv->saveDPLL_A =I915_READ (DPLL_A ); - } -if (INTEL_INFO (dev)->gen >=4 && !HAS_PCH_SPLIT (dev)) - dev_priv->saveDPLL_A_MD =I915_READ (DPLL_A_MD ); - dev_priv->saveHTOTAL_A =I915_READ (HTOTAL_A ); - dev_priv->saveHBLANK_A =I915_READ (HBLANK_A ); - dev_priv->saveHSYNC_A =I915_READ (HSYNC_A ); - dev_priv->saveVTOTAL_A =I915_READ (VTOTAL_A ); - dev_priv->saveVBLANK_A =I915_READ (VBLANK_A ); - dev_priv->saveVSYNC_A =I915_READ (VSYNC_A ); -if (!HAS_PCH_SPLIT (dev)) - dev_priv->saveBCLRPAT_A =I915_READ (BCLRPAT_A ); - -if (HAS_PCH_SPLIT (dev)) { - dev_priv->savePIPEA_DATA_M1 =I915_READ (PIPEA_DATA_M1 ); - dev_priv->savePIPEA_DATA_N1 =I915_READ (PIPEA_DATA_N1 ); - dev_priv->savePIPEA_LINK_M1 =I915_READ (PIPEA_LINK_M1 ); - dev_priv->savePIPEA_LINK_N1 =I915_READ (PIPEA_LINK_N1 ); - - dev_priv->saveFDI_TXA_CTL =I915_READ (FDI_TXA_CTL ); - dev_priv->saveFDI_RXA_CTL =I915_READ (FDI_RXA_CTL ); - - dev_priv->savePFA_CTL_1 =I915_READ (PFA_CTL_1 ); - dev_priv->savePFA_WIN_SZ =I915_READ (PFA_WIN_SZ ); - dev_priv->savePFA_WIN_POS =I915_READ (PFA_WIN_POS ); - - dev_priv->saveTRANSACONF =I915_READ (TRANSACONF ); - dev_priv->saveTRANS_HTOTAL_A =I915_READ (TRANS_HTOTAL_A ); - dev_priv->saveTRANS_HBLANK_A =I915_READ (TRANS_HBLANK_A ); - dev_priv->saveTRANS_HSYNC_A =I915_READ (TRANS_HSYNC_A ); - dev_priv->saveTRANS_VTOTAL_A =I915_READ (TRANS_VTOTAL_A ); - dev_priv->saveTRANS_VBLANK_A =I915_READ (TRANS_VBLANK_A ); - dev_priv->saveTRANS_VSYNC_A =I915_READ (TRANS_VSYNC_A ); - } - - dev_priv->saveDSPACNTR =I915_READ (DSPACNTR ); - dev_priv->saveDSPASTRIDE =I915_READ (DSPASTRIDE ); - dev_priv->saveDSPASIZE =I915_READ (DSPASIZE ); - dev_priv->saveDSPAPOS =I915_READ (DSPAPOS ); - dev_priv->saveDSPAADDR =I915_READ (DSPAADDR ); -if (INTEL_INFO (dev)->gen >=4 ) { - dev_priv->saveDSPASURF =I915_READ (DSPASURF ); - dev_priv->saveDSPATILEOFF =I915_READ (DSPATILEOFF ); - } -i915_save_palette (dev,PIPE_A ); - dev_priv->savePIPEASTAT =I915_READ (PIPEASTAT ); - -/* Pipe & plane B info */ - dev_priv->savePIPEBCONF =I915_READ (PIPEBCONF ); - dev_priv->savePIPEBSRC =I915_READ (PIPEBSRC ); -if (HAS_PCH_SPLIT (dev)) { - dev_priv->saveFPB0 =I915_READ (PCH_FPB0 ); - dev_priv->saveFPB1 =I915_READ (PCH_FPB1 ); - dev_priv->saveDPLL_B =I915_READ (PCH_DPLL_B ); - }else { - dev_priv->saveFPB0 =I915_READ (FPB0 ); - dev_priv->saveFPB1 =I915_READ (FPB1 ); - dev_priv->saveDPLL_B =I915_READ (DPLL_B ); - } -if (INTEL_INFO (dev)->gen >=4 && !HAS_PCH_SPLIT (dev)) - dev_priv->saveDPLL_B_MD =I915_READ (DPLL_B_MD ); - dev_priv->saveHTOTAL_B =I915_READ (HTOTAL_B ); - dev_priv->saveHBLANK_B =I915_READ (HBLANK_B ); - dev_priv->saveHSYNC_B =I915_READ (HSYNC_B ); - dev_priv->saveVTOTAL_B =I915_READ (VTOTAL_B ); - dev_priv->saveVBLANK_B =I915_READ (VBLANK_B ); - dev_priv->saveVSYNC_B =I915_READ (VSYNC_B ); -if (!HAS_PCH_SPLIT (dev)) - dev_priv->saveBCLRPAT_B =I915_READ (BCLRPAT_B ); - -if (HAS_PCH_SPLIT (dev)) { - dev_priv->savePIPEB_DATA_M1 =I915_READ (PIPEB_DATA_M1 ); - dev_priv->savePIPEB_DATA_N1 =I915_READ (PIPEB_DATA_N1 ); - dev_priv->savePIPEB_LINK_M1 =I915_READ (PIPEB_LINK_M1 ); - dev_priv->savePIPEB_LINK_N1 =I915_READ (PIPEB_LINK_N1 ); - - dev_priv->saveFDI_TXB_CTL =I915_READ (FDI_TXB_CTL ); - dev_priv->saveFDI_RXB_CTL =I915_READ (FDI_RXB_CTL ); - - dev_priv->savePFB_CTL_1 =I915_READ (PFB_CTL_1 ); - dev_priv->savePFB_WIN_SZ =I915_READ (PFB_WIN_SZ ); - dev_priv->savePFB_WIN_POS =I915_READ (PFB_WIN_POS ); - - dev_priv->saveTRANSBCONF =I915_READ (TRANSBCONF ); - dev_priv->saveTRANS_HTOTAL_B =I915_READ (TRANS_HTOTAL_B ); - dev_priv->saveTRANS_HBLANK_B =I915_READ (TRANS_HBLANK_B ); - dev_priv->saveTRANS_HSYNC_B =I915_READ (TRANS_HSYNC_B ); - dev_priv->saveTRANS_VTOTAL_B =I915_READ (TRANS_VTOTAL_B ); - dev_priv->saveTRANS_VBLANK_B =I915_READ (TRANS_VBLANK_B ); - dev_priv->saveTRANS_VSYNC_B =I915_READ (TRANS_VSYNC_B ); - } - - dev_priv->saveDSPBCNTR =I915_READ (DSPBCNTR ); - dev_priv->saveDSPBSTRIDE =I915_READ (DSPBSTRIDE ); - dev_priv->saveDSPBSIZE =I915_READ (DSPBSIZE ); - dev_priv->saveDSPBPOS =I915_READ (DSPBPOS ); - dev_priv->saveDSPBADDR =I915_READ (DSPBADDR ); -if (INTEL_INFO (dev)->gen >=4 ) { - dev_priv->saveDSPBSURF =I915_READ (DSPBSURF ); - dev_priv->saveDSPBTILEOFF =I915_READ (DSPBTILEOFF ); - } -i915_save_palette (dev,PIPE_B ); - dev_priv->savePIPEBSTAT =I915_READ (PIPEBSTAT ); - -/* Fences */ -switch (INTEL_INFO (dev)->gen) { -case 6 : -for (i =0 ; i <16 ; i++) - dev_priv->saveFENCE[i] =I915_READ64 (FENCE_REG_SANDYBRIDGE_0 + (i *8 )); -break ; -case 5 : -case 4 : -for (i =0 ; i <16 ; i++) - dev_priv->saveFENCE[i] =I915_READ64 (FENCE_REG_965_0 + (i *8 )); -break ; -case 3 : -if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) -for (i =0 ; i <8 ; i++) - dev_priv->saveFENCE[i+8 ] =I915_READ (FENCE_REG_945_8 + (i *4 )); -case 2 : -for (i =0 ; i <8 ; i++) - dev_priv->saveFENCE[i] =I915_READ (FENCE_REG_830_0 + (i *4 )); -break ; - } - -return ; -} - -static void i915_restore_modeset_reg (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -int dpll_a_reg, fpa0_reg, fpa1_reg; -int dpll_b_reg, fpb0_reg, fpb1_reg; -int i; - -if (drm_core_check_feature (dev,DRIVER_MODESET )) -return ; - -/* Fences */ -switch (INTEL_INFO (dev)->gen) { -case 6 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_SANDYBRIDGE_0 + (i *8 ), dev_priv->saveFENCE[i]); -break ; -case 5 : -case 4 : -for (i =0 ; i <16 ; i++) -I915_WRITE64 (FENCE_REG_965_0 + (i *8 ), dev_priv->saveFENCE[i]); -break ; -case 3 : -case 2 : -if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) -for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_945_8 + (i *4 ), dev_priv->saveFENCE[i+8 ]); -for (i =0 ; i <8 ; i++) -I915_WRITE (FENCE_REG_830_0 + (i *4 ), dev_priv->saveFENCE[i]); -break ; - } - - -if (HAS_PCH_SPLIT (dev)) { - dpll_a_reg =PCH_DPLL_A ; - dpll_b_reg =PCH_DPLL_B ; - fpa0_reg =PCH_FPA0 ; - fpb0_reg =PCH_FPB0 ; - fpa1_reg =PCH_FPA1 ; - fpb1_reg =PCH_FPB1 ; - }else { - dpll_a_reg =DPLL_A ; - dpll_b_reg =DPLL_B ; - fpa0_reg =FPA0 ; - fpb0_reg =FPB0 ; - fpa1_reg =FPA1 ; - fpb1_reg =FPB1 ; - } - -if (HAS_PCH_SPLIT (dev)) { -I915_WRITE (PCH_DREF_CONTROL , dev_priv->savePCH_DREF_CONTROL); -I915_WRITE (DISP_ARB_CTL , dev_priv->saveDISP_ARB_CTL); - } - -/* Pipe & plane A info */ -/* Prime the clock */ -if (dev_priv->saveDPLL_A &DPLL_VCO_ENABLE ) { -I915_WRITE (dpll_a_reg, dev_priv->saveDPLL_A & - ~DPLL_VCO_ENABLE ); -POSTING_READ (dpll_a_reg); -udelay (150 ); - } -I915_WRITE (fpa0_reg, dev_priv->saveFPA0); -I915_WRITE (fpa1_reg, dev_priv->saveFPA1); -/* Actually enable it */ -I915_WRITE (dpll_a_reg, dev_priv->saveDPLL_A); -POSTING_READ (dpll_a_reg); -udelay (150 ); -if (INTEL_INFO (dev)->gen >=4 && !HAS_PCH_SPLIT (dev)) { -I915_WRITE (DPLL_A_MD , dev_priv->saveDPLL_A_MD); -POSTING_READ (DPLL_A_MD ); - } -udelay (150 ); - -/* Restore mode */ -I915_WRITE (HTOTAL_A , dev_priv->saveHTOTAL_A); -I915_WRITE (HBLANK_A , dev_priv->saveHBLANK_A); -I915_WRITE (HSYNC_A , dev_priv->saveHSYNC_A); -I915_WRITE (VTOTAL_A , dev_priv->saveVTOTAL_A); -I915_WRITE (VBLANK_A , dev_priv->saveVBLANK_A); -I915_WRITE (VSYNC_A , dev_priv->saveVSYNC_A); -if (!HAS_PCH_SPLIT (dev)) -I915_WRITE (BCLRPAT_A , dev_priv->saveBCLRPAT_A); - -if (HAS_PCH_SPLIT (dev)) { -I915_WRITE (PIPEA_DATA_M1 , dev_priv->savePIPEA_DATA_M1); -I915_WRITE (PIPEA_DATA_N1 , dev_priv->savePIPEA_DATA_N1); -I915_WRITE (PIPEA_LINK_M1 , dev_priv->savePIPEA_LINK_M1); -I915_WRITE (PIPEA_LINK_N1 , dev_priv->savePIPEA_LINK_N1); - -I915_WRITE (FDI_RXA_CTL , dev_priv->saveFDI_RXA_CTL); -I915_WRITE (FDI_TXA_CTL , dev_priv->saveFDI_TXA_CTL); - -I915_WRITE (PFA_CTL_1 , dev_priv->savePFA_CTL_1); -I915_WRITE (PFA_WIN_SZ , dev_priv->savePFA_WIN_SZ); -I915_WRITE (PFA_WIN_POS , dev_priv->savePFA_WIN_POS); - -I915_WRITE (TRANSACONF , dev_priv->saveTRANSACONF); -I915_WRITE (TRANS_HTOTAL_A , dev_priv->saveTRANS_HTOTAL_A); -I915_WRITE (TRANS_HBLANK_A , dev_priv->saveTRANS_HBLANK_A); -I915_WRITE (TRANS_HSYNC_A , dev_priv->saveTRANS_HSYNC_A); -I915_WRITE (TRANS_VTOTAL_A , dev_priv->saveTRANS_VTOTAL_A); -I915_WRITE (TRANS_VBLANK_A , dev_priv->saveTRANS_VBLANK_A); -I915_WRITE (TRANS_VSYNC_A , dev_priv->saveTRANS_VSYNC_A); - } - -/* Restore plane info */ -I915_WRITE (DSPASIZE , dev_priv->saveDSPASIZE); -I915_WRITE (DSPAPOS , dev_priv->saveDSPAPOS); -I915_WRITE (PIPEASRC , dev_priv->savePIPEASRC); -I915_WRITE (DSPAADDR , dev_priv->saveDSPAADDR); -I915_WRITE (DSPASTRIDE , dev_priv->saveDSPASTRIDE); -if (INTEL_INFO (dev)->gen >=4 ) { -I915_WRITE (DSPASURF , dev_priv->saveDSPASURF); -I915_WRITE (DSPATILEOFF , dev_priv->saveDSPATILEOFF); - } - -I915_WRITE (PIPEACONF , dev_priv->savePIPEACONF); - -i915_restore_palette (dev,PIPE_A ); -/* Enable the plane */ -I915_WRITE (DSPACNTR , dev_priv->saveDSPACNTR); -I915_WRITE (DSPAADDR ,I915_READ (DSPAADDR )); - -/* Pipe & plane B info */ -if (dev_priv->saveDPLL_B &DPLL_VCO_ENABLE ) { -I915_WRITE (dpll_b_reg, dev_priv->saveDPLL_B & - ~DPLL_VCO_ENABLE ); -POSTING_READ (dpll_b_reg); -udelay (150 ); - } -I915_WRITE (fpb0_reg, dev_priv->saveFPB0); -I915_WRITE (fpb1_reg, dev_priv->saveFPB1); -/* Actually enable it */ -I915_WRITE (dpll_b_reg, dev_priv->saveDPLL_B); -POSTING_READ (dpll_b_reg); -udelay (150 ); -if (INTEL_INFO (dev)->gen >=4 && !HAS_PCH_SPLIT (dev)) { -I915_WRITE (DPLL_B_MD , dev_priv->saveDPLL_B_MD); -POSTING_READ (DPLL_B_MD ); - } -udelay (150 ); - -/* Restore mode */ -I915_WRITE (HTOTAL_B , dev_priv->saveHTOTAL_B); -I915_WRITE (HBLANK_B , dev_priv->saveHBLANK_B); -I915_WRITE (HSYNC_B , dev_priv->saveHSYNC_B); -I915_WRITE (VTOTAL_B , dev_priv->saveVTOTAL_B); -I915_WRITE (VBLANK_B , dev_priv->saveVBLANK_B); -I915_WRITE (VSYNC_B , dev_priv->saveVSYNC_B); -if (!HAS_PCH_SPLIT (dev)) -I915_WRITE (BCLRPAT_B , dev_priv->saveBCLRPAT_B); - -if (HAS_PCH_SPLIT (dev)) { -I915_WRITE (PIPEB_DATA_M1 , dev_priv->savePIPEB_DATA_M1); -I915_WRITE (PIPEB_DATA_N1 , dev_priv->savePIPEB_DATA_N1); -I915_WRITE (PIPEB_LINK_M1 , dev_priv->savePIPEB_LINK_M1); -I915_WRITE (PIPEB_LINK_N1 , dev_priv->savePIPEB_LINK_N1); - -I915_WRITE (FDI_RXB_CTL , dev_priv->saveFDI_RXB_CTL); -I915_WRITE (FDI_TXB_CTL , dev_priv->saveFDI_TXB_CTL); - -I915_WRITE (PFB_CTL_1 , dev_priv->savePFB_CTL_1); -I915_WRITE (PFB_WIN_SZ , dev_priv->savePFB_WIN_SZ); -I915_WRITE (PFB_WIN_POS , dev_priv->savePFB_WIN_POS); - -I915_WRITE (TRANSBCONF , dev_priv->saveTRANSBCONF); -I915_WRITE (TRANS_HTOTAL_B , dev_priv->saveTRANS_HTOTAL_B); -I915_WRITE (TRANS_HBLANK_B , dev_priv->saveTRANS_HBLANK_B); -I915_WRITE (TRANS_HSYNC_B , dev_priv->saveTRANS_HSYNC_B); -I915_WRITE (TRANS_VTOTAL_B , dev_priv->saveTRANS_VTOTAL_B); -I915_WRITE (TRANS_VBLANK_B , dev_priv->saveTRANS_VBLANK_B); -I915_WRITE (TRANS_VSYNC_B , dev_priv->saveTRANS_VSYNC_B); - } - -/* Restore plane info */ -I915_WRITE (DSPBSIZE , dev_priv->saveDSPBSIZE); -I915_WRITE (DSPBPOS , dev_priv->saveDSPBPOS); -I915_WRITE (PIPEBSRC , dev_priv->savePIPEBSRC); -I915_WRITE (DSPBADDR , dev_priv->saveDSPBADDR); -I915_WRITE (DSPBSTRIDE , dev_priv->saveDSPBSTRIDE); -if (INTEL_INFO (dev)->gen >=4 ) { -I915_WRITE (DSPBSURF , dev_priv->saveDSPBSURF); -I915_WRITE (DSPBTILEOFF , dev_priv->saveDSPBTILEOFF); - } - -I915_WRITE (PIPEBCONF , dev_priv->savePIPEBCONF); - -i915_restore_palette (dev,PIPE_B ); -/* Enable the plane */ -I915_WRITE (DSPBCNTR , dev_priv->saveDSPBCNTR); -I915_WRITE (DSPBADDR ,I915_READ (DSPBADDR )); - -/* Cursor state */ -I915_WRITE (CURAPOS , dev_priv->saveCURAPOS); -I915_WRITE (CURACNTR , dev_priv->saveCURACNTR); -I915_WRITE (CURABASE , dev_priv->saveCURABASE); -I915_WRITE (CURBPOS , dev_priv->saveCURBPOS); -I915_WRITE (CURBCNTR , dev_priv->saveCURBCNTR); -I915_WRITE (CURBBASE , dev_priv->saveCURBBASE); -if (IS_GEN2 (dev)) -I915_WRITE (CURSIZE , dev_priv->saveCURSIZE); - -return ; -} -void i915_save_display (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -605,10 +181,6 @@ void i915_save_display(struct drm_device *dev)/* Display arbitration control */ dev_priv->saveDSPARB =I915_READ (DSPARB ); -/* This is only meaningful in non-KMS mode */ -/* Don't save them in KMS mode */ -i915_save_modeset_reg (dev); -/* CRT state */ if (HAS_PCH_SPLIT (dev)) { dev_priv->saveADPA =I915_READ (PCH_ADPA );
@@ -648,22 +220,6 @@ void i915_save_display(struct drm_device *dev) dev_priv->savePP_DIVISOR =I915_READ (PP_DIVISOR ); } -/* Display Port state */ -if (SUPPORTS_INTEGRATED_DP (dev)) { - dev_priv->saveDP_B =I915_READ (DP_B ); - dev_priv->saveDP_C =I915_READ (DP_C ); - dev_priv->saveDP_D =I915_READ (DP_D ); - dev_priv->savePIPEA_GMCH_DATA_M =I915_READ (PIPEA_GMCH_DATA_M ); - dev_priv->savePIPEB_GMCH_DATA_M =I915_READ (PIPEB_GMCH_DATA_M ); - dev_priv->savePIPEA_GMCH_DATA_N =I915_READ (PIPEA_GMCH_DATA_N ); - dev_priv->savePIPEB_GMCH_DATA_N =I915_READ (PIPEB_GMCH_DATA_N ); - dev_priv->savePIPEA_DP_LINK_M =I915_READ (PIPEA_DP_LINK_M ); - dev_priv->savePIPEB_DP_LINK_M =I915_READ (PIPEB_DP_LINK_M ); - dev_priv->savePIPEA_DP_LINK_N =I915_READ (PIPEA_DP_LINK_N ); - dev_priv->savePIPEB_DP_LINK_N =I915_READ (PIPEB_DP_LINK_N ); - } -/* FIXME: save TV & SDVO state */ -/* Only save FBC state on the platform that supports FBC */ if (I915_HAS_FBC (dev)) {if (HAS_PCH_SPLIT (dev)) {
@@ -697,22 +253,6 @@ void i915_restore_display(struct drm_device *dev)/* Display arbitration */ I915_WRITE (DSPARB , dev_priv->saveDSPARB); -/* Display port ratios (must be done before clock is set) */ -if (SUPPORTS_INTEGRATED_DP (dev)) { -I915_WRITE (PIPEA_GMCH_DATA_M , dev_priv->savePIPEA_GMCH_DATA_M); -I915_WRITE (PIPEB_GMCH_DATA_M , dev_priv->savePIPEB_GMCH_DATA_M); -I915_WRITE (PIPEA_GMCH_DATA_N , dev_priv->savePIPEA_GMCH_DATA_N); -I915_WRITE (PIPEB_GMCH_DATA_N , dev_priv->savePIPEB_GMCH_DATA_N); -I915_WRITE (PIPEA_DP_LINK_M , dev_priv->savePIPEA_DP_LINK_M); -I915_WRITE (PIPEB_DP_LINK_M , dev_priv->savePIPEB_DP_LINK_M); -I915_WRITE (PIPEA_DP_LINK_N , dev_priv->savePIPEA_DP_LINK_N); -I915_WRITE (PIPEB_DP_LINK_N , dev_priv->savePIPEB_DP_LINK_N); - } - -/* This is only meaningful in non-KMS mode */ -/* Don't restore them in KMS mode */ -i915_restore_modeset_reg (dev); -/* CRT state */ if (HAS_PCH_SPLIT (dev))I915_WRITE (PCH_ADPA , dev_priv->saveADPA);
@@ -808,8 +348,6 @@ int i915_save_state(struct drm_device *dev) dev_priv->saveDEIMR =I915_READ (DEIMR ); dev_priv->saveGTIER =I915_READ (GTIER ); dev_priv->saveGTIMR =I915_READ (GTIMR ); - dev_priv->saveFDI_RXA_IMR =I915_READ (FDI_RXA_IMR ); - dev_priv->saveFDI_RXB_IMR =I915_READ (FDI_RXB_IMR ); dev_priv->saveMCHBAR_RENDER_STANDBY =I915_READ (RSTDBYCTL ); }else {
@@ -857,8 +395,6 @@ int i915_restore_state(struct drm_device *dev)I915_WRITE (DEIMR , dev_priv->saveDEIMR);I915_WRITE (GTIER , dev_priv->saveGTIER);I915_WRITE (GTIMR , dev_priv->saveGTIMR); -I915_WRITE (FDI_RXA_IMR , dev_priv->saveFDI_RXA_IMR); -I915_WRITE (FDI_RXB_IMR , dev_priv->saveFDI_RXB_IMR); }else {I915_WRITE (IER , dev_priv->saveIER);I915_WRITE (IMR , dev_priv->saveIMR);
Signature · 1 line
1.7.2.3
PATCH 2/2 drm/i915: cleanup per-pipe reg usage
We had some conversions over to the _PIPE macros, but didn't get everything. So hide the per-pipe regs with an _ (still used in a few places for legacy) and add a few _PIPE based macros, then make sure everyone uses them.
Signed-off-by Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +- drivers/gpu/drm/i915/i915_dma.c | 9 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/i915_irq.c | 145 ++++++------ drivers/gpu/drm/i915/i915_reg.h | 432 ++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_crt.c | 33 +-- drivers/gpu/drm/i915/intel_display.c | 136 ++++++----- drivers/gpu/drm/i915/intel_dp.c | 45 +--- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 5 +- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_tv.c | 10 +- 12 files changed, 425 insertions(+), 424 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +9 -10
@@ -326,21 +326,21 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)struct intel_crtc *crtc;list_for_each_entry (crtc, &dev->mode_config.crtc_list, base.head) { -const char *pipe = crtc->pipe ?"B" :"A" ; -const char *plane = crtc->plane ?"B" :"A" ; +const char pipe = crtc->pipe +'A' ; +const char plane = crtc->plane +'A' ;struct intel_unpin_work *work;spin_lock_irqsave (&dev->event_lock, flags); work = crtc->unpin_work;if (work ==NULL ) { -seq_printf (m,"No flip due on pipe %s (plane %s)\n" , +seq_printf (m,"No flip due on pipe %c (plane %c)\n" , pipe, plane); }else {if (!work->pending) { -seq_printf (m,"Flip queued on pipe %s (plane %s)\n" , +seq_printf (m,"Flip queued on pipe %c (plane %c)\n" , pipe, plane); }else { -seq_printf (m,"Flip pending (waiting for vsync) on pipe %s (plane %s)\n" , +seq_printf (m,"Flip pending (waiting for vsync) on pipe %c (plane %c)\n" , pipe, plane); }if (work->enable_stall_check)
@@ -458,7 +458,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;drm_i915_private_t *dev_priv = dev->dev_private; -int ret, i; +int ret, i, pipe; ret =mutex_lock_interruptible (&dev->struct_mutex);if (ret)
@@ -471,10 +471,9 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(IIR));seq_printf (m,"Interrupt mask: %08x\n" ,I915_READ (IMR )); -seq_printf (m,"Pipe A stat: %08x\n" , -I915_READ (PIPEASTAT )); -seq_printf (m,"Pipe B stat: %08x\n" , -I915_READ (PIPEBSTAT )); +for_each_pipe (pipe) +seq_printf (m,"Pipe %d stat: %08x\n" , pipe, +I915_READ (PIPESTAT (pipe))); }else {seq_printf (m,"North Display Interrupt enable: %08x\n" ,I915_READ (DEIER ));
drivers/gpu/drm/i915/i915_dma.c +8 -1
@@ -2005,7 +2005,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->error_lock); - ret =drm_vblank_init (dev,I915_NUM_PIPE ); +if (IS_IVYBRIDGE (dev)) + dev_priv->num_pipe =3 ; +else if (IS_MOBILE (dev) || !IS_GEN2 (dev)) + dev_priv->num_pipe =2 ; +else + dev_priv->num_pipe =1 ; + + ret =drm_vblank_init (dev, dev_priv->num_pipe);if (ret) goto out_gem_unload;
drivers/gpu/drm/i915/i915_drv.h +7 -4
@@ -50,17 +50,21 @@enum pipe {PIPE_A =0 ,PIPE_B , +PIPE_C , }; +#define I915_MAX_PIPES 3 +enum plane {PLANE_A =0 ,PLANE_B , +PLANE_C , }; -#define I915_NUM_PIPE 2 -#define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) +#define for_each_pipe (p) for((p) = 0; (p) < dev_priv->num_pipe; (p)++) +/* Interface history: * * 1.1: Original.
@@ -143,8 +147,7 @@ struct intel_display_error_state;struct drm_i915_error_state {u32 eir;u32 pgtbl_er; -u32 pipeastat; -u32 pipebstat; +u32 pipestat[I915_MAX_PIPES ];u32 ipeir;u32 ipehr;u32 instdone;
drivers/gpu/drm/i915/i915_irq.c +68 -77
291 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +231 -201
644 lines not on this page · raw message
drivers/gpu/drm/i915/intel_crt.c +10 -23
@@ -129,10 +129,7 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,u32 adpa, dpll_md;u32 adpa_reg; -if (intel_crtc->pipe ==0 ) - dpll_md_reg =DPLL_A_MD ; -else - dpll_md_reg =DPLL_B_MD ; + dpll_md_reg =DPLL_MD (intel_crtc->pipe);if (HAS_PCH_SPLIT (dev)) adpa_reg =PCH_ADPA ;
@@ -160,17 +157,16 @@ static void intel_crt_mode_set(struct drm_encoder *encoder, adpa |=PORT_TRANS_A_SEL_CPT ; else adpa |= ADPA_PIPE_A_SELECT; -if (!HAS_PCH_SPLIT (dev)) -I915_WRITE (BCLRPAT_A ,0 ); }else {if (HAS_PCH_CPT (dev)) adpa |=PORT_TRANS_B_SEL_CPT ;else adpa |=ADPA_PIPE_B_SELECT ; -if (!HAS_PCH_SPLIT (dev)) -I915_WRITE (BCLRPAT_B ,0 ); } +if (!HAS_PCH_SPLIT (dev)) +I915_WRITE (BCLRPAT (intel_crtc->pipe),0 ); +I915_WRITE (adpa_reg, adpa); }
@@ -353,21 +349,12 @@ intel_crt_load_detect(struct drm_crtc *crtc, struct intel_crt *crt)DRM_DEBUG_KMS ("starting load-detect on CRT\n" ); -if (pipe ==0 ) { - bclrpat_reg =BCLRPAT_A ; - vtotal_reg =VTOTAL_A ; - vblank_reg =VBLANK_A ; - vsync_reg =VSYNC_A ; - pipeconf_reg =PIPEACONF ; - pipe_dsl_reg =PIPEADSL ; - }else { - bclrpat_reg =BCLRPAT_B ; - vtotal_reg =VTOTAL_B ; - vblank_reg =VBLANK_B ; - vsync_reg =VSYNC_B ; - pipeconf_reg =PIPEBCONF ; - pipe_dsl_reg =PIPEBDSL ; - } + bclrpat_reg =BCLRPAT (pipe); + vtotal_reg =VTOTAL (pipe); + vblank_reg =VBLANK (pipe); + vsync_reg =VSYNC (pipe); + pipeconf_reg =PIPECONF (pipe); + pipe_dsl_reg =PIPEDSL (pipe); save_bclrpat =I915_READ (bclrpat_reg); save_vtotal =I915_READ (vtotal_reg);
drivers/gpu/drm/i915/intel_display.c +70 -66
335 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +13 -32
58 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dvo.c +1 -1
@@ -178,7 +178,7 @@ static void intel_dvo_mode_set(struct drm_encoder *encoder,int pipe = intel_crtc->pipe;u32 dvo_val;u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg; -int dpll_reg = (pipe ==0 ) ?DPLL_A :DPLL_B ; +int dpll_reg =DPLL (pipe);switch (dvo_reg) {case DVOA :
drivers/gpu/drm/i915/intel_lvds.c +3 -2
@@ -231,6 +231,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,struct intel_lvds *intel_lvds =to_intel_lvds (encoder);struct drm_encoder *tmp_encoder;u32 pfit_control =0 , pfit_pgm_ratios =0 , border =0 ; +int pipe;/* Should never happen!! */ if (INTEL_INFO (dev)->gen <4 && intel_crtc->pipe ==0 ) {
@@ -283,8 +284,8 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,* to register description and PRM. * Change the value here to see the borders for debugging */ -I915_WRITE (BCLRPAT_A ,0 ); -I915_WRITE (BCLRPAT_B ,0 ); +for_each_pipe (pipe) +I915_WRITE (BCLRPAT (pipe),0 );switch (intel_lvds->fitting_mode) {case DRM_MODE_SCALE_CENTER :
drivers/gpu/drm/i915/intel_overlay.c +1 -1
@@ -255,7 +255,7 @@ i830_activate_pipe_a(struct drm_device *dev)return 0 ;/* most i8xx have pipe a forced on, so don't trust dpms mode */ -if (I915_READ (PIPEACONF ) &PIPECONF_ENABLE ) +if (I915_READ (_PIPEACONF) &PIPECONF_ENABLE )return 0 ; crtc_funcs = crtc->base.helper_private;
drivers/gpu/drm/i915/intel_tv.c +4 -6
@@ -1006,6 +1006,7 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,const struct video_levels *video_levels;const struct color_conversion *color_conversion;bool burst_ena; +int pipe = intel_crtc->pipe;if (!tv_mode)return ;/* can't happen (mode_prepare prevents this) */
@@ -1149,14 +1150,11 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, ((video_levels->black <<TV_BLACK_LEVEL_SHIFT ) | (video_levels->blank << TV_BLANK_LEVEL_SHIFT))); { -int pipeconf_reg = (intel_crtc->pipe ==0 ) ? -PIPEACONF :PIPEBCONF ; -int dspcntr_reg = (intel_crtc->plane ==0 ) ? -DSPACNTR :DSPBCNTR ; +int pipeconf_reg =PIPECONF (pipe); +int dspcntr_reg =DSPCNTR (pipe);int pipeconf =I915_READ (pipeconf_reg);int dspcntr =I915_READ (dspcntr_reg); -int dspbase_reg = (intel_crtc->plane ==0 ) ? -DSPAADDR :DSPBADDR ; +int dspbase_reg =DSPADDR (pipe);int xpos =0x0 , ypos =0x0 ;unsigned int xsize, ysize;/* Pipe must be off here */
Signature · 1 line
1.7.2.3