drm/i915: cleanup per-pipe reg usage
Subsystems (2)
PATCH 1/1 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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +- drivers/gpu/drm/i915/i915_dma.c | 7 +- 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/i915_suspend.c | 420 +++++++++++++++++----------------- 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 +- 13 files changed, 633 insertions(+), 634 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 +6 -1
@@ -2005,7 +2005,12 @@ 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_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/i915_suspend.c +210 -210
568 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
Quoted 4 lines · Jesse Barnes
We had some conversions over to the
_PIPEmacros, 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_PIPEbased macros, then make sure everyone uses them.
In the end, I tabled a couple of amendments to the patch to perform some drive-by stylistic changes admist the general slaughter. (Including the mixing of too many metaphors.)
Boot tested on gen2-6 and applied to -next, thanks! -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre