drm/i915: Replace some loop through encoders with intel_pipe_has_type()
Subsystems (2)
PATCH 1/4 drm/i915: Replace some loop through encoders with intel_pipe_has_type()
In the ironlake mode set code, there was two instances of a loop through encoders to find out if one of them has INTEL_OUTPUT_LVDS type. Simplify the code by deleting some lines and use intel_pipe_has_type() instead.
--- drivers/gpu/drm/i915/intel_display.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -19
@@ -7108,18 +7108,11 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_encoder *intel_encoder;int refclk;const intel_limit_t *limit;bool ret, is_lvds = false; -for_each_encoder_on_crtc (dev, crtc, intel_encoder) { -switch (intel_encoder->type) { -case INTEL_OUTPUT_LVDS : - is_lvds = true; -break ; - } - } + is_lvds =intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ); refclk =ironlake_get_refclk (crtc);
@@ -7259,23 +7252,13 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int num_connectors =0 ;intel_clock_t clock, reduced_clock;u32 dpll =0 , fp =0 , fp2 =0 ;bool ok, has_reduced_clock = false;bool is_lvds = false; -struct intel_encoder *encoder;struct intel_shared_dpll *pll; -for_each_encoder_on_crtc (dev, crtc, encoder) { -switch (encoder->type) { -case INTEL_OUTPUT_LVDS : - is_lvds = true; -break ; - } - - num_connectors++; - } + is_lvds =intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS );WARN (!(HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev)),"Unexpected PCH type %d\n" ,INTEL_PCH_TYPE (dev));
Signature · 1 line
1.9.1
PATCH 2/4 drm/i915: Make *_find_best_dpll() take an intel_crtc insted of drm_crtc
For consistency, since that's the rule followed for internal functions.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 37 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -460,7 +460,7 @@ struct drm_i915_display_funcs {* Returns true on success, false on failure. */ bool (*find_dpll)(const struct intel_limit *limit, -struct drm_crtc *crtc, +struct intel_crtc *crtc,int target,int refclk,struct dpll *match_clock,struct dpll *best_clock);
drivers/gpu/drm/i915/intel_display.c +19 -18
@@ -576,15 +576,15 @@ static bool intel_PLL_is_valid(struct drm_device *dev, }static bool -i9xx_find_best_dpll (const intel_limit_t *limit,struct drm_crtc *crtc, +i9xx_find_best_dpll (const intel_limit_t *limit,struct intel_crtc *crtc,int target,int refclk,intel_clock_t *match_clock,intel_clock_t *best_clock) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;intel_clock_t clock;int err = target; -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) {/* * For LVDS just rely on its current settings for dual-channel. * We haven't figured out how to reliably set up different
@@ -637,15 +637,15 @@ i9xx_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, }static bool -pnv_find_best_dpll (const intel_limit_t *limit,struct drm_crtc *crtc, +pnv_find_best_dpll (const intel_limit_t *limit,struct intel_crtc *crtc,int target,int refclk,intel_clock_t *match_clock,intel_clock_t *best_clock) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;intel_clock_t clock;int err = target; -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) {/* * For LVDS just rely on its current settings for dual-channel. * We haven't figured out how to reliably set up different
@@ -696,11 +696,11 @@ pnv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, }static bool -g4x_find_best_dpll (const intel_limit_t *limit,struct drm_crtc *crtc, +g4x_find_best_dpll (const intel_limit_t *limit,struct intel_crtc *crtc,int target,int refclk,intel_clock_t *match_clock,intel_clock_t *best_clock) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;intel_clock_t clock;int max_n;bool found;
@@ -708,7 +708,7 @@ g4x_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,int err_most = (target >>8 ) + (target >>9 ); found = false; -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) {if (intel_is_dual_link_lvds (dev)) clock.p2 = limit->p2.p2_fast;else
@@ -753,11 +753,11 @@ g4x_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, }static bool -vlv_find_best_dpll (const intel_limit_t *limit,struct drm_crtc *crtc, +vlv_find_best_dpll (const intel_limit_t *limit,struct intel_crtc *crtc,int target,int refclk,intel_clock_t *match_clock,intel_clock_t *best_clock) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;intel_clock_t clock;unsigned int bestppm =1000000 ;/* min update 19.2 MHz */
@@ -810,11 +810,11 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, }static bool -chv_find_best_dpll (const intel_limit_t *limit,struct drm_crtc *crtc, +chv_find_best_dpll (const intel_limit_t *limit,struct intel_crtc *crtc,int target,int refclk,intel_clock_t *match_clock,intel_clock_t *best_clock) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;intel_clock_t clock;uint64_t m2;int found = false;
@@ -6282,7 +6282,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,* 2) / p1 / p2. */ limit =intel_limit (crtc, refclk); - ok = dev_priv->display.find_dpll (limit, crtc, + ok = dev_priv->display.find_dpll (limit, intel_crtc, intel_crtc->config.port_clock, refclk,NULL , &clock);if (!ok) {
@@ -6298,7 +6298,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,* we will disable the LVDS downclock feature. */ has_reduced_clock = - dev_priv->display.find_dpll (limit, crtc, + dev_priv->display.find_dpll (limit, intel_crtc, dev_priv->lvds_downclock, refclk, &clock, &reduced_clock);
@@ -7108,6 +7108,7 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int refclk;const intel_limit_t *limit;bool ret, is_lvds = false;
@@ -7122,8 +7123,8 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. */ limit =intel_limit (crtc, refclk); - ret = dev_priv->display.find_dpll (limit, crtc, -to_intel_crtc (crtc)->config.port_clock, + ret = dev_priv->display.find_dpll (limit, intel_crtc, + intel_crtc->config.port_clock, refclk,NULL , clock);if (!ret)return false;
@@ -7136,7 +7137,7 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,* downclock feature. */ *has_reduced_clock = - dev_priv->display.find_dpll (limit, crtc, + dev_priv->display.find_dpll (limit, intel_crtc, dev_priv->lvds_downclock, refclk, clock, reduced_clock);
Signature · 1 line
1.9.1
PATCH 3/4 drm/i915: Make *_crtc_mode_set() take an intel_crtc insted of drm_crtc
In reply to Ander Conselvan de OliveiraFor consistency, since that's the rule followed for internal functions.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 95 +++++++++++++++++------------------- 2 files changed, 46 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -476,7 +476,7 @@ struct drm_i915_display_funcs { struct intel_crtc_config *);void (*get_plane_config)(struct intel_crtc *,struct intel_plane_config *); -int (*crtc_mode_set)(struct drm_crtc *crtc, +int (*crtc_mode_set)(struct intel_crtc *crtc,int x,int y,struct drm_framebuffer *old_fb);void (*crtc_enable)(struct drm_crtc *crtc);
drivers/gpu/drm/i915/intel_display.c +45 -50
203 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 4/4 drm/i915: Make intel_pipe_has_type() and some callers take intel_crtc
In reply to Ander Conselvan de OliveiraFor consistency, since that's the rule followed for internal functions.
--- drivers/gpu/drm/i915/intel_display.c | 106 ++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/intel_display.c +54 -52
@@ -406,22 +406,22 @@ static void vlv_clock(int refclk, intel_clock_t *clock)/** * Returns whether any output on the specified pipe is of the specified type */ -static bool intel_pipe_has_type (struct drm_crtc *crtc,int type) +static bool intel_pipe_has_type (struct intel_crtc *crtc,int type) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;struct intel_encoder *encoder; -for_each_encoder_on_crtc (dev, crtc, encoder) +for_each_encoder_on_crtc (dev, &crtc->base, encoder)if (encoder->type == type)return true;return false; } -static const intel_limit_t *intel_ironlake_limit (struct drm_crtc *crtc, +static const intel_limit_t *intel_ironlake_limit (struct intel_crtc *crtc,int refclk) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;const intel_limit_t *limit;if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {
@@ -442,9 +442,9 @@ static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc,return limit; } -static const intel_limit_t *intel_g4x_limit (struct drm_crtc *crtc) +static const intel_limit_t *intel_g4x_limit (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;const intel_limit_t *limit;if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {
@@ -463,9 +463,9 @@ static const intel_limit_t *intel_g4x_limit(struct drm_crtc *crtc)return limit; } -static const intel_limit_t *intel_limit (struct drm_crtc *crtc,int refclk) +static const intel_limit_t *intel_limit (struct intel_crtc *crtc,int refclk) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;const intel_limit_t *limit;if (HAS_PCH_SPLIT (dev))
@@ -584,7 +584,7 @@ i9xx_find_best_dpll(const intel_limit_t *limit, struct intel_crtc *crtc,intel_clock_t clock;int err = target; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {/* * For LVDS just rely on its current settings for dual-channel. * We haven't figured out how to reliably set up different
@@ -645,7 +645,7 @@ pnv_find_best_dpll(const intel_limit_t *limit, struct intel_crtc *crtc,intel_clock_t clock;int err = target; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {/* * For LVDS just rely on its current settings for dual-channel. * We haven't figured out how to reliably set up different
@@ -708,7 +708,7 @@ g4x_find_best_dpll(const intel_limit_t *limit, struct intel_crtc *crtc,int err_most = (target >>8 ) + (target >>9 ); found = false; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) {if (intel_is_dual_link_lvds (dev)) clock.p2 = limit->p2.p2_fast;else
@@ -1567,7 +1567,7 @@ static int intel_num_dvo_pipes(struct drm_device *dev)for_each_intel_crtc (dev, crtc) count += crtc->active && -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DVO ); +intel_pipe_has_type (crtc,INTEL_OUTPUT_DVO );return count; }
@@ -1646,7 +1646,7 @@ static void i9xx_disable_pll(struct intel_crtc *crtc)/* Disable DVO 2x clock on both PLLs if necessary */ if (IS_I830 (dev) && -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DVO ) && +intel_pipe_has_type (crtc,INTEL_OUTPUT_DVO ) &&intel_num_dvo_pipes (dev) ==1 ) {I915_WRITE (DPLL (PIPE_B ),I915_READ (DPLL (PIPE_B )) & ~DPLL_DVO_2X_MODE );
@@ -1884,7 +1884,7 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, val &= ~TRANS_INTERLACE_MASK ;if ((pipeconf_val &PIPECONF_INTERLACE_MASK ) ==PIPECONF_INTERLACED_ILK )if (HAS_PCH_IBX (dev_priv->dev) && -intel_pipe_has_type (crtc,INTEL_OUTPUT_SDVO )) +intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_SDVO )) val |=TRANS_LEGACY_INTERLACED_ILK ;else val |=TRANS_INTERLACED ;
@@ -2007,7 +2007,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc)* need the check. */ if (!HAS_PCH_SPLIT (dev_priv->dev)) -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DSI )) +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DSI ))assert_dsi_pll_enabled (dev_priv);else assert_pll_enabled (dev_priv, pipe);
@@ -2844,8 +2844,8 @@ static void intel_update_pipe_size(struct intel_crtc *crtc) ((adjusted_mode->crtc_hdisplay -1 ) <<16 ) | (adjusted_mode->crtc_vdisplay - 1));if (!crtc->config.pch_pfit.enabled && - (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ) || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_EDP ))) { + (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP ))) {I915_WRITE (PF_CTL (crtc->pipe),0 );I915_WRITE (PF_WIN_POS (crtc->pipe),0 );I915_WRITE (PF_WIN_SZ (crtc->pipe),0 );
@@ -3753,8 +3753,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT (dev) && - (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT ) || -intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP ))) { + (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT ) || +intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_EDP ))) {u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ; reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg);
@@ -4031,7 +4031,7 @@ static void intel_crtc_load_lut(struct drm_crtc *crtc)return ;if (!HAS_PCH_SPLIT (dev_priv->dev)) { -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DSI )) +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DSI ))assert_dsi_pll_enabled (dev_priv);else assert_pll_enabled (dev_priv, pipe);
@@ -4832,7 +4832,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)if (intel_crtc->active)return ; - is_dsi =intel_pipe_has_type (crtc,INTEL_OUTPUT_DSI ); + is_dsi =intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DSI );if (!is_dsi) {if (IS_CHERRYVIEW (dev))
@@ -5026,7 +5026,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)if (encoder->post_disable) encoder->post_disable (encoder); -if (!intel_pipe_has_type (crtc,INTEL_OUTPUT_DSI )) { +if (!intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DSI )) {if (IS_CHERRYVIEW (dev))chv_disable_pll (dev_priv, pipe);else if (IS_VALLEYVIEW (dev))
@@ -5409,7 +5409,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,* - LVDS dual channel mode * - Double wide pipe */ -if ((intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ) && +if ((intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) &&intel_is_dual_link_lvds (dev)) || pipe_config->double_wide) pipe_config->pipe_src_w &= ~1 ;
@@ -5597,9 +5597,9 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); } -static int i9xx_get_refclk (struct drm_crtc *crtc,int num_connectors) +static int i9xx_get_refclk (struct intel_crtc *crtc,int num_connectors) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;int refclk;
@@ -5647,7 +5647,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc, crtc->config.dpll_hw_state.fp0 = fp; crtc->lowfreq_avail = false; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ) && +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) && reduced_clock && i915.powersave) { crtc->config.dpll_hw_state.fp1 = fp2; crtc->lowfreq_avail = true;
@@ -5816,16 +5816,16 @@ static void vlv_prepare_pll(struct intel_crtc *crtc)/* Set HBR and RBR LPF coefficients */ if (crtc->config.port_clock ==162000 || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_ANALOG ) || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI )) +intel_pipe_has_type (crtc,INTEL_OUTPUT_ANALOG ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI ))vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe),0x009f0003 );else vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe),0x00d0000f ); -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_EDP ) || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DISPLAYPORT )) { +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT )) {/* Use SSC source */ if (pipe ==PIPE_A ) vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
@@ -5845,8 +5845,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc) coreclk =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW7 (pipe)); coreclk = (coreclk &0x0000ff00 ) |0x01c00000 ; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DISPLAYPORT ) || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_EDP )) +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP )) coreclk |=0x01000000 ;vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW7 (pipe), coreclk);
@@ -5916,7 +5916,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc) (2 << DPIO_CHV_FEEDFWD_GAIN_SHIFT));/* Loop filter */ - refclk =i9xx_get_refclk (&crtc->base,0 ); + refclk =i9xx_get_refclk (crtc,0 ); loopfilter =5 <<DPIO_CHV_PROP_COEFF_SHIFT |2 <<DPIO_CHV_GAIN_CTRL_SHIFT ;if (refclk ==100000 )
@@ -5948,12 +5948,12 @@ static void i9xx_update_pll(struct intel_crtc *crtc,i9xx_update_pll_dividers (crtc, reduced_clock); - is_sdvo =intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_SDVO ) || -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI ); + is_sdvo =intel_pipe_has_type (crtc,INTEL_OUTPUT_SDVO ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI ); dpll =DPLL_VGA_MODE_DIS ; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) dpll |=DPLLB_MODE_LVDS ;else dpll |=DPLLB_MODE_DAC_SERIAL ;
@@ -5966,7 +5966,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,if (is_sdvo) dpll |=DPLL_SDVO_HIGH_SPEED ; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DISPLAYPORT )) +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT )) dpll |=DPLL_SDVO_HIGH_SPEED ;/* compute bitmask from p1 value */
@@ -5996,7 +5996,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,if (crtc->config.sdvo_tv_clock) dpll |=PLL_REF_INPUT_TVCLKINBC ; -else if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ) && +else if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) &&intel_panel_use_ssc (dev_priv) && num_connectors <2 ) dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ;else
@@ -6025,7 +6025,7 @@ static void i8xx_update_pll(struct intel_crtc *crtc, dpll =DPLL_VGA_MODE_DIS ; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS )) { +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS )) { dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; }else {if (clock->p1 ==2 )
@@ -6036,10 +6036,10 @@ static void i8xx_update_pll(struct intel_crtc *crtc, dpll |=PLL_P2_DIVIDE_BY_4 ; } -if (!IS_I830 (dev) &&intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DVO )) +if (!IS_I830 (dev) &&intel_pipe_has_type (crtc,INTEL_OUTPUT_DVO )) dpll |=DPLL_DVO_2X_MODE ; -if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ) && +if (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) &&intel_panel_use_ssc (dev_priv) && num_connectors <2 ) dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ;else
@@ -6070,7 +6070,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) crtc_vtotal -=1 ; crtc_vblank_end -=1 ; -if (intel_pipe_has_type (&intel_crtc->base,INTEL_OUTPUT_SDVO )) +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_SDVO )) vsyncshift = (adjusted_mode->crtc_htotal -1 ) /2 ;else vsyncshift = adjusted_mode->crtc_hsync_start -
@@ -6228,7 +6228,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)if (intel_crtc->config.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {if (INTEL_INFO (dev)->gen <4 || -intel_pipe_has_type (&intel_crtc->base,INTEL_OUTPUT_SDVO )) +intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_SDVO )) pipeconf |=PIPECONF_INTERLACE_W_FIELD_INDICATION ;else pipeconf |=PIPECONF_INTERLACE_W_SYNC_SHIFT ;
@@ -6272,7 +6272,7 @@ static int i9xx_crtc_mode_set(struct intel_crtc *crtc,return 0 ;if (!crtc->config.clock_set) { - refclk =i9xx_get_refclk (&crtc->base, num_connectors); + refclk =i9xx_get_refclk (crtc, num_connectors);/* * Returns a set of divisors for the desired target clock with
@@ -6280,7 +6280,7 @@ static int i9xx_crtc_mode_set(struct intel_crtc *crtc,* the clock equation: reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + * 2) / p1 / p2. */ - limit =intel_limit (&crtc->base, refclk); + limit =intel_limit (crtc, refclk); ok = dev_priv->display.find_dpll (limit, crtc, crtc->config.port_clock, refclk,NULL , &clock);
@@ -7112,7 +7112,7 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,const intel_limit_t *limit;bool ret, is_lvds = false; - is_lvds =intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ); + is_lvds =intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_LVDS ); refclk =ironlake_get_refclk (crtc);
@@ -7121,7 +7121,7 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,* refclk, or FALSE. The returned values represent the clock equation: * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. */ - limit =intel_limit (crtc, refclk); + limit =intel_limit (intel_crtc, refclk); ret = dev_priv->display.find_dpll (limit, intel_crtc, intel_crtc->config.port_clock, refclk,NULL , clock);
@@ -7257,7 +7257,7 @@ static int ironlake_crtc_mode_set(struct intel_crtc *crtc,bool is_lvds = false;struct intel_shared_dpll *pll; - is_lvds =intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_LVDS ); + is_lvds =intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS );WARN (!(HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev)),"Unexpected PCH type %d\n" ,INTEL_PCH_TYPE (dev));
@@ -8047,6 +8047,7 @@ static void haswell_write_eld(struct drm_connector *connector, struct drm_display_mode *mode) {struct drm_i915_private *dev_priv = connector->dev->dev_private; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint8_t *eld = connector->eld;uint32_t eldv;uint32_t i;
@@ -8087,7 +8088,7 @@ static void haswell_write_eld(struct drm_connector *connector, eldv =AUDIO_ELD_VALID_A << (pipe *4 ); -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT )) { +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) {DRM_DEBUG_DRIVER ("ELD: DisplayPort detected\n" ); eld[5 ] |= (1 <<2 );/* Conn_Type, 0x1 = DisplayPort */ I915_WRITE (aud_config,AUD_CONFIG_N_VALUE_INDEX );/* 0x1 = DP */
@@ -8130,6 +8131,7 @@ static void ironlake_write_eld(struct drm_connector *connector, struct drm_display_mode *mode) {struct drm_i915_private *dev_priv = connector->dev->dev_private; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint8_t *eld = connector->eld;uint32_t eldv;uint32_t i;
@@ -8183,7 +8185,7 @@ static void ironlake_write_eld(struct drm_connector *connector, eldv =IBX_ELD_VALIDB << ((i -1 ) *4 ); } -if (intel_pipe_has_type (crtc,INTEL_OUTPUT_DISPLAYPORT )) { +if (intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_DISPLAYPORT )) {DRM_DEBUG_DRIVER ("ELD: DisplayPort detected\n" ); eld[5 ] |= (1 <<2 );/* Conn_Type, 0x1 = DisplayPort */ I915_WRITE (aud_config,AUD_CONFIG_N_VALUE_INDEX );/* 0x1 = DP */
@@ -10878,7 +10880,7 @@ static void update_scanline_offset(struct intel_crtc *crtc) crtc->scanline_offset = vtotal -1 ; }else if (HAS_DDI (dev) && -intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI )) { +intel_pipe_has_type (crtc,INTEL_OUTPUT_HDMI )) { crtc->scanline_offset =2 ; }else crtc->scanline_offset =1 ;
Signature · 1 line
1.9.1
Re: [PATCH 4/4] drm/i915: Make intel_pipe_has_type() and
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->269/271
PNV: pass/total=269/271->270/271
ILK: pass/total=3/3->3/3
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=271/271->269/271 -------------------------------------Detailed-------------------------------------test_platform: test_suite, test_case, result_with_drm_intel_nightly->result_with_patch_applied
BYT: Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked, PASS->TIMEOUT
BYT: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, PASS->DMESG_WARN
PNV: Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked, TIMEOUT->PASS
BDW: Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked, PASS->TIMEOUT
BDW: Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked, PASS->TIMEOUT
Re: [PATCH 4/4] drm/i915: Make intel_pipe_has_type() and
Quoted 6 lines
-----Original Message-----
From: He, Shuang
Sent: Monday, October 20, 2014 10:15 PM
To: He, Shuang; [email protected]; Conselvan De Oliveira, Ander
Subject: RE: [Intel-gfx] [PATCH 4/4] drm/i915: Makeintel_pipe_has_type()and
Quoted 7 lines
Tested-By: PRC QA PRTS (Patch Regression Test System Contact:
[email protected]) -------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->269/271
PNV: pass/total=269/271->270/271
ILK: pass/total=3/3->3/3
[He, Shuang] This "3/3" result is not correct due to bug in PRTS system, I'll fix it
Thanks
--Shuang
Quoted 19 lines
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=271/271->269/271 -------------------------------------Detailed-------------------------------------test_platform:test_suite,test_case,result_with_drm_intel_nightly->result_with_patch_applied
BYT:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BYT:Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc,PASS->DMESG_WARN
PNV:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,TIMEOUT->PASS
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
Re: [PATCH 4/4] drm/i915: Make intel_pipe_has_type() and
In reply to [email protected]Quoted 17 lines · On Mon, Oct 20, 2014 at 07:14:48AM -0700, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->269/271
PNV: pass/total=269/271->270/271
ILK: pass/total=3/3->3/3
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=271/271->269/271 -------------------------------------Detailed-------------------------------------test_platform:test_suite,test_case,result_with_drm_intel_nightly->result_with_patch_applied
BYT:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BYT:Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc,PASS->DMESG_WARN
PNV:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,TIMEOUT->PASS
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
This smells a lot like flukes, since the patches really don't change functionality at all. Is there some way to filter out unstable testcases, or are these regressions real?
In any case I've gone ahead and merged Ander's patches. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 4/4] drm/i915: Make intel_pipe_has_type() and
Quoted 19 lines · Daniel Vetter
Quoted 17 lines · On Mon, Oct 20, 2014 at 07:14:48AM -0700, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->269/271
PNV: pass/total=269/271->270/271
ILK: pass/total=3/3->3/3
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=271/271->269/271 -------------------------------------Detailed-------------------------------------test_platform:test_suite,test_case,result_with_drm_intel_nightly->result_with_patch_applied
BYT:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BYT:Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc,PASS->DMESG_WARN
PNV:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,TIMEOUT->PASS
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
BDW:Intel_gpu_tools, igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,PASS->TIMEOUT
Quoted 3 lines
This smells a lot like flukes, since the patches really don't change functionality at all. Is there some way to filter out unstable testcases, or are these regressions real?
They are full-ppgtt failure. The failure is easily reproducible but sporadic.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 4/4] drm/i915: Make intel_pipe_has_type() and
In reply to Daniel VetterQuoted 30 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, October 21, 2014 4:29 AM
To: He, Shuang
Cc: [email protected]; Conselvan De Oliveira, Ander
Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915: Makeintel_pipe_has_type()andQuoted 1 line · On Mon, Oct 20, 2014 at 07:14:48AM -0700, [email protected] wrote:
Tested-by PRC QA PRTS (Patch Regression Test System Contact:Quoted 11 lines
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=271/271->269/271
PNV: pass/total=269/271->270/271
ILK: pass/total=3/3->3/3
IVB: pass/total=271/271->271/271
SNB: pass/total=271/271->271/271
HSW: pass/total=271/271->271/271
BDW: pass/total=271/271->269/271 -------------------------------------Detailed-------------------------------------test_platform:test_suite,test_case,
result_with_drm_intel_nightly->result_with_patch_appliedQuoted 1 line
BYT:
Intel_gpu_tools,igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,
PASS->TIMEOUTQuoted 1 line
BYT:
Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc,
PASS->DMESG_WARNQuoted 1 line
PNV:
Intel_gpu_tools,igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,
TIMEOUT->PASSQuoted 1 line
BDW:
Intel_gpu_tools,
Quoted 8 lines
igt_gem_concurrent_blit_gtt-bcs-gpu-read-after-write-forked,
PASS->TIMEOUTQuoted 1 line
BDW:
Intel_gpu_tools,igt_gem_concurrent_blit_gttX-bcs-gpu-read-after-write-forked,
PASS->TIMEOUTThis smells a lot like flukes, since the patches really don't change functionality at all. Is there some way to filter out unstable testcases, or are these regressions real?
[He, Shuang] Yes, my next step is to work on do the 'dynamic subset test case' which will have some way to filter out unstable testcases, though it's based on history data, there may still have some leak
Thanks
--Shuang
Quoted 7 lines
In any case I've gone ahead and merged Ander's patches. -Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch