drm/i915: s/dpio_lock/sb_lock/
Subsystems (2)
PATCH 1/2 drm/i915: s/dpio_lock/sb_lock/
From: Ville Syrjälä <[email protected]>
Rename dpio_lock to sb_lock to inform the reader that its primary purpose is to protect the sideband mailbox rather than some DPIO state.
--- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/intel_display.c | 56 +++++++++++++++--------------- drivers/gpu/drm/i915/intel_dp.c | 28 +++++++-------- drivers/gpu/drm/i915/intel_dsi.c | 8 ++--- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 +-- drivers/gpu/drm/i915/intel_dsi_pll.c | 14 ++++---- drivers/gpu/drm/i915/intel_hdmi.c | 24 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 4 +-- drivers/gpu/drm/i915/intel_sideband.c | 18 +++++----- 10 files changed, 81 insertions(+), 81 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +1 -1
@@ -814,7 +814,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)spin_lock_init (&dev_priv->uncore.lock);spin_lock_init (&dev_priv->mm.object_stat_lock);spin_lock_init (&dev_priv->mmio_flip_lock); -mutex_init (&dev_priv->dpio_lock); +mutex_init (&dev_priv->sb_lock);mutex_init (&dev_priv->modeset_restore_lock);mutex_init (&dev_priv->csr_lock);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -1661,8 +1661,8 @@ struct drm_i915_private {/* To control wakeup latency, e.g. for irq-driven dp aux transfers. */ struct pm_qos_request pm_qos; -/* DPIO indirect register protection */ -struct mutex dpio_lock; +/* Sideband mailbox protection */ +struct mutex sb_lock;/** Cached value of IMR to avoid reads in updating the bitfield */ union {
drivers/gpu/drm/i915/intel_display.c +28 -28
199 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +14 -14
@@ -2355,7 +2355,7 @@ static void chv_post_disable_dp(struct intel_encoder *encoder)intel_dp_link_down (intel_dp); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* Propagate soft reset to data lane reset */ val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW1 (ch));
@@ -2374,7 +2374,7 @@ static void chv_post_disable_dp(struct intel_encoder *encoder) val &= ~(DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET );vlv_dpio_write (dev_priv, pipe,VLV_PCS23_DW0 (ch), val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); } static void
@@ -2671,7 +2671,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)int pipe = intel_crtc->pipe;u32 val; -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock); val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;
@@ -2684,7 +2684,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 );vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);intel_enable_dp (encoder); }
@@ -2702,7 +2702,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)intel_dp_prepare (encoder);/* Program Tx lane resets to default */ -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET );
@@ -2716,7 +2716,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW12 (port),0x00750f00 );vlv_dpio_write (dev_priv, pipe,VLV_TX_DW11 (port),0x00001500 );vlv_dpio_write (dev_priv, pipe,VLV_TX_DW14 (port),0x40400000 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void chv_pre_enable_dp (struct intel_encoder *encoder)
@@ -2732,7 +2732,7 @@ static void chv_pre_enable_dp(struct intel_encoder *encoder)int data, i, stagger;u32 val; -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* allow hardware to manage TX FIFO reset source */ val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW11 (ch));
@@ -2802,7 +2802,7 @@ static void chv_pre_enable_dp(struct intel_encoder *encoder)DPIO_TX1_STAGGER_MULT (7 ) | DPIO_TX2_STAGGER_MULT(5)); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);intel_enable_dp (encoder); }
@@ -2820,7 +2820,7 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder)intel_dp_prepare (encoder); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* program left/right clock distribution */ if (pipe !=PIPE_B ) {
@@ -2870,7 +2870,7 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder) val |=CHV_CMN_USEDCLKCHANNEL ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW19 (ch), val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }/*
@@ -3095,7 +3095,7 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)return 0 ; } -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0x00000000 );vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port), demph_reg_value); vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(port),
@@ -3104,7 +3104,7 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 );vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port), preemph_reg_value);vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0x80000000 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);return 0 ; }
@@ -3191,7 +3191,7 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp)return 0 ; } -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* Clear calc init */ val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW10 (ch));
@@ -3278,7 +3278,7 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp) val |=DPIO_LRC_BYPASS ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW30 , val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);return 0 ; }
drivers/gpu/drm/i915/intel_dsi.c +4 -4
@@ -239,7 +239,7 @@ static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs,static void band_gap_reset (struct drm_i915_private *dev_priv) { -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_flisdsi_write (dev_priv,0x08 ,0x0001 );vlv_flisdsi_write (dev_priv,0x0F ,0x0005 );
@@ -248,7 +248,7 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)vlv_flisdsi_write (dev_priv,0x0F ,0x0000 );vlv_flisdsi_write (dev_priv,0x08 ,0x0000 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static inline bool is_vid_mode (struct intel_dsi *intel_dsi)
@@ -346,11 +346,11 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* program rcomp for compliance, reduce from 50 ohms to 45 ohms * needed everytime after power gate */ vlv_flisdsi_write (dev_priv,0x04 ,0x0004 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);/* bandgap reset is needed after everytime we do power gate */ band_gap_reset (dev_priv);
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +2 -2
@@ -212,7 +212,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) function = gtable[gpio].function_reg; pad = gtable[gpio].pad_reg; -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);if (!gtable[gpio].init) {/* program the function */ /* FIXME: remove constant below */
@@ -224,7 +224,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)/* pull up/down */ vlv_gpio_nc_write (dev_priv, pad, val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);return data; }
drivers/gpu/drm/i915/intel_dsi_pll.c +7 -7
@@ -244,7 +244,7 @@ void vlv_enable_dsi_pll(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_configure_dsi_pll (encoder);
@@ -258,11 +258,11 @@ void vlv_enable_dsi_pll(struct intel_encoder *encoder)if (wait_for (vlv_cck_read (dev_priv,CCK_REG_DSI_PLL_CONTROL ) &DSI_PLL_LOCK ,20 )) { -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);DRM_ERROR ("DSI PLL lock failed\n" );return ; } -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);DRM_DEBUG_KMS ("DSI PLL locked\n" ); }
@@ -274,14 +274,14 @@ void vlv_disable_dsi_pll(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock); tmp =vlv_cck_read (dev_priv,CCK_REG_DSI_PLL_CONTROL ); tmp &= ~DSI_PLL_VCO_EN ; tmp |=DSI_PLL_LDO_GATE ;vlv_cck_write (dev_priv,CCK_REG_DSI_PLL_CONTROL , tmp); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void assert_bpp_mismatch (int pixel_format,int pipe_bpp)
@@ -319,10 +319,10 @@ u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)DRM_DEBUG_KMS ("\n" ); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock); pll_ctl =vlv_cck_read (dev_priv,CCK_REG_DSI_PLL_CONTROL ); pll_div =vlv_cck_read (dev_priv,CCK_REG_DSI_PLL_DIVIDER ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);/* mask out other bits and extract the P1 divisor */ pll_ctl &=DSI_PLL_P1_POST_DIV_MASK ;
drivers/gpu/drm/i915/intel_hdmi.c +12 -12
@@ -1293,7 +1293,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)u32 val;/* Enable clock channels for this port */ -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock); val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe)
@@ -1316,7 +1316,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Program lane clock */ vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 );vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); intel_hdmi->set_infoframes(&encoder->base, intel_crtc->config->has_hdmi_sink,
@@ -1340,7 +1340,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)intel_hdmi_prepare (encoder);/* Program Tx lane resets to default */ -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET );
@@ -1357,7 +1357,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port),0x00002000 );vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),DPIO_TX_OCALINIT_EN ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void chv_hdmi_pre_pll_enable (struct intel_encoder *encoder)
@@ -1373,7 +1373,7 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder)intel_hdmi_prepare (encoder); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* program left/right clock distribution */ if (pipe !=PIPE_B ) {
@@ -1423,7 +1423,7 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder) val |=CHV_CMN_USEDCLKCHANNEL ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW19 (ch), val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void vlv_hdmi_post_disable (struct intel_encoder *encoder)
@@ -1436,10 +1436,10 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)int pipe = intel_crtc->pipe;/* Reset lanes to avoid HDMI flicker (VLV w/a) */ -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),0x00000000 );vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),0x00e00060 ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void chv_hdmi_post_disable (struct intel_encoder *encoder)
@@ -1453,7 +1453,7 @@ static void chv_hdmi_post_disable(struct intel_encoder *encoder)enum pipe pipe = intel_crtc->pipe;u32 val; -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* Propagate soft reset to data lane reset */ val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW1 (ch));
@@ -1472,7 +1472,7 @@ static void chv_hdmi_post_disable(struct intel_encoder *encoder) val &= ~(DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET );vlv_dpio_write (dev_priv, pipe,VLV_PCS23_DW0 (ch), val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }static void chv_hdmi_pre_enable (struct intel_encoder *encoder)
@@ -1490,7 +1490,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)int data, i, stagger;u32 val; -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);/* allow hardware to manage TX FIFO reset source */ val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW11 (ch));
@@ -1633,7 +1633,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder) val |=DPIO_LRC_BYPASS ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW30 , val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); intel_hdmi->set_infoframes(&encoder->base, intel_crtc->config->has_hdmi_sink,
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -4954,9 +4954,9 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)mutex_lock (&dev_priv->rps.hw_lock); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock); val =vlv_cck_read (dev_priv,CCK_FUSE_REG ); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);switch ((val >>2 ) &0x7 ) {case 0 :
drivers/gpu/drm/i915/intel_sideband.c +9 -9
@@ -49,7 +49,7 @@ static int vlv_sideband_rw(struct drm_i915_private *dev_priv, u32 devfn, (port <<IOSF_PORT_SHIFT ) | (be <<IOSF_BYTE_ENABLES_SHIFT ) | (bar <<IOSF_BAR_SHIFT ); -WARN_ON (!mutex_is_locked (&dev_priv->dpio_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->sb_lock));if (wait_for ((I915_READ (VLV_IOSF_DOORBELL_REQ ) &IOSF_SB_BUSY ) ==0 ,5 )) { DRM_DEBUG_DRIVER("IOSF sideband idle wait (%s) timed out\n",
@@ -81,10 +81,10 @@ u32 vlv_punit_read(struct drm_i915_private *dev_priv, u32 addr)WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_sideband_rw (dev_priv,PCI_DEVFN (0 ,0 ),IOSF_PORT_PUNIT ,SB_CRRDDA_NP , addr, &val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);return val; }
@@ -93,10 +93,10 @@ void vlv_punit_write(struct drm_i915_private *dev_priv, u32 addr, u32 val) {WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_sideband_rw (dev_priv,PCI_DEVFN (0 ,0 ),IOSF_PORT_PUNIT ,SB_CRWRDA_NP , addr, &val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock); }u32 vlv_bunit_read (struct drm_i915_private *dev_priv,u32 reg)
@@ -121,10 +121,10 @@ u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr)WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); -mutex_lock (&dev_priv->dpio_lock); +mutex_lock (&dev_priv->sb_lock);vlv_sideband_rw (dev_priv,PCI_DEVFN (0 ,0 ),IOSF_PORT_NC ,SB_CRRDDA_NP , addr, &val); -mutex_unlock (&dev_priv->dpio_lock); +mutex_unlock (&dev_priv->sb_lock);return val; }
@@ -213,7 +213,7 @@ u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg, enum intel_sbi_destination destination) {u32 value =0 ; -WARN_ON (!mutex_is_locked (&dev_priv->dpio_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->sb_lock));if (wait_for ((I915_READ (SBI_CTL_STAT ) &SBI_BUSY ) ==0 ,100 )) {
@@ -243,7 +243,7 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value, {u32 tmp; -WARN_ON (!mutex_is_locked (&dev_priv->dpio_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->sb_lock));if (wait_for ((I915_READ (SBI_CTL_STAT ) &SBI_BUSY ) ==0 ,100 )) {
Signature · 6 lines
2.3.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Adjust sideband locking a bit for CHV/VLV
From: Ville Syrjälä <[email protected]>
chv_enable_pll() doesn't need to hold sb_lock for the entire duration of the function. Drop the lock as soon as possible.
valleyview_set_cdclk() does a potential lock+unlock+lock+unlock cycle with sb_lock. Move Grab the lock a few lines earlier so we can make do with a single lock+unlock cycle always.
--- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -5
@@ -1668,6 +1668,8 @@ static void chv_enable_pll(struct intel_crtc *crtc, tmp |=DPIO_DCLKP_EN ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), tmp); +mutex_unlock (&dev_priv->sb_lock); +/* * Need to wait > 100ns between dclkp clock enable bit and PLL enable. */
@@ -1683,8 +1685,6 @@ static void chv_enable_pll(struct intel_crtc *crtc,/* not sure when this should be written */ I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md);POSTING_READ (DPLL_MD (pipe)); - -mutex_unlock (&dev_priv->sb_lock); }static int intel_num_dvo_pipes (struct drm_device *dev)
@@ -5780,12 +5780,13 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->sb_lock); +if (cdclk ==400000 ) {u32 divider; divider =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->sb_lock);/* adjust cdclk divider */ val =vlv_cck_read (dev_priv,CCK_DISPLAY_CLOCK_CONTROL ); val &= ~DISPLAY_FREQUENCY_VALUES ;
@@ -5796,10 +5797,8 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) DISPLAY_FREQUENCY_STATUS) == (divider << DISPLAY_FREQUENCY_STATUS_SHIFT), 50))DRM_ERROR ("timed out waiting for CDclk change\n" ); -mutex_unlock (&dev_priv->sb_lock); } -mutex_lock (&dev_priv->sb_lock);/* adjust self-refresh exit latency value */ val =vlv_bunit_read (dev_priv,BUNIT_REG_BISOC ); val &= ~0x7f ;
@@ -5813,6 +5812,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)else val |=3000 /250 ;/* 3.0 usec */ vlv_bunit_write (dev_priv,BUNIT_REG_BISOC , val); +mutex_unlock (&dev_priv->sb_lock);vlv_update_cdclk (dev);
Signature · 6 lines
2.3.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Adjust sideband locking a bit for CHV/VLV
Quoted 7 lines · On Tue, 26 May 2015, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
chv_enable_pll()doesn't need to holdsb_lockfor the entire duration of the function. Drop the lock as soon as possible.
valleyview_set_cdclk()does a potential lock+unlock+lock+unlock cycle withsb_lock. Move Grab the lock a few lines earlier so we can make do
Move Grab?
Anyway, both patches are
Quoted 70 lines
with a single lock+unlock cycle always.
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-5@@ -1668,6 +1668,8 @@ static void chv_enable_pll(struct intel_crtc *crtc, tmp |=DPIO_DCLKP_EN ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), tmp); +mutex_unlock (&dev_priv->sb_lock); +/* * Need to wait > 100ns between dclkp clock enable bit and PLL enable. */ @@ -1683,8 +1685,6 @@ static void chv_enable_pll(struct intel_crtc *crtc,/* not sure when this should be written */ I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md);POSTING_READ (DPLL_MD (pipe)); - -mutex_unlock (&dev_priv->sb_lock); }static int intel_num_dvo_pipes (struct drm_device *dev)@@ -5780,12 +5780,13 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->sb_lock); +if (cdclk ==400000 ) {u32 divider; divider =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->sb_lock);/* adjust cdclk divider */ val =vlv_cck_read (dev_priv,CCK_DISPLAY_CLOCK_CONTROL ); val &= ~DISPLAY_FREQUENCY_VALUES ;@@ -5796,10 +5797,8 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) DISPLAY_FREQUENCY_STATUS) == (divider << DISPLAY_FREQUENCY_STATUS_SHIFT), 50))DRM_ERROR ("timed out waiting for CDclk change\n" ); -mutex_unlock (&dev_priv->sb_lock); } -mutex_lock (&dev_priv->sb_lock);/* adjust self-refresh exit latency value */ val =vlv_bunit_read (dev_priv,BUNIT_REG_BISOC ); val &= ~0x7f ;@@ -5813,6 +5812,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)else val |=3000 /250 ;/* 3.0 usec */ vlv_bunit_write (dev_priv,BUNIT_REG_BISOC , val); +mutex_unlock (&dev_priv->sb_lock);vlv_update_cdclk (dev);Signature · 6 lines
2.3.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Adjust sideband locking a bit for CHV/VLV
Quoted 10 lines · Jani Nikula
Quoted 7 lines · On Tue, 26 May 2015, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
chv_enable_pll()doesn't need to holdsb_lockfor the entire duration of the function. Drop the lock as soon as possible.
valleyview_set_cdclk()does a potential lock+unlock+lock+unlock cycle withsb_lock. Move Grab the lock a few lines earlier so we can make doMove Grab?
s/Move //
Quoted 79 lines
Anyway, both patches are
Reviewed-by Jani Nikula <[email protected]>Quoted 70 lines
with a single lock+unlock cycle always.
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-5@@ -1668,6 +1668,8 @@ static void chv_enable_pll(struct intel_crtc *crtc, tmp |=DPIO_DCLKP_EN ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), tmp); +mutex_unlock (&dev_priv->sb_lock); +/* * Need to wait > 100ns between dclkp clock enable bit and PLL enable. */ @@ -1683,8 +1685,6 @@ static void chv_enable_pll(struct intel_crtc *crtc,/* not sure when this should be written */ I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md);POSTING_READ (DPLL_MD (pipe)); - -mutex_unlock (&dev_priv->sb_lock); }static int intel_num_dvo_pipes (struct drm_device *dev)@@ -5780,12 +5780,13 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->sb_lock); +if (cdclk ==400000 ) {u32 divider; divider =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->sb_lock);/* adjust cdclk divider */ val =vlv_cck_read (dev_priv,CCK_DISPLAY_CLOCK_CONTROL ); val &= ~DISPLAY_FREQUENCY_VALUES ;@@ -5796,10 +5797,8 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) DISPLAY_FREQUENCY_STATUS) == (divider << DISPLAY_FREQUENCY_STATUS_SHIFT), 50))DRM_ERROR ("timed out waiting for CDclk change\n" ); -mutex_unlock (&dev_priv->sb_lock); } -mutex_lock (&dev_priv->sb_lock);/* adjust self-refresh exit latency value */ val =vlv_bunit_read (dev_priv,BUNIT_REG_BISOC ); val &= ~0x7f ;@@ -5813,6 +5812,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)else val |=3000 /250 ;/* 3.0 usec */ vlv_bunit_write (dev_priv,BUNIT_REG_BISOC , val); +mutex_unlock (&dev_priv->sb_lock);vlv_update_cdclk (dev);Signature · 6 lines
2.3.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Adjust sideband locking a bit for CHV/VLV
In reply to Jani NikulaQuoted 10 lines · Jani Nikula
Quoted 7 lines · On Tue, 26 May 2015, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
chv_enable_pll()doesn't need to holdsb_lockfor the entire duration of the function. Drop the lock as soon as possible.
valleyview_set_cdclk()does a potential lock+unlock+lock+unlock cycle withsb_lock. Move Grab the lock a few lines earlier so we can make doMove Grab?
Fixed and both patches applied, thanks.
-Daniel
Quoted 83 lines
Anyway, both patches are
Reviewed-by Jani Nikula <[email protected]>Quoted 70 lines
with a single lock+unlock cycle always.
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-5@@ -1668,6 +1668,8 @@ static void chv_enable_pll(struct intel_crtc *crtc, tmp |=DPIO_DCLKP_EN ;vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), tmp); +mutex_unlock (&dev_priv->sb_lock); +/* * Need to wait > 100ns between dclkp clock enable bit and PLL enable. */ @@ -1683,8 +1685,6 @@ static void chv_enable_pll(struct intel_crtc *crtc,/* not sure when this should be written */ I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md);POSTING_READ (DPLL_MD (pipe)); - -mutex_unlock (&dev_priv->sb_lock); }static int intel_num_dvo_pipes (struct drm_device *dev)@@ -5780,12 +5780,13 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->sb_lock); +if (cdclk ==400000 ) {u32 divider; divider =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->sb_lock);/* adjust cdclk divider */ val =vlv_cck_read (dev_priv,CCK_DISPLAY_CLOCK_CONTROL ); val &= ~DISPLAY_FREQUENCY_VALUES ;@@ -5796,10 +5797,8 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk) DISPLAY_FREQUENCY_STATUS) == (divider << DISPLAY_FREQUENCY_STATUS_SHIFT), 50))DRM_ERROR ("timed out waiting for CDclk change\n" ); -mutex_unlock (&dev_priv->sb_lock); } -mutex_lock (&dev_priv->sb_lock);/* adjust self-refresh exit latency value */ val =vlv_bunit_read (dev_priv,BUNIT_REG_BISOC ); val &= ~0x7f ;@@ -5813,6 +5812,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)else val |=3000 /250 ;/* 3.0 usec */ vlv_bunit_write (dev_priv,BUNIT_REG_BISOC , val); +mutex_unlock (&dev_priv->sb_lock);vlv_update_cdclk (dev);Signature · 6 lines
2.3.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx