IVB 3 pipe support
Subsystems (2)
Here's an updated set of 3 pipe patches that seem to work pretty well. Additional testing & review appreciated. I think they're ready to merge now but may not be bug free.
Thanks,
Jesse
PATCH 1/8 drm/i915: PLL macro cleanup and pipe assertion check
Add a macro for accessing the two pipe PLLs and add a check to make sure we don't access a non-existent one in the enable/disable functions.
--- drivers/gpu/drm/i915/i915_reg.h | 6 +++--- drivers/gpu/drm/i915/intel_display.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -3
@@ -2958,15 +2958,15 @@#define _PCH_DPLL_A 0xc6014#define _PCH_DPLL_B 0xc6018 -#define PCH_DPLL (pipe) _PIPE(pipe, _PCH_DPLL_A, _PCH_DPLL_B) +#define PCH_DPLL (pipe) (pipe == 0 ? _PCH_DPLL_A : _PCH_DPLL_B)#define _PCH_FPA0 0xc6040#define FP_CB_TUNE (0x3<<22)#define _PCH_FPA1 0xc6044#define _PCH_FPB0 0xc6048#define _PCH_FPB1 0xc604c -#define PCH_FP0 (pipe) _PIPE(pipe, _PCH_FPA0, _PCH_FPB0) -#define PCH_FP1 (pipe) _PIPE(pipe, _PCH_FPA1, _PCH_FPB1) +#define PCH_FP0 (pipe) (pipe == 0 ? _PCH_FPA0 : _PCH_FPB0) +#define PCH_FP1 (pipe) (pipe == 0 ? _PCH_FPA1 : _PCH_FPB1)#define PCH_DPLL_TEST 0xc606c
drivers/gpu/drm/i915/intel_display.c +6 -0
@@ -1172,6 +1172,9 @@ static void intel_enable_pch_pll(struct drm_i915_private *dev_priv,int reg;u32 val; +if (pipe >1 ) +return ; +/* PCH only available on ILK+ */ BUG_ON (dev_priv->info->gen <5 );
@@ -1192,6 +1195,9 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv,int reg;u32 val; +if (pipe >1 ) +return ; +/* PCH only available on ILK+ */ BUG_ON (dev_priv->info->gen <5 );
Signature · 1 line
1.7.4.1
PATCH 2/8 drm/i915: support 3 pipes on IVB+
In reply to Jesse BarnesWell almost anyway. IVB has 3 planes, pipes, transcoders, and FDI interfaces, but only 2 pipe PLLs. So two of the pipes must use the same pipe timings (e.g. 2 DP plus one other, or two HDMI with the same mode and one other, etc.).
--- drivers/gpu/drm/i915/i915_dma.c | 4 +++- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 8 +++++--- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -1
@@ -2035,7 +2035,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)spin_lock_init (&dev_priv->error_lock);spin_lock_init (&dev_priv->rps_lock); -if (IS_MOBILE (dev) || !IS_GEN2 (dev)) +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 ;
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -676,8 +676,8 @@ typedef struct drm_i915_private {u32 pch_pf_pos, pch_pf_size;int panel_t3, panel_t12; -struct drm_crtc *plane_to_crtc_mapping[2 ]; -struct drm_crtc *pipe_to_crtc_mapping[2 ]; +struct drm_crtc *plane_to_crtc_mapping[3 ]; +struct drm_crtc *pipe_to_crtc_mapping[3 ];wait_queue_head_t pending_flip_queue;bool flip_pending_is_done;
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -2084,6 +2084,7 @@ static int ironlake_update_plane(struct drm_crtc *crtc,switch (plane) {case 0 :case 1 : +case 2 :break ;default :DRM_ERROR ("Can't update plane %d in SAREA\n" , plane);
@@ -2183,6 +2184,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,case 0 :case 1 :break ; +case 2 : +if (IS_IVYBRIDGE (dev)) +break ; +/* fall through otherwise */ default :DRM_ERROR ("no plane for crtc\n" );return -EINVAL ;
@@ -2879,6 +2884,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) temp |= (TRANSA_DPLL_ENABLE |TRANSA_DPLLA_SEL ); else if (pipe == 1 && (temp & TRANSB_DPLL_ENABLE) == 0) temp |= (TRANSB_DPLL_ENABLE |TRANSB_DPLLB_SEL ); + else if (pipe == 2 && (temp & TRANSC_DPLL_ENABLE) == 0) + temp |= (TRANSC_DPLL_ENABLE |TRANSC_DPLLB_SEL );I915_WRITE (PCH_DPLL_SEL , temp); }
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -2000,7 +2000,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)if (is_edp (intel_dp)) intel_encoder->clone_mask = (1 <<INTEL_EDP_CLONE_BIT ); - intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); + intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); connector->interlace_allowed = true; connector->doublescan_allowed =0 ;
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -514,7 +514,7 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) connector->polled =DRM_CONNECTOR_POLL_HPD ; connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); + intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );/* Set up the DDC bus. */ if (sdvox_reg ==SDVOB ) {
drivers/gpu/drm/i915/intel_lvds.c +5 -3
@@ -888,9 +888,11 @@ bool intel_lvds_init(struct drm_device *dev) intel_encoder->type =INTEL_OUTPUT_LVDS ; intel_encoder->clone_mask = (1 <<INTEL_LVDS_CLONE_BIT ); - intel_encoder->crtc_mask = (1 <<1 ); -if (INTEL_INFO (dev)->gen >=5 ) - intel_encoder->crtc_mask |= (1 <<0 ); +if (HAS_PCH_SPLIT (dev)) + intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); +else + intel_encoder->crtc_mask = (1 <<1 ); +drm_encoder_helper_add (encoder, &intel_lvds_helper_funcs);drm_connector_helper_add (connector, &intel_lvds_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB;
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -2244,7 +2244,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags) bytes[0], bytes[1]);return false; } - intel_sdvo->base.crtc_mask = (1 <<0 ) | (1 <<1 ); + intel_sdvo->base.crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );return true; }
Signature · 1 line
1.7.4.1
PATCH 3/8 drm/i915: split refclk code out of ironlake_crtc_mode_set
In reply to Jesse BarnesJust a cleanup to make the mode_set function more manageable.
--- drivers/gpu/drm/i915/intel_display.c | 45 ++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +35 -10
@@ -5188,6 +5188,40 @@ static void ironlake_update_pch_refclk(struct drm_device *dev) } } +static int ironlake_get_refclk (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_encoder *encoder; +struct drm_mode_config *mode_config = &dev->mode_config; +struct intel_encoder *edp_encoder =NULL ; +int num_connectors =0 ; +bool is_lvds = false; + +list_for_each_entry (encoder, &mode_config->encoder_list, base.head) { +if (encoder->base.crtc != crtc) +continue ; + +switch (encoder->type) { +case INTEL_OUTPUT_LVDS : + is_lvds = true; +break ; +case INTEL_OUTPUT_EDP : + edp_encoder = encoder; +break ; + } + num_connectors++; + } + +if (is_lvds &&intel_panel_use_ssc (dev_priv) && num_connectors <2 ) { +DRM_DEBUG_KMS ("using SSC reference clock of %d MHz\n" , + dev_priv->lvds_ssc_freq); +return dev_priv->lvds_ssc_freq *1000 ; + } + +return 120000 ; +} + static int ironlake_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode,
@@ -5247,16 +5281,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, num_connectors++; } -if (is_lvds &&intel_panel_use_ssc (dev_priv) && num_connectors <2 ) { - refclk = dev_priv->lvds_ssc_freq *1000 ; -DRM_DEBUG_KMS ("using SSC reference clock of %d MHz\n" , - refclk /1000 ); - }else { - refclk =96000 ; -if (!has_edp_encoder || -intel_encoder_is_pch_edp (&has_edp_encoder->base)) - refclk =120000 ;/* 120Mhz refclk */ - } + refclk =ironlake_get_refclk (crtc);/* * Returns a set of divisors for the desired target clock with the given
Signature · 1 line
1.7.4.1
PATCH 4/8 drm/i915: use transcoder select bits on VGA and HDMI on CPT
In reply to Jesse BarnesRequired for 3 pipe functionality.
--- drivers/gpu/drm/i915/intel_crt.c | 18 +++++++----------- drivers/gpu/drm/i915/intel_hdmi.c | 10 ++++------ 2 files changed, 11 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +7 -11
@@ -152,17 +152,13 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,if (adjusted_mode->flags &DRM_MODE_FLAG_PVSYNC ) adpa |=ADPA_VSYNC_ACTIVE_HIGH ; -if (intel_crtc->pipe ==0 ) { -if (HAS_PCH_CPT (dev)) - adpa |=PORT_TRANS_A_SEL_CPT ; -else - adpa |=ADPA_PIPE_A_SELECT ; - }else { -if (HAS_PCH_CPT (dev)) - adpa |=PORT_TRANS_B_SEL_CPT ; -else - adpa |=ADPA_PIPE_B_SELECT ; - } +/* For CPT allow 3 pipe config, for others just use A or B */ +if (HAS_PCH_CPT (dev)) + adpa |=PORT_TRANS_SEL_CPT (intel_crtc->pipe); +else if (intel_crtc->pipe ==0 ) + adpa |=ADPA_PIPE_A_SELECT ; +else + adpa |=ADPA_PIPE_B_SELECT ;if (!HAS_PCH_SPLIT (dev))I915_WRITE (BCLRPAT (intel_crtc->pipe),0 );
drivers/gpu/drm/i915/intel_hdmi.c +4 -6
@@ -252,12 +252,10 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,intel_write_eld (encoder, adjusted_mode); } -if (intel_crtc->pipe ==1 ) { -if (HAS_PCH_CPT (dev)) - sdvox |=PORT_TRANS_B_SEL_CPT ; -else - sdvox |=SDVO_PIPE_B_SELECT ; - } +if (HAS_PCH_CPT (dev)) + sdvox |=PORT_TRANS_SEL_CPT (intel_crtc->pipe); +else if (intel_crtc->pipe ==1 ) + sdvox |=SDVO_PIPE_B_SELECT ;I915_WRITE (intel_hdmi->sdvox_reg, sdvox);POSTING_READ (intel_hdmi->sdvox_reg);
Signature · 1 line
1.7.4.1
PATCH 5/8 drm/i915: fix PCH PLL assertion check for 3 pipes
In reply to Jesse BarnesAdd a couple of checks now that we're using the 3rd transcoder:
1) make sure the transcoder PLL enable bit is set for the transcoder in question
2) when checking actual PLL enable, use the selected PLL number rather than the transcoder number (they could be different now)
--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/intel_display.c +13 -0
@@ -803,6 +803,19 @@ static void assert_pch_pll(struct drm_i915_private *dev_priv,u32 val;bool cur_state; +if (HAS_PCH_CPT (dev_priv->dev)) { +u32 pch_dpll; + + pch_dpll =I915_READ (PCH_DPLL_SEL ); + +/* Make sure the selected PLL is enabled to the transcoder */ +WARN (!((pch_dpll >> (4 * pipe)) &8 ), +"transcoder %d PLL not enabled\n" , pipe); + +/* Convert the transcoder pipe number to a pll pipe number */ + pipe = (pch_dpll >> (4 * pipe)) &1 ; + } + reg =PCH_DPLL (pipe); val =I915_READ (reg); cur_state = !!(val &DPLL_VCO_ENABLE );
Signature · 1 line
1.7.4.1
PATCH 6/8 drm/i915: always set FDI composite sync bit
In reply to Jesse BarnesOn IVB with CPT or PPT PCH chips, FDI sync can be done with one or two wires depending on the board configuration. For 3 pipe configurations, since FDI B and C share lanes, composite sync must be used. The board design specs require that composite sync always work in general too, so just use it by default, since we don't currently have a way of knowing if frame/line sync are supported on a given board.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -3180,6 +3180,7 @@#define FDI_LINK_TRAIN_NONE_IVB (3<<8)/* both Tx and Rx */ +#define FDI_COMPOSITE_SYNC (1<<11)#define FDI_LINK_TRAIN_AUTO (1<<10)#define FDI_SCRAMBLING_ENABLE (0<<7)#define FDI_SCRAMBLING_DISABLE (1<<7)
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -2617,6 +2617,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; + temp |=FDI_COMPOSITE_SYNC ;I915_WRITE (reg, temp |FDI_TX_ENABLE ); reg =FDI_RX_CTL (pipe);
@@ -2624,6 +2625,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) temp &= ~FDI_LINK_TRAIN_AUTO ; temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; + temp |=FDI_COMPOSITE_SYNC ;I915_WRITE (reg, temp |FDI_RX_ENABLE );POSTING_READ (reg);
Signature · 1 line
1.7.4.1
PATCH 7/8 drm/i915: add PLL sharing support to handle 3 pipes
In reply to Jesse BarnesAdd two new fields to the intel_crtc struct for 3 pipe support: no_pll and use_pll_a. The no_pll field is only set on the 3rd pipe to indicate that it doesn't have a PLL of its own and so shouldn't try to write the main PLL regs. The use_pll_a field controls which PLL pipe 3 will share, A or B. The core code will try to share PLLs with whichever pipe has the same timings, rejecting the mode set if none is found. This means that pipe 3 must always be set after one of the other pipes has been configured with real PLL settings.
--- drivers/gpu/drm/i915/intel_display.c | 87 +++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 3 + 2 files changed, 57 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_display.c +54 -33
@@ -2885,7 +2885,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int pipe = intel_crtc->pipe; -u32 reg, temp; +u32 reg, temp, transc_sel;/* For PCH output, training FDI link */ dev_priv->display.fdi_link_train (crtc);
@@ -2893,6 +2893,9 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)intel_enable_pch_pll (dev_priv, pipe);if (HAS_PCH_CPT (dev)) { + transc_sel = intel_crtc->use_pll_a ?TRANSC_DPLLA_SEL : +TRANSC_DPLLB_SEL ; +/* Be sure PCH DPLL SEL is set */ temp =I915_READ (PCH_DPLL_SEL );if (pipe ==0 && (temp &TRANSA_DPLL_ENABLE ) ==0 )
@@ -2900,7 +2903,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)else if (pipe ==1 && (temp &TRANSB_DPLL_ENABLE ) ==0 ) temp |= (TRANSB_DPLL_ENABLE |TRANSB_DPLLB_SEL );else if (pipe ==2 && (temp &TRANSC_DPLL_ENABLE ) ==0 ) - temp |= (TRANSC_DPLL_ENABLE |TRANSC_DPLLB_SEL ); + temp |= (TRANSC_DPLL_ENABLE | transc_sel);I915_WRITE (PCH_DPLL_SEL , temp); }
@@ -3072,8 +3075,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) temp &= ~(TRANSB_DPLL_ENABLE |TRANSB_DPLLB_SEL );break ;case 2 : -/* FIXME: manage transcoder PLLs? */ - temp &= ~(TRANSC_DPLL_ENABLE |TRANSC_DPLLB_SEL ); +/* C shares PLL A or B */ + temp &= ~(TRANSC_DPLL_ENABLE |TRANSB_DPLLB_SEL );break ;default :BUG ();/* wtf */
@@ -3082,7 +3085,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) }/* disable PCH DPLL */ -intel_disable_pch_pll (dev_priv, pipe); +if (!intel_crtc->no_pll) +intel_disable_pch_pll (dev_priv, pipe);/* Switch from PCDclk to Rawclk */ reg =FDI_RX_CTL (pipe);
@@ -5500,16 +5504,33 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,drm_mode_debug_printmodeline (mode);/* PCH eDP needs FDI, but CPU eDP does not */ -if (!has_edp_encoder ||intel_encoder_is_pch_edp (&has_edp_encoder->base)) { +if (!intel_crtc->no_pll && + (!has_edp_encoder || +intel_encoder_is_pch_edp (&has_edp_encoder->base))) {I915_WRITE (PCH_FP0 (pipe), fp);I915_WRITE (PCH_DPLL (pipe), dpll & ~DPLL_VCO_ENABLE );POSTING_READ (PCH_DPLL (pipe));udelay (150 ); + }else { +if (dpll == (I915_READ (PCH_DPLL (0 )) &0x7fffffff ) && + fp ==I915_READ (PCH_FP0 (0 ))) { + intel_crtc->use_pll_a = true; +DRM_DEBUG_KMS ("using pipe a dpll\n" ); + }else if (dpll == (I915_READ (PCH_DPLL (1 )) &0x7fffffff ) && + fp ==I915_READ (PCH_FP0 (1 ))) { + intel_crtc->use_pll_a = false; +DRM_DEBUG_KMS ("using pipe b dpll\n" ); + }else { +DRM_DEBUG_KMS ("no matching PLL configuration for pipe 2\n" ); +return -EINVAL ; + } }/* enable transcoder DPLL */ if (HAS_PCH_CPT (dev)) { +u32 transc_sel = intel_crtc->use_pll_a ?TRANSC_DPLLA_SEL : +TRANSC_DPLLB_SEL ; temp =I915_READ (PCH_DPLL_SEL );switch (pipe) {case 0 :
@@ -5519,8 +5540,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, temp |=TRANSB_DPLL_ENABLE |TRANSB_DPLLB_SEL ;break ;case 2 : -/* FIXME: manage transcoder PLLs? */ - temp |=TRANSC_DPLL_ENABLE |TRANSC_DPLLB_SEL ; + temp |=TRANSC_DPLL_ENABLE | transc_sel;break ;default :BUG ();
@@ -5538,17 +5558,13 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,if (is_lvds) { temp =I915_READ (PCH_LVDS ); temp |=LVDS_PORT_EN |LVDS_A0A2_CLKA_POWER_UP ; -if (pipe ==1 ) { -if (HAS_PCH_CPT (dev)) - temp |=PORT_TRANS_B_SEL_CPT ; -else - temp |=LVDS_PIPEB_SELECT ; - }else { -if (HAS_PCH_CPT (dev)) - temp &= ~PORT_TRANS_SEL_MASK ; -else - temp &= ~LVDS_PIPEB_SELECT ; - } +if (HAS_PCH_CPT (dev)) + temp |=PORT_TRANS_SEL_CPT (pipe); +else if (pipe ==1 ) + temp |=LVDS_PIPEB_SELECT ; +else + temp &= ~LVDS_PIPEB_SELECT ; +/* set the corresponsding LVDS_BORDER bit */ temp |= dev_priv->lvds_border_bits;/* Set the B0-B3 data pairs corresponding to whether we're going to
@@ -5598,8 +5614,9 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,I915_WRITE (TRANSDPLINK_N1 (pipe),0 ); } -if (!has_edp_encoder || -intel_encoder_is_pch_edp (&has_edp_encoder->base)) { +if (!intel_crtc->no_pll && + (!has_edp_encoder || +intel_encoder_is_pch_edp (&has_edp_encoder->base))) {I915_WRITE (PCH_DPLL (pipe), dpll);/* Wait for the clocks to stabilize. */
@@ -5615,18 +5632,20 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, } intel_crtc->lowfreq_avail = false; -if (is_lvds && has_reduced_clock && i915_powersave) { -I915_WRITE (PCH_FP1 (pipe), fp2); - intel_crtc->lowfreq_avail = true; -if (HAS_PIPE_CXSR (dev)) { -DRM_DEBUG_KMS ("enabling CxSR downclocking\n" ); - pipeconf |=PIPECONF_CXSR_DOWNCLOCK ; - } - }else { -I915_WRITE (PCH_FP1 (pipe), fp); -if (HAS_PIPE_CXSR (dev)) { -DRM_DEBUG_KMS ("disabling CxSR downclocking\n" ); - pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK ; +if (!intel_crtc->no_pll) { +if (is_lvds && has_reduced_clock && i915_powersave) { +I915_WRITE (PCH_FP1 (pipe), fp2); + intel_crtc->lowfreq_avail = true; +if (HAS_PIPE_CXSR (dev)) { +DRM_DEBUG_KMS ("enabling CxSR downclocking\n" ); + pipeconf |=PIPECONF_CXSR_DOWNCLOCK ; + } + }else { +I915_WRITE (PCH_FP1 (pipe), fp); +if (HAS_PIPE_CXSR (dev)) { +DRM_DEBUG_KMS ("disabling CxSR downclocking\n" ); + pipeconf &= ~PIPECONF_CXSR_DOWNCLOCK ; + } } }
@@ -7242,6 +7261,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) intel_crtc->bpp =24 ;/* default for pre-Ironlake */ if (HAS_PCH_SPLIT (dev)) { +if (pipe ==2 &&IS_IVYBRIDGE (dev)) + intel_crtc->no_pll = true; intel_helper_funcs.prepare = ironlake_crtc_prepare; intel_helper_funcs.commit = ironlake_crtc_commit; }else {
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -171,6 +171,9 @@ struct intel_crtc {int16_t cursor_width, cursor_height;bool cursor_visible;unsigned int bpp; + +bool no_pll;/* tertiary pipe for IVB */ +bool use_pll_a; };#define to_intel_crtc (x) container_of(x, struct intel_crtc, base)
Signature · 1 line
1.7.4.1
PATCH 8/8 drm/i915: fix debug output for 3 pipe configs
In reply to Jesse BarnesWe can have more than just A and B these days.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -5500,7 +5500,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,/* Set up the display plane register */ dspcntr =DISPPLANE_GAMMA_ENABLE ; -DRM_DEBUG_KMS ("Mode for pipe %c:\n" , pipe ==0 ?'A' :'B' ); +DRM_DEBUG_KMS ("Mode for pipe %d:\n" , pipe);drm_mode_debug_printmodeline (mode);/* PCH eDP needs FDI, but CPU eDP does not */
Signature · 1 line
1.7.4.1