drm/i915/vlv: Make the vlv_dpio_read/vlv_dpio_write more PHY centric
Subsystems (2)
PATCH 1/2 drm/i915/vlv: Make the vlv_dpio_read/vlv_dpio_write more PHY centric
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enum dpio_channel for channel index and enum dpio_phy for PHY index. This should better to gather for upcoming platform.
v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.
--- drivers/gpu/drm/i915/i915_drv.h | 13 +++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 9 ++++----- drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- drivers/gpu/drm/i915/intel_hdmi.c | 9 ++++----- drivers/gpu/drm/i915/intel_sideband.c | 13 ++----------- 7 files changed, 41 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -0
@@ -88,6 +88,18 @@ enum port { };#define port_name (p) ((p) + 'A') +#define I915_NUM_PHYS_VLV 1 + +enum dpio_channel { +DPIO_CH0 , +DPIO_CH1 +}; + +enum dpio_phy { +DPIO_PHY0 , +DPIO_PHY1 +}; +enum intel_display_power_domain {POWER_DOMAIN_PIPE_A ,POWER_DOMAIN_PIPE_B ,
@@ -1401,6 +1413,7 @@ typedef struct drm_i915_private {int num_shared_dpll;struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ];struct intel_ddi_plls ddi_plls; +int vlv_phy[I915_NUM_PHYS_VLV ];/* Reclocking support */ bool render_reclock_avail;
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -447,6 +447,8 @@#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ _DPIO_TX3_SWING_CTL4_B) +#define DPIO_PHY_PORT (pipe) (dev_priv->vlv_phy[pipe >> 1]) +/* * Per pipe/PLL DPIO regs */
drivers/gpu/drm/i915/intel_display.c +12 -4
@@ -1361,6 +1361,7 @@ static void intel_init_dpio(struct drm_device *dev)if (!IS_VALLEYVIEW (dev))return ; + dev_priv->vlv_phy[DPIO_PHY0 ] =IOSF_PORT_DPIO ;/* * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - * 6. De-assert cmn_reset/side_reset. Same as VLV X0.
@@ -1494,18 +1495,25 @@ static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)POSTING_READ (DPLL (pipe)); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port) +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport) {u32 port_mask; -if (!port) +switch (dport->port) { +case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; -else +break ; +case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; +break ; +default : +BUG (); + }if (wait_for ((I915_READ (DPLL (0 )) & port_mask) ==0 ,1000 ))WARN (1 ,"timed out waiting for port %c ready: 0x%08x\n" , -'B' + port,I915_READ (DPLL (0 ))); +'B' + dport->port,I915_READ (DPLL (0 ))); }/**
drivers/gpu/drm/i915/intel_dp.c +4 -5
@@ -1831,7 +1831,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;struct edp_power_seq power_seq;u32 val;
@@ -1839,7 +1839,6 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); - val =0 ;if (pipe) val |= (1 <<21 );else
@@ -1858,7 +1857,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)intel_enable_dp (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_dp_pre_pll_enable (struct intel_encoder *encoder)
@@ -1868,7 +1867,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Program Tx lane resets to default */
@@ -2025,7 +2024,7 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)unsigned long demph_reg_value, preemph_reg_value, uniqtranscale_reg_value;uint8_t train_set = intel_dp->train_set[0 ]; -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;switch (train_set &DP_TRAIN_PRE_EMPHASIS_MASK ) {
drivers/gpu/drm/i915/intel_drv.h +4 -3
@@ -490,9 +490,9 @@ vlv_dport_to_channel(struct intel_digital_port *dport) {switch (dport->port) {case PORT_B : -return 0 ; +return DPIO_CH0 ;case PORT_C : -return 1 ; +return DPIO_CH1 ;default :BUG (); }
@@ -637,7 +637,8 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,void intel_wait_for_vblank (struct drm_device *dev,int pipe);void intel_wait_for_pipe_off (struct drm_device *dev,int pipe);int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port); +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport);bool intel_get_load_detect_pipe (struct drm_connector *connector,struct drm_display_mode *mode,struct intel_load_detect_pipe *old);
drivers/gpu/drm/i915/intel_hdmi.c +4 -5
@@ -1081,7 +1081,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;
@@ -1091,7 +1091,6 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Enable clock channels for this port */ mutex_lock (&dev_priv->dpio_lock); val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); - val =0 ;if (pipe) val |= (1 <<21 );else
@@ -1124,7 +1123,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)intel_enable_hdmi (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_hdmi_pre_pll_enable (struct intel_encoder *encoder)
@@ -1134,7 +1133,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;if (!IS_VALLEYVIEW (dev))
@@ -1169,7 +1168,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Reset lanes to avoid HDMI flicker (VLV w/a) */
drivers/gpu/drm/i915/intel_sideband.c +2 -11
@@ -160,27 +160,18 @@ void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) PUNIT_OPCODE_REG_WRITE, reg, &val); } -static u32 vlv_get_phy_port (enum pipe pipe) -{ -u32 port =IOSF_PORT_DPIO ; - -WARN_ON ((pipe !=PIPE_A ) && (pipe !=PIPE_B )); - -return port; -} -u32 vlv_dpio_read (struct drm_i915_private *dev_priv,enum pipe pipe,int reg) {u32 val =0 ; -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_PORT (pipe),DPIO_OPCODE_REG_READ , reg, &val);return val; }void vlv_dpio_write (struct drm_i915_private *dev_priv,enum pipe pipe,int reg,u32 val) { -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_PORT (pipe),DPIO_OPCODE_REG_WRITE , reg, &val); }
Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915/vlv: Make the vlv_dpio_read/vlv_dpio_write more PHY centric
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enum dpio_channel for channel index and enum dpio_phy for PHY index. This should better to gather for upcoming platform.
v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.
v3: Rename vlv_phy to dpio_phy_iosf_port and define additional macro DPIO_PHY, and remove unrelated change. (Ville)
--- drivers/gpu/drm/i915/i915_drv.h | 13 +++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 8 ++++---- drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++---- drivers/gpu/drm/i915/intel_sideband.c | 13 ++----------- 7 files changed, 42 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -0
@@ -88,6 +88,18 @@ enum port { };#define port_name (p) ((p) + 'A') +#define I915_NUM_PHYS_VLV 1 + +enum dpio_channel { +DPIO_CH0 , +DPIO_CH1 +}; + +enum dpio_phy { +DPIO_PHY0 , +DPIO_PHY1 +}; +enum intel_display_power_domain {POWER_DOMAIN_PIPE_A ,POWER_DOMAIN_PIPE_B ,
@@ -1403,6 +1415,7 @@ typedef struct drm_i915_private {int num_shared_dpll;struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ];struct intel_ddi_plls ddi_plls; +int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ];/* Reclocking support */ bool render_reclock_avail;
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -457,6 +457,9 @@#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ _DPIO_TX3_SWING_CTL4_B) +#define DPIO_PHY (pipe) ((pipe) >> 1) +#define DPIO_PHY_IOSF_PORT (phy) (dev_priv->dpio_phy_iosf_port[phy]) +/* * Per pipe/PLL DPIO regs */
drivers/gpu/drm/i915/intel_display.c +12 -4
@@ -1361,6 +1361,7 @@ static void intel_init_dpio(struct drm_device *dev)if (!IS_VALLEYVIEW (dev))return ; +DPIO_PHY_IOSF_PORT (DPIO_PHY0 ) =IOSF_PORT_DPIO ;/* * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - * 6. De-assert cmn_reset/side_reset. Same as VLV X0.
@@ -1494,18 +1495,25 @@ static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)POSTING_READ (DPLL (pipe)); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port) +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport) {u32 port_mask; -if (!port) +switch (dport->port) { +case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; -else +break ; +case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; +break ; +default : +BUG (); + }if (wait_for ((I915_READ (DPLL (0 )) & port_mask) ==0 ,1000 ))WARN (1 ,"timed out waiting for port %c ready: 0x%08x\n" , -'B' + port,I915_READ (DPLL (0 ))); +'B' + dport->port,I915_READ (DPLL (0 ))); }/**
drivers/gpu/drm/i915/intel_dp.c +4 -4
@@ -1839,7 +1839,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;struct edp_power_seq power_seq;u32 val;
@@ -1866,7 +1866,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)intel_enable_dp (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_dp_pre_pll_enable (struct intel_encoder *encoder)
@@ -1876,7 +1876,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Program Tx lane resets to default */
@@ -2033,7 +2033,7 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)unsigned long demph_reg_value, preemph_reg_value, uniqtranscale_reg_value;uint8_t train_set = intel_dp->train_set[0 ]; -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;switch (train_set &DP_TRAIN_PRE_EMPHASIS_MASK ) {
drivers/gpu/drm/i915/intel_drv.h +4 -3
@@ -490,9 +490,9 @@ vlv_dport_to_channel(struct intel_digital_port *dport) {switch (dport->port) {case PORT_B : -return 0 ; +return DPIO_CH0 ;case PORT_C : -return 1 ; +return DPIO_CH1 ;default :BUG (); }
@@ -637,7 +637,8 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,void intel_wait_for_vblank (struct drm_device *dev,int pipe);void intel_wait_for_pipe_off (struct drm_device *dev,int pipe);int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port); +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport);bool intel_get_load_detect_pipe (struct drm_connector *connector,struct drm_display_mode *mode,struct intel_load_detect_pipe *old);
drivers/gpu/drm/i915/intel_hdmi.c +4 -4
@@ -1081,7 +1081,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;
@@ -1124,7 +1124,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)intel_enable_hdmi (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_hdmi_pre_pll_enable (struct intel_encoder *encoder)
@@ -1134,7 +1134,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;if (!IS_VALLEYVIEW (dev))
@@ -1169,7 +1169,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Reset lanes to avoid HDMI flicker (VLV w/a) */
drivers/gpu/drm/i915/intel_sideband.c +2 -11
@@ -176,27 +176,18 @@ void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) PUNIT_OPCODE_REG_WRITE, reg, &val); } -static u32 vlv_get_phy_port (enum pipe pipe) -{ -u32 port =IOSF_PORT_DPIO ; - -WARN_ON ((pipe !=PIPE_A ) && (pipe !=PIPE_B )); - -return port; -} -u32 vlv_dpio_read (struct drm_i915_private *dev_priv,enum pipe pipe,int reg) {u32 val =0 ; -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_IOSF_PORT (DPIO_PHY (pipe)),DPIO_OPCODE_REG_READ , reg, &val);return val; }void vlv_dpio_write (struct drm_i915_private *dev_priv,enum pipe pipe,int reg,u32 val) { -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_IOSF_PORT (DPIO_PHY (pipe)),DPIO_OPCODE_REG_WRITE , reg, &val); }
Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.
Quoted 8 lines
v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.v3: Rename
vlv_phytodpio_phy_iosf_portand define additional macroDPIO_PHY, and remove unrelated change. (Ville)Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>
PS.
Please add v2,v3,etc. note to the subject. In this case it would be "[PATCH v3 1/2] ...". Otherwise it's really easy to lose track which mail has the latest version.
Quoted 244 lines
--- drivers/gpu/drm/i915/i915_drv.h | 13 +++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 8 ++++---- drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++---- drivers/gpu/drm/i915/intel_sideband.c | 13 ++----------- 7 files changed, 42 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/i915_drv.h +13
-0@@ -88,6 +88,18 @@ enum port { };#define port_name (p) ((p) + 'A') +#define I915_NUM_PHYS_VLV 1 + +enum dpio_channel { +DPIO_CH0 , +DPIO_CH1 +}; + +enum dpio_phy { +DPIO_PHY0 , +DPIO_PHY1 +}; +enum intel_display_power_domain {POWER_DOMAIN_PIPE_A ,POWER_DOMAIN_PIPE_B ,@@ -1403,6 +1415,7 @@ typedef struct drm_i915_private {int num_shared_dpll;struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ];struct intel_ddi_plls ddi_plls; +int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ];/* Reclocking support */ bool render_reclock_avail;drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -457,6 +457,9 @@#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ _DPIO_TX3_SWING_CTL4_B) +#define DPIO_PHY (pipe) ((pipe) >> 1) +#define DPIO_PHY_IOSF_PORT (phy) (dev_priv->dpio_phy_iosf_port[phy]) +/* * Per pipe/PLL DPIO regs */ drivers/gpu/drm/i915/intel_display.c +12
-4@@ -1361,6 +1361,7 @@ static void intel_init_dpio(struct drm_device *dev)if (!IS_VALLEYVIEW (dev))return ; +DPIO_PHY_IOSF_PORT (DPIO_PHY0 ) =IOSF_PORT_DPIO ;/* * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - * 6. De-assert cmn_reset/side_reset. Same as VLV X0. @@ -1494,18 +1495,25 @@ static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)POSTING_READ (DPLL (pipe)); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port) +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport) {u32 port_mask; -if (!port) +switch (dport->port) { +case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; -else +break ; +case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; +break ; +default : +BUG (); + }if (wait_for ((I915_READ (DPLL (0 )) & port_mask) ==0 ,1000 ))WARN (1 ,"timed out waiting for port %c ready: 0x%08x\n" , -'B' + port,I915_READ (DPLL (0 ))); +'B' + dport->port,I915_READ (DPLL (0 ))); }/** drivers/gpu/drm/i915/intel_dp.c +4
-4@@ -1839,7 +1839,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;struct edp_power_seq power_seq;u32 val;@@ -1866,7 +1866,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)intel_enable_dp (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_dp_pre_pll_enable (struct intel_encoder *encoder)@@ -1876,7 +1876,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Program Tx lane resets to default */ @@ -2033,7 +2033,7 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)unsigned long demph_reg_value, preemph_reg_value, uniqtranscale_reg_value;uint8_t train_set = intel_dp->train_set[0 ]; -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;switch (train_set &DP_TRAIN_PRE_EMPHASIS_MASK ) {drivers/gpu/drm/i915/intel_drv.h +4
-3@@ -490,9 +490,9 @@ vlv_dport_to_channel(struct intel_digital_port *dport) {switch (dport->port) {case PORT_B : -return 0 ; +return DPIO_CH0 ;case PORT_C : -return 1 ; +return DPIO_CH1 ;default :BUG (); }@@ -637,7 +637,8 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,void intel_wait_for_vblank (struct drm_device *dev,int pipe);void intel_wait_for_pipe_off (struct drm_device *dev,int pipe);int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port); +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport);bool intel_get_load_detect_pipe (struct drm_connector *connector,struct drm_display_mode *mode,struct intel_load_detect_pipe *old);drivers/gpu/drm/i915/intel_hdmi.c +4
-4@@ -1081,7 +1081,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;@@ -1124,7 +1124,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)intel_enable_hdmi (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_hdmi_pre_pll_enable (struct intel_encoder *encoder)@@ -1134,7 +1134,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;if (!IS_VALLEYVIEW (dev))@@ -1169,7 +1169,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Reset lanes to avoid HDMI flicker (VLV w/a) */ drivers/gpu/drm/i915/intel_sideband.c +2
-11@@ -176,27 +176,18 @@ void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) PUNIT_OPCODE_REG_WRITE, reg, &val); } -static u32 vlv_get_phy_port (enum pipe pipe) -{ -u32 port =IOSF_PORT_DPIO ; - -WARN_ON ((pipe !=PIPE_A ) && (pipe !=PIPE_B )); - -return port; -} -u32 vlv_dpio_read (struct drm_i915_private *dev_priv,enum pipe pipe,int reg) {u32 val =0 ; -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_IOSF_PORT (DPIO_PHY (pipe)),DPIO_OPCODE_REG_READ , reg, &val);return val; }void vlv_dpio_write (struct drm_i915_private *dev_priv,enum pipe pipe,int reg,u32 val) { -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_IOSF_PORT (DPIO_PHY (pipe)),DPIO_OPCODE_REG_WRITE , reg, &val); }Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Daniel Vetter
AppliedQuoted 9 lines · Ville Syrjälä
Quoted 8 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.
Quoted 7 lines
Quoted 5 lines
v3: Rename
vlv_phytodpio_phy_iosf_portand define additional macroDPIO_PHY, and remove unrelated change. (Ville)Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 13 lines · On Mon, 11 Nov 2013 10:23:24 +0100 Daniel Vetter <[email protected]> wrote:
Quoted 12 lines · Ville Syrjälä
Quoted 11 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.v3: Rename
vlv_phytodpio_phy_iosf_portand define additional macroDPIO_PHY, and remove unrelated change. (Ville)
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Queued for -next, thanks for the patch.
Looks like this one gives me bogus DPIO values at least some of the time. Reverting to using 0x12 as the port ID seems to get me valid values back...
Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · On Tue, 26 Nov 2013 15:10:22 -0800 Jesse Barnes <[email protected]>…
Quoted 16 lines · On Mon, 11 Nov 2013 10:23:24 +0100 Daniel Vetter <[email protected]> wrote:
Quoted 15 lines · Ville Syrjälä
Quoted 13 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.v3: Rename
vlv_phytodpio_phy_iosf_portand define additional macroDPIO_PHY, and remove unrelated change. (Ville)Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Ville Syrjälä <[email protected]>Queued for -next, thanks for the patch.
Looks like this one gives me bogus DPIO values at least some of the time. Reverting to using
0x12as the port ID seems to get me valid values back...
Ah looks like the init_dpio happens too late for the mode state readout. I'll post a patch to move it up.
Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Jesse Barnes
Quoted 21 lines · On Tue, 26 Nov 2013 15:10:22 -0800 Jesse Barnes <[email protected]>…
Quoted 18 lines · On Mon, 11 Nov 2013 10:23:24 +0100 Daniel Vetter <[email protected]> wrote:
Quoted 16 lines · Ville Syrjälä
Quoted 5 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.Quoted 8 lines
v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.v3: Rename
vlv_phytodpio_phy_iosf_portand define additional macroDPIO_PHY, and remove unrelated change. (Ville)Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Queued for -next, thanks for the patch.
Looks like this one gives me bogus DPIO values at least some of the time. Reverting to using
0x12as the port ID seems to get me valid values back...Ah looks like the
init_dpiohappens too late for the mode state readout. I'll post a patch to move it up.
Isn't that just because your fb reconstruction patches moves it up by a lot? If so can you please extract just that from your patches? I was wondering whether we should do that due to the usual init ordering fun anyway. I'd prefer to let that one soak a few days in dinq or so before pulling in the hairy stuff.
Aside: The s/intelfbdev.ifb/intelfbdev->fb/ conversion would also be neater split out.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 56 lines · Chon Ming Lee
vlv_dpio_read/write should be describe more in PHY centric instead of display controller centric.
Create a enumdpio_channelfor channel index and enumdpio_phyfor PHY index. This should better to gather for upcoming platform.v2: Rebase the code based on
drm/i915/vlv: Fix typo in the DPIO register define.Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 13 +++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 9 ++++----- drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- drivers/gpu/drm/i915/intel_hdmi.c | 9 ++++----- drivers/gpu/drm/i915/intel_sideband.c | 13 ++----------- 7 files changed, 41 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/i915_drv.h +13
-0@@ -88,6 +88,18 @@ enum port { };#define port_name (p) ((p) + 'A') +#define I915_NUM_PHYS_VLV 1 + +enum dpio_channel { +DPIO_CH0 , +DPIO_CH1 +}; + +enum dpio_phy { +DPIO_PHY0 , +DPIO_PHY1 +}; +enum intel_display_power_domain {POWER_DOMAIN_PIPE_A ,POWER_DOMAIN_PIPE_B ,@@ -1401,6 +1413,7 @@ typedef struct drm_i915_private {int num_shared_dpll;struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ];struct intel_ddi_plls ddi_plls; +int vlv_phy[I915_NUM_PHYS_VLV ];/* Reclocking support */ bool render_reclock_avail;drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h line 450
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -447,6 +447,8 @@#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ _DPIO_TX3_SWING_CTL4_B) +#define DPIO_PHY_PORT (pipe) (dev_priv->vlv_phy[pipe >> 1])
I don't think this vlv_phy[] thing really helps things. It does the pipe->phy->iosf port mapping in a bit of a magic way.
Maybe rename the vlv_phy[] to something like dpio_phy_iosf_port[] and have two macros like so:
DPIO_PHY(pipe) ((pipe) >> 1)
DPIO_PHY_IOSF_PORT(phy) (dev_priv->dpio_phy_iosf_port[phy])
Quoted 60 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+/* * Per pipe/PLL DPIO regs */ drivers/gpu/drm/i915/intel_display.c +12
-4@@ -1361,6 +1361,7 @@ static void intel_init_dpio(struct drm_device *dev)if (!IS_VALLEYVIEW (dev))return ; + dev_priv->vlv_phy[DPIO_PHY0 ] =IOSF_PORT_DPIO ;/* * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - * 6. De-assert cmn_reset/side_reset. Same as VLV X0. @@ -1494,18 +1495,25 @@ static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)POSTING_READ (DPLL (pipe)); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port) +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport) {u32 port_mask; -if (!port) +switch (dport->port) { +case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; -else +break ; +case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; +break ; +default : +BUG (); + }if (wait_for ((I915_READ (DPLL (0 )) & port_mask) ==0 ,1000 ))WARN (1 ,"timed out waiting for port %c ready: 0x%08x\n" , -'B' + port,I915_READ (DPLL (0 ))); +'B' + dport->port,I915_READ (DPLL (0 ))); }/** drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1831,7 +1831,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;struct edp_power_seq power_seq;u32 val;
drivers/gpu/drm/i915/intel_dp.c static void vlv_pre_enable_dp(struct intel_encoder *encoder) · line 1842
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +0
-1@@ -1839,7 +1839,6 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); - val =0 ;
Unrelated change.
The rest looks fine to me.
Quoted 145 lines
drivers/gpu/drm/i915/intel_dp.c +3
-3if (pipe) val |= (1 <<21 );else @@ -1858,7 +1857,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)intel_enable_dp (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_dp_pre_pll_enable (struct intel_encoder *encoder)@@ -1868,7 +1867,7 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Program Tx lane resets to default */ @@ -2025,7 +2024,7 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)unsigned long demph_reg_value, preemph_reg_value, uniqtranscale_reg_value;uint8_t train_set = intel_dp->train_set[0 ]; -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;switch (train_set &DP_TRAIN_PRE_EMPHASIS_MASK ) {drivers/gpu/drm/i915/intel_drv.h +4
-3@@ -490,9 +490,9 @@ vlv_dport_to_channel(struct intel_digital_port *dport) {switch (dport->port) {case PORT_B : -return 0 ; +return DPIO_CH0 ;case PORT_C : -return 1 ; +return DPIO_CH1 ;default :BUG (); }@@ -637,7 +637,8 @@ enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,void intel_wait_for_vblank (struct drm_device *dev,int pipe);void intel_wait_for_pipe_off (struct drm_device *dev,int pipe);int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,int port); +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport);bool intel_get_load_detect_pipe (struct drm_connector *connector,struct drm_display_mode *mode,struct intel_load_detect_pipe *old);drivers/gpu/drm/i915/intel_hdmi.c +4
-5@@ -1081,7 +1081,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;@@ -1091,7 +1091,6 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Enable clock channels for this port */ mutex_lock (&dev_priv->dpio_lock); val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); - val =0 ;if (pipe) val |= (1 <<21 );else @@ -1124,7 +1123,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)intel_enable_hdmi (encoder); -vlv_wait_port_ready (dev_priv, port); +vlv_wait_port_ready (dev_priv, dport); }static void vlv_hdmi_pre_pll_enable (struct intel_encoder *encoder)@@ -1134,7 +1133,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;if (!IS_VALLEYVIEW (dev))@@ -1169,7 +1168,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -int port =vlv_dport_to_channel (dport); +enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;/* Reset lanes to avoid HDMI flicker (VLV w/a) */ drivers/gpu/drm/i915/intel_sideband.c +2
-11@@ -160,27 +160,18 @@ void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) PUNIT_OPCODE_REG_WRITE, reg, &val); } -static u32 vlv_get_phy_port (enum pipe pipe) -{ -u32 port =IOSF_PORT_DPIO ; - -WARN_ON ((pipe !=PIPE_A ) && (pipe !=PIPE_B )); - -return port; -} -u32 vlv_dpio_read (struct drm_i915_private *dev_priv,enum pipe pipe,int reg) {u32 val =0 ; -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_PORT (pipe),DPIO_OPCODE_REG_READ , reg, &val);return val; }void vlv_dpio_write (struct drm_i915_private *dev_priv,enum pipe pipe,int reg,u32 val) { -vlv_sideband_rw (dev_priv,DPIO_DEVFN ,vlv_get_phy_port (pipe), +vlv_sideband_rw (dev_priv,DPIO_DEVFN ,DPIO_PHY_PORT (pipe),DPIO_OPCODE_REG_WRITE , reg, &val); }Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 2/2 drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
In reply to Chon Ming LeeSome VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0 - Group access to PCS for lane 0 to 3 for PCS DWORD 0. VLV_PCS01_DW0_CH0 - PCS access to lane 0/1, channel 0 for PCS DWORD 0.
Another example is
VLV_TX_DW0 - Group access to TX lane 0 to 3 for TX DWORD 0 VLV_TX0_DW0 - Refer to TX Lane 0 access only for TX DWORD 0.
There is no functional change on this patch.
--- drivers/gpu/drm/i915/i915_debugfs.c | 40 ++++---- drivers/gpu/drm/i915/i915_reg.h | 189 ++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 48 +++++----- drivers/gpu/drm/i915/intel_dp.c | 32 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 54 ++++------ 5 files changed, 171 insertions(+), 192 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +20 -20
@@ -1650,28 +1650,28 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CTL: 0x%08x\n" ,I915_READ (DPIO_CTL )); -seq_printf (m,"DPIO_DIV_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_A)); -seq_printf (m,"DPIO_DIV_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_B)); - -seq_printf (m,"DPIO_REFSFR_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_A)); -seq_printf (m,"DPIO_REFSFR_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_B)); - -seq_printf (m,"DPIO_CORE_CLK_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_A)); -seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_B)); - -seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_A)); -seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_B)); +seq_printf (m,"DPIO PLL DW3 CH0 : 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (0 ))); +seq_printf (m,"DPIO PLL DW3 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (1 ))); + +seq_printf (m,"DPIO PLL DW5 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (0 ))); +seq_printf (m,"DPIO PLL DW5 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (1 ))); + +seq_printf (m,"DPIO PLL DW7 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (0 ))); +seq_printf (m,"DPIO PLL DW7 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (1 ))); + +seq_printf (m,"DPIO PLL DW12 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (0 ))); +seq_printf (m,"DPIO PLL DW12 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (1 )));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A ,DPIO_FASTCLK_DISABLE )); +vlv_dpio_read (dev_priv,PIPE_A ,VLV_CMN_DW0 ));mutex_unlock (&dev_priv->dpio_lock);
drivers/gpu/drm/i915/i915_reg.h +89 -100
234 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +24 -24
118 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +16 -16
@@ -1838,15 +1838,15 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port));if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);
@@ -1872,19 +1872,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }
@@ -2101,14 +2101,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;
drivers/gpu/drm/i915/intel_hdmi.c +22 -32
89 lines not on this page · raw message
Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Some VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0 - Group access to PCS for lane 0 to 3 for PCS DWORD 0. VLV_PCS01_DW0_CH0 - PCS access to lane 0/1, channel 0 for PCS DWORD 0.
Another example is
VLV_TX_DW0 - Group access to TX lane 0 to 3 for TX DWORD 0 VLV_TX0_DW0 - Refer to TX Lane 0 access only for TX DWORD 0.
There is no functional change on this patch.
v2: Rebase based on previous patch change.
--- drivers/gpu/drm/i915/i915_debugfs.c | 40 ++++---- drivers/gpu/drm/i915/i915_reg.h | 190 ++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 48 +++++----- drivers/gpu/drm/i915/intel_dp.c | 32 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 54 ++++------ 5 files changed, 171 insertions(+), 193 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +20 -20
@@ -1650,28 +1650,28 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CTL: 0x%08x\n" ,I915_READ (DPIO_CTL )); -seq_printf (m,"DPIO_DIV_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_A)); -seq_printf (m,"DPIO_DIV_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_B)); - -seq_printf (m,"DPIO_REFSFR_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_A)); -seq_printf (m,"DPIO_REFSFR_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_B)); - -seq_printf (m,"DPIO_CORE_CLK_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_A)); -seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_B)); - -seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_A)); -seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_B)); +seq_printf (m,"DPIO PLL DW3 CH0 : 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (0 ))); +seq_printf (m,"DPIO PLL DW3 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (1 ))); + +seq_printf (m,"DPIO PLL DW5 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (0 ))); +seq_printf (m,"DPIO PLL DW5 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (1 ))); + +seq_printf (m,"DPIO PLL DW7 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (0 ))); +seq_printf (m,"DPIO PLL DW7 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (1 ))); + +seq_printf (m,"DPIO PLL DW12 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (0 ))); +seq_printf (m,"DPIO PLL DW12 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (1 )));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A ,DPIO_FASTCLK_DISABLE )); +vlv_dpio_read (dev_priv,PIPE_A ,VLV_CMN_DW0 ));mutex_unlock (&dev_priv->dpio_lock);
drivers/gpu/drm/i915/i915_reg.h +89 -101
235 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +24 -24
118 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +16 -16
@@ -1846,16 +1846,16 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);
@@ -1881,19 +1881,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }
@@ -2110,14 +2110,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;
drivers/gpu/drm/i915/intel_hdmi.c +22 -32
90 lines not on this page · raw message
Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Quoted 139 lines · Chon Ming Lee
Some VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0- Group access to PCS for lane 0 to 3 for PCS DWORD 0.VLV_PCS01_DW0_CH0- PCS access to lane 0/1, channel 0 for PCS DWORD 0.Another example is
VLV_TX_DW0- Group access to TX lane 0 to 3 for TX DWORD 0VLV_TX0_DW0- Refer to TX Lane 0 access only for TX DWORD 0.There is no functional change on this patch.
v2: Rebase based on previous patch change.
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 40 ++++---- drivers/gpu/drm/i915/i915_reg.h | 190 ++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 48 +++++----- drivers/gpu/drm/i915/intel_dp.c | 32 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 54 ++++------ 5 files changed, 171 insertions(+), 193 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +20
-20@@ -1650,28 +1650,28 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CTL: 0x%08x\n" ,I915_READ (DPIO_CTL )); -seq_printf (m,"DPIO_DIV_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_A)); -seq_printf (m,"DPIO_DIV_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_B)); - -seq_printf (m,"DPIO_REFSFR_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_A)); -seq_printf (m,"DPIO_REFSFR_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_B)); - -seq_printf (m,"DPIO_CORE_CLK_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_A)); -seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_B)); - -seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_A)); -seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_B)); +seq_printf (m,"DPIO PLL DW3 CH0 : 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (0 ))); +seq_printf (m,"DPIO PLL DW3 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (1 ))); + +seq_printf (m,"DPIO PLL DW5 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (0 ))); +seq_printf (m,"DPIO PLL DW5 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (1 ))); + +seq_printf (m,"DPIO PLL DW7 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (0 ))); +seq_printf (m,"DPIO PLL DW7 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (1 ))); + +seq_printf (m,"DPIO PLL DW12 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (0 ))); +seq_printf (m,"DPIO PLL DW12 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW12 (1 )));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A ,DPIO_FASTCLK_DISABLE )); +vlv_dpio_read (dev_priv,PIPE_A ,VLV_CMN_DW0 ));mutex_unlock (&dev_priv->dpio_lock);drivers/gpu/drm/i915/i915_reg.h +6
-14@@ -452,18 +452,13 @@#define DPIO_SFR_BYPASS (1<<1)#define DPIO_CMNRST (1<<0) -#define _DPIO_TX3_SWING_CTL4_A 0x690 -#define _DPIO_TX3_SWING_CTL4_B 0x2a90 -#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ - _DPIO_TX3_SWING_CTL4_B) -#define DPIO_PHY (pipe) ((pipe) >> 1)#define DPIO_PHY_IOSF_PORT (phy) (dev_priv->dpio_phy_iosf_port[phy])/* * Per pipe/PLL DPIO regs */ -#define _DPIO_DIV_A 0x800c +#define _VLV_PLL_DW3_CH0 0x800c#define DPIO_POST_DIV_SHIFT (28)/* 3 bits */ #define DPIO_POST_DIV_DAC 0#define DPIO_POST_DIV_HDMIDP 1/* DAC 225-400M rate */ @@ -476,10 +471,10 @@#define DPIO_ENABLE_CALIBRATION (1<<11)#define DPIO_M1DIV_SHIFT (8)/* 3 bits */ #define DPIO_M2DIV_MASK 0xff -#define _DPIO_DIV_B 0x802c -#define DPIO_DIV (pipe) _PIPE(pipe, _DPIO_DIV_A, _DPIO_DIV_B) +#define _VLV_PLL_DW3_CH1 0x802c +#define VLV_PLL_DW3 (ch) _PIPE(ch, _VLV_PLL_DW3_CH0, _VLV_PLL_DW3_CH1) -#define _DPIO_REFSFR_A 0x8014 +#define _VLV_PLL_DW5_CH0 0x8014#define DPIO_REFSEL_OVERRIDE 27#define DPIO_PLL_MODESEL_SHIFT 24/* 3 bits */ #define DPIO_BIAS_CURRENT_CTL_SHIFT 21/* 3 bits, always 0x7 */ @@ -487,118 +482,111 @@#define DPIO_PLL_REFCLK_SEL_MASK 3#define DPIO_DRIVER_CTL_SHIFT 12/* always set to 0x8 */ #define DPIO_CLK_BIAS_CTL_SHIFT 8/* always set to 0x5 */ -#define _DPIO_REFSFR_B 0x8034 -#define DPIO_REFSFR (pipe) _PIPE(pipe, _DPIO_REFSFR_A, _DPIO_REFSFR_B) +#define _VLV_PLL_DW5_CH1 0x8034 +#define VLV_PLL_DW5 (ch) _PIPE(ch, _VLV_PLL_DW5_CH0, _VLV_PLL_DW5_CH1) -#define _DPIO_CORE_CLK_A 0x801c -#define _DPIO_CORE_CLK_B 0x803c -#define DPIO_CORE_CLK (pipe) _PIPE(pipe, _DPIO_CORE_CLK_A, _DPIO_CORE_CLK_B)
drivers/gpu/drm/i915/i915_reg.h line 494
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +6
-3+#define _VLV_PLL_DW7_CH0 0x801c +#define _VLV_PLL_DW7_CH1 0x803c +#define VLV_PLL_DW7 (ch) _PIPE(ch, _VLV_PLL_DW7_CH0, _VLV_PLL_DW7_CH1) -#define _DPIO_IREF_CTL_A 0x8040 -#define _DPIO_IREF_CTL_B 0x8060 -#define DPIO_IREF_CTL (pipe) _PIPE(pipe, _DPIO_IREF_CTL_A, _DPIO_IREF_CTL_B) +#define _VLV_PLL_DW10_CH0 0x8040 +#define _VLV_PLL_DW10_CH1 0x8060 +#define VLV_PLL_DW10 (ch) _PIPE(ch, _VLV_PLL_DW10_CH0, _VLV_PLL_DW10_CH1)
Configdb starts counting from DW8 at 0x8040/60, which kind of make sense since the first PLL block ends at DW7.
drivers/gpu/drm/i915/i915_reg.h line 499
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +4
-4-#define DPIO_IREF_BCAST 0xc044 -#define _DPIO_IREF_A 0x8044 -#define _DPIO_IREF_B 0x8064 -#define DPIO_IREF (pipe) _PIPE(pipe, _DPIO_IREF_A, _DPIO_IREF_B) +#define VLV_PLL_DW11_BCAST 0xc044 +#define _VLV_PLL_DW11_CH0 0x8044 +#define _VLV_PLL_DW11_CH1 0x8064 +#define VLV_PLL_DW11 (ch) _PIPE(ch, _VLV_PLL_DW11_CH0, _VLV_PLL_DW11_CH1)
... which would make this DW9
drivers/gpu/drm/i915/i915_reg.h line 503
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_PLL_CML_A 0x804c -#define _DPIO_PLL_CML_B 0x806c -#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) +#define _VLV_PLL_DW13_CH0 0x804c +#define _VLV_PLL_DW13_CH1 0x806c +#define VLV_PLL_DW13 (ch) _PIPE(ch, _VLV_PLL_DW13_CH0, _VLV_PLL_DW13_CH1)
... DW11
drivers/gpu/drm/i915/i915_reg.h line 507
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_LPF_COEFF_A 0x8048 -#define _DPIO_LPF_COEFF_B 0x8068 -#define DPIO_LPF_COEFF (pipe) _PIPE(pipe, _DPIO_LPF_COEFF_A, _DPIO_LPF_COEFF_B) +#define _VLV_PLL_DW12_CH0 0x8048 +#define _VLV_PLL_DW12_CH1 0x8068 +#define VLV_PLL_DW12 (ch) _PIPE(ch, _VLV_PLL_DW12_CH0, _VLV_PLL_DW12_CH1)
... DW10
Maybe also reorder this with the previous one to keep the PLL register defiens in numerical order.
drivers/gpu/drm/i915/i915_reg.h line 509
Quoted 3 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1-#define DPIO_CALIBRATION 0x80ac +#define VLV_REF_DW11 0x80ac
And this is DW13 in configdb. So in the ref block it starts counting from DW10 for some reason. Yay for consistency.
The rest looks good to me. I double checked the cpp output to make sure that the actual changes were limited to i915_debugfs.c.
Quoted 458 lines
drivers/gpu/drm/i915/i915_reg.h +66
-73-#define DPIO_FASTCLK_DISABLE 0x8100 +#define VLV_CMN_DW0 0x8100/* * Per DDI channel DPIO regs */ -#define _DPIO_PCS_TX_0 0x8200 -#define _DPIO_PCS_TX_1 0x8400 +#define _VLV_PCS_DW0_CH0 0x8200 +#define _VLV_PCS_DW0_CH1 0x8400#define DPIO_PCS_TX_LANE2_RESET (1<<16)#define DPIO_PCS_TX_LANE1_RESET (1<<7) -#define DPIO_PCS_TX (port) _PORT(port, _DPIO_PCS_TX_0, _DPIO_PCS_TX_1) +#define VLV_PCS_DW0 (ch) _PORT(ch, _VLV_PCS_DW0_CH0, _VLV_PCS_DW0_CH1) -#define _DPIO_PCS_CLK_0 0x8204 -#define _DPIO_PCS_CLK_1 0x8404 +#define _VLV_PCS_DW1_CH0 0x8204 +#define _VLV_PCS_DW1_CH1 0x8404#define DPIO_PCS_CLK_CRI_RXEB_EIOS_EN (1<<22)#define DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN (1<<21)#define DPIO_PCS_CLK_DATAWIDTH_SHIFT (6)#define DPIO_PCS_CLK_SOFT_RESET (1<<5) -#define DPIO_PCS_CLK (port) _PORT(port, _DPIO_PCS_CLK_0, _DPIO_PCS_CLK_1) - -#define _DPIO_PCS_CTL_OVR1_A 0x8224 -#define _DPIO_PCS_CTL_OVR1_B 0x8424 -#define DPIO_PCS_CTL_OVER1 (port) _PORT(port, _DPIO_PCS_CTL_OVR1_A, \ - _DPIO_PCS_CTL_OVR1_B) - -#define _DPIO_PCS_STAGGER0_A 0x822c -#define _DPIO_PCS_STAGGER0_B 0x842c -#define DPIO_PCS_STAGGER0 (port) _PORT(port, _DPIO_PCS_STAGGER0_A, \ - _DPIO_PCS_STAGGER0_B) - -#define _DPIO_PCS_STAGGER1_A 0x8230 -#define _DPIO_PCS_STAGGER1_B 0x8430 -#define DPIO_PCS_STAGGER1 (port) _PORT(port, _DPIO_PCS_STAGGER1_A, \ - _DPIO_PCS_STAGGER1_B) - -#define _DPIO_PCS_CLOCKBUF0_A 0x8238 -#define _DPIO_PCS_CLOCKBUF0_B 0x8438 -#define DPIO_PCS_CLOCKBUF0 (port) _PORT(port, _DPIO_PCS_CLOCKBUF0_A, \ - _DPIO_PCS_CLOCKBUF0_B) - -#define _DPIO_PCS_CLOCKBUF8_A 0x825c -#define _DPIO_PCS_CLOCKBUF8_B 0x845c -#define DPIO_PCS_CLOCKBUF8 (port) _PORT(port, _DPIO_PCS_CLOCKBUF8_A, \ - _DPIO_PCS_CLOCKBUF8_B) - -#define _DPIO_TX_SWING_CTL2_A 0x8288 -#define _DPIO_TX_SWING_CTL2_B 0x8488 -#define DPIO_TX_SWING_CTL2 (port) _PORT(port, _DPIO_TX_SWING_CTL2_A, \ - _DPIO_TX_SWING_CTL2_B) - -#define _DPIO_TX_SWING_CTL3_A 0x828c -#define _DPIO_TX_SWING_CTL3_B 0x848c -#define DPIO_TX_SWING_CTL3 (port) _PORT(port, _DPIO_TX_SWING_CTL3_A, \ - _DPIO_TX_SWING_CTL3_B) - -#define _DPIO_TX_SWING_CTL4_A 0x8290 -#define _DPIO_TX_SWING_CTL4_B 0x8490 -#define DPIO_TX_SWING_CTL4 (port) _PORT(port, _DPIO_TX_SWING_CTL4_A, \ - _DPIO_TX_SWING_CTL4_B) - -#define _DPIO_TX_OCALINIT_0 0x8294 -#define _DPIO_TX_OCALINIT_1 0x8494 +#define VLV_PCS_DW1 (ch) _PORT(ch, _VLV_PCS_DW1_CH0, _VLV_PCS_DW1_CH1) + +#define _VLV_PCS_DW8_CH0 0x8220 +#define _VLV_PCS_DW8_CH1 0x8420 +#define VLV_PCS_DW8 (ch) _PORT(ch, _VLV_PCS_DW8_CH0, _VLV_PCS_DW8_CH1) + +#define _VLV_PCS01_DW8_CH0 0x0220 +#define _VLV_PCS23_DW8_CH0 0x0420 +#define _VLV_PCS01_DW8_CH1 0x2620 +#define _VLV_PCS23_DW8_CH1 0x2820 +#define VLV_PCS01_DW8 (port) _PORT(port, _VLV_PCS01_DW8_CH0, _VLV_PCS01_DW8_CH1) +#define VLV_PCS23_DW8 (port) _PORT(port, _VLV_PCS23_DW8_CH0, _VLV_PCS23_DW8_CH1) + +#define _VLV_PCS_DW9_CH0 0x8224 +#define _VLV_PCS_DW9_CH1 0x8424 +#define VLV_PCS_DW9 (ch) _PORT(ch, _VLV_PCS_DW9_CH0, _VLV_PCS_DW9_CH1) + +#define _VLV_PCS_DW11_CH0 0x822c +#define _VLV_PCS_DW11_CH1 0x842c +#define VLV_PCS_DW11 (ch) _PORT(ch, _VLV_PCS_DW11_CH0, _VLV_PCS_DW11_CH1) + +#define _VLV_PCS_DW12_CH0 0x8230 +#define _VLV_PCS_DW12_CH1 0x8430 +#define VLV_PCS_DW12 (ch) _PORT(ch, _VLV_PCS_DW12_CH0, _VLV_PCS_DW12_CH1) + +#define _VLV_PCS_DW14_CH0 0x8238 +#define _VLV_PCS_DW14_CH1 0x8438 +#define VLV_PCS_DW14 (ch) _PORT(ch, _VLV_PCS_DW14_CH0, _VLV_PCS_DW14_CH1) + +#define _VLV_PCS_DW23_CH0 0x825c +#define _VLV_PCS_DW23_CH1 0x845c +#define VLV_PCS_DW23 (ch) _PORT(ch, _VLV_PCS_DW23_CH0, _VLV_PCS_DW23_CH1) + +#define _VLV_TX_DW2_CH0 0x8288 +#define _VLV_TX_DW2_CH1 0x8488 +#define VLV_TX_DW2 (ch) _PORT(ch, _VLV_TX_DW2_CH0, _VLV_TX_DW2_CH1) + +#define _VLV_TX_DW3_CH0 0x828c +#define _VLV_TX_DW3_CH1 0x848c +#define VLV_TX_DW3 (ch) _PORT(ch, _VLV_TX_DW3_CH0, _VLV_TX_DW3_CH1) + +#define _VLV_TX_DW4_CH0 0x8290 +#define _VLV_TX_DW4_CH1 0x8490 +#define VLV_TX_DW4 (ch) _PORT(ch, _VLV_TX_DW4_CH0, _VLV_TX_DW4_CH1) + +#define _VLV_TX3_DW4_CH0 0x690 +#define _VLV_TX3_DW4_CH1 0x2a90 +#define VLV_TX3_DW4 (ch) _PORT(ch, _VLV_TX3_DW4_CH0, _VLV_TX3_DW4_CH1) + +#define _VLV_TX_DW5_CH0 0x8294 +#define _VLV_TX_DW5_CH1 0x8494#define DPIO_TX_OCALINIT_EN (1<<31) -#define DPIO_TX_OCALINIT (port) _PORT(port, _DPIO_TX_OCALINIT_0, \ - _DPIO_TX_OCALINIT_1) - -#define _DPIO_TX_CTL_0 0x82ac -#define _DPIO_TX_CTL_1 0x84ac -#define DPIO_TX_CTL (port) _PORT(port, _DPIO_TX_CTL_0, _DPIO_TX_CTL_1) - -#define _DPIO_TX_LANE_0 0x82b8 -#define _DPIO_TX_LANE_1 0x84b8 -#define DPIO_TX_LANE (port) _PORT(port, _DPIO_TX_LANE_0, _DPIO_TX_LANE_1) - -#define _DPIO_DATA_CHANNEL1 0x8220 -#define _DPIO_DATA_CHANNEL2 0x8420 -#define DPIO_DATA_CHANNEL (port) _PORT(port, _DPIO_DATA_CHANNEL1, _DPIO_DATA_CHANNEL2) - -#define _DPIO_PORT0_PCS0 0x0220 -#define _DPIO_PORT0_PCS1 0x0420 -#define _DPIO_PORT1_PCS2 0x2620 -#define _DPIO_PORT1_PCS3 0x2820 -#define DPIO_DATA_LANE_A (port) _PORT(port, _DPIO_PORT0_PCS0, _DPIO_PORT1_PCS2) -#define DPIO_DATA_LANE_B (port) _PORT(port, _DPIO_PORT0_PCS1, _DPIO_PORT1_PCS3) -#define DPIO_DATA_CHANNEL1 0x8220 -#define DPIO_DATA_CHANNEL2 0x8420 +#define VLV_TX_DW5 (ch) _PORT(ch, _VLV_TX_DW5_CH0, _VLV_TX_DW5_CH1) + +#define _VLV_TX_DW11_CH0 0x82ac +#define _VLV_TX_DW11_CH1 0x84ac +#define VLV_TX_DW11 (ch) _PORT(ch, _VLV_TX_DW11_CH0, _VLV_TX_DW11_CH1) + +#define _VLV_TX_DW14_CH0 0x82b8 +#define _VLV_TX_DW14_CH1 0x84b8 +#define VLV_TX_DW14 (ch) _PORT(ch, _VLV_TX_DW14_CH0, _VLV_TX_DW14_CH1)/* * Fence registers drivers/gpu/drm/i915/intel_display.c +24
-24@@ -4794,24 +4794,24 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipe* PLLB opamp always calibrates to max value of 0x3f, force enable it * and set it to a reasonable value instead. */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW11 (1 )); reg_val &=0xffffff00 ; reg_val |=0x00000030 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW11 ); reg_val &=0x8cffffff ; reg_val =0x8c000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW11 , reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW11 (1 )); reg_val &=0xffffff00 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW11 ); reg_val &=0x00ffffff ; reg_val |=0xb0000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW11 , reg_val); } static void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,@@ -4880,15 +4880,15 @@ static void vlv_update_pll(struct intel_crtc *crtc)vlv_pllb_recal_opamp (dev_priv, pipe);/* Set up Tx target for periodic Rcomp update */ -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_BCAST ,0x0100000f ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11_BCAST ,0x0100000f );/* Disable target IRef on PLL */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF_CTL (pipe)); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW10 (pipe)); reg_val &=0x00ffffff ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_CTL (pipe), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe), reg_val);/* Disable fast lock */ -vlv_dpio_write (dev_priv, pipe,DPIO_FASTCLK_DISABLE ,0x610 ); +vlv_dpio_write (dev_priv, pipe,VLV_CMN_DW0 ,0x610 );/* Set idtafcrecal before PLL is enabled */ mdiv = ((bestm1 <<DPIO_M1DIV_SHIFT ) | (bestm2 &DPIO_M2DIV_MASK ));@@ -4902,48 +4902,48 @@ static void vlv_update_pll(struct intel_crtc *crtc)* Note: don't use the DAC post divider as it seems unstable. */ mdiv |= (DPIO_POST_DIV_HDMIDP <<DPIO_POST_DIV_SHIFT ); -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv); mdiv |=DPIO_ENABLE_CALIBRATION ; -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv);/* 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 )) -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW12 (pipe),0x009f0003 );else -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW12 (pipe),0x00d0000f );if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_EDP ) ||intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DISPLAYPORT )) {/* Use SSC source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 ); }else {/* HDMI or VGA */ /* Use bend source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 ); } - coreclk =vlv_dpio_read (dev_priv, pipe,DPIO_CORE_CLK (pipe)); + 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 )) coreclk |=0x01000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CORE_CLK (pipe), coreclk); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW7 (pipe), coreclk); -vlv_dpio_write (dev_priv, pipe,DPIO_PLL_CML (pipe),0x87871000 ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW13 (pipe),0x87871000 );/* Enable DPIO clock input */ dpll = DPLL_EXT_BUFFER_ENABLE_VLV | DPLL_REFA_CLK_ENABLE_VLV |@@ -5421,7 +5421,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,int refclk =100000 ;mutex_lock (&dev_priv->dpio_lock); - mdiv =vlv_dpio_read (dev_priv, pipe,DPIO_DIV (pipe)); + mdiv =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW3 (pipe));mutex_unlock (&dev_priv->dpio_lock); clock.m1 = (mdiv >>DPIO_M1DIV_SHIFT ) &7 ;drivers/gpu/drm/i915/intel_dp.c +16
-16@@ -1846,16 +1846,16 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);@@ -1881,19 +1881,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }@@ -2110,14 +2110,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;drivers/gpu/drm/i915/intel_hdmi.c +22
-32@@ -1090,36 +1090,28 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Enable clock channels for this port */ mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val);/* HDMI 1.0V-2dB */ -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), -0x2b245f5f ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), -0x5578b83a ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port), -0x0c782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX3_SWING_CTL4 (port), -0x2b247878 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port),0x2b245f5f ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port),0x5578b83a ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0c782040 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX3_DW4 (port),0x2b247878 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); +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 );/* Program lane clock */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port), -0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port), -0x00400888 ); +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);intel_enable_hdmi (encoder);@@ -1142,24 +1134,22 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); - -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +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 ); + +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); }@@ -1174,8 +1164,8 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)/* Reset lanes to avoid HDMI flicker (VLV w/a) */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port),0x00e00060 ); +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); }Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 2/2] drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Quoted 10 lines · Ville Syrjälä
drivers/gpu/drm/i915/i915_reg.h line 494
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_IREF_CTL_A 0x8040 -#define _DPIO_IREF_CTL_B 0x8060 -#define DPIO_IREF_CTL (pipe) _PIPE(pipe, _DPIO_IREF_CTL_A, _DPIO_IREF_CTL_B) +#define _VLV_PLL_DW10_CH0 0x8040 +#define _VLV_PLL_DW10_CH1 0x8060 +#define VLV_PLL_DW10 (ch) _PIPE(ch, _VLV_PLL_DW10_CH0, _VLV_PLL_DW10_CH1)Configdb starts counting from DW8 at 0x8040/60, which kind of make sense since the first PLL block ends at DW7.
The spreadsheet I refer to is using DW10. The spreadsheet might be incorrect. Looking at the register offset, it won't be anymore space left after first PLL block. Make sense for DW8 for second PLL block.
Quoted 36 lines
drivers/gpu/drm/i915/i915_reg.h line 499
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +4
-4-#define DPIO_IREF_BCAST 0xc044 -#define _DPIO_IREF_A 0x8044 -#define _DPIO_IREF_B 0x8064 -#define DPIO_IREF (pipe) _PIPE(pipe, _DPIO_IREF_A, _DPIO_IREF_B) +#define VLV_PLL_DW11_BCAST 0xc044 +#define _VLV_PLL_DW11_CH0 0x8044 +#define _VLV_PLL_DW11_CH1 0x8064 +#define VLV_PLL_DW11 (ch) _PIPE(ch, _VLV_PLL_DW11_CH0, _VLV_PLL_DW11_CH1)... which would make this DW9
drivers/gpu/drm/i915/i915_reg.h line 503
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_PLL_CML_A 0x804c -#define _DPIO_PLL_CML_B 0x806c -#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) +#define _VLV_PLL_DW13_CH0 0x804c +#define _VLV_PLL_DW13_CH1 0x806c +#define VLV_PLL_DW13 (ch) _PIPE(ch, _VLV_PLL_DW13_CH0, _VLV_PLL_DW13_CH1)jjjjjjjjjjjjjjjjjj
... DW11drivers/gpu/drm/i915/i915_reg.h line 507
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_LPF_COEFF_A 0x8048 -#define _DPIO_LPF_COEFF_B 0x8068 -#define DPIO_LPF_COEFF (pipe) _PIPE(pipe, _DPIO_LPF_COEFF_A, _DPIO_LPF_COEFF_B) +#define _VLV_PLL_DW12_CH0 0x8048 +#define _VLV_PLL_DW12_CH1 0x8068 +#define VLV_PLL_DW12 (ch) _PIPE(ch, _VLV_PLL_DW12_CH0, _VLV_PLL_DW12_CH1)... DW10
Maybe also reorder this with the previous one to keep the PLL register defiens in numerical order.
Quoted 1 line
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h line 509
Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1-#define DPIO_CALIBRATION 0x80ac +#define VLV_REF_DW11 0x80acAnd this is DW13 in configdb. So in the ref block it starts counting from DW10 for some reason. Yay for consistency.
Going to add a comment for the DW to start counting. The spreadsheet I am using start counting at DW8. :(
Quoted 466 lines
The rest looks good to me. I double checked the cpp output to make sure that the actual changes were limited to
i915_debugfs.c.Quoted 458 lines
drivers/gpu/drm/i915/i915_reg.h +66
-73-#define DPIO_FASTCLK_DISABLE 0x8100 +#define VLV_CMN_DW0 0x8100/* * Per DDI channel DPIO regs */ -#define _DPIO_PCS_TX_0 0x8200 -#define _DPIO_PCS_TX_1 0x8400 +#define _VLV_PCS_DW0_CH0 0x8200 +#define _VLV_PCS_DW0_CH1 0x8400#define DPIO_PCS_TX_LANE2_RESET (1<<16)#define DPIO_PCS_TX_LANE1_RESET (1<<7) -#define DPIO_PCS_TX (port) _PORT(port, _DPIO_PCS_TX_0, _DPIO_PCS_TX_1) +#define VLV_PCS_DW0 (ch) _PORT(ch, _VLV_PCS_DW0_CH0, _VLV_PCS_DW0_CH1) -#define _DPIO_PCS_CLK_0 0x8204 -#define _DPIO_PCS_CLK_1 0x8404 +#define _VLV_PCS_DW1_CH0 0x8204 +#define _VLV_PCS_DW1_CH1 0x8404#define DPIO_PCS_CLK_CRI_RXEB_EIOS_EN (1<<22)#define DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN (1<<21)#define DPIO_PCS_CLK_DATAWIDTH_SHIFT (6)#define DPIO_PCS_CLK_SOFT_RESET (1<<5) -#define DPIO_PCS_CLK (port) _PORT(port, _DPIO_PCS_CLK_0, _DPIO_PCS_CLK_1) - -#define _DPIO_PCS_CTL_OVR1_A 0x8224 -#define _DPIO_PCS_CTL_OVR1_B 0x8424 -#define DPIO_PCS_CTL_OVER1 (port) _PORT(port, _DPIO_PCS_CTL_OVR1_A, \ - _DPIO_PCS_CTL_OVR1_B) - -#define _DPIO_PCS_STAGGER0_A 0x822c -#define _DPIO_PCS_STAGGER0_B 0x842c -#define DPIO_PCS_STAGGER0 (port) _PORT(port, _DPIO_PCS_STAGGER0_A, \ - _DPIO_PCS_STAGGER0_B) - -#define _DPIO_PCS_STAGGER1_A 0x8230 -#define _DPIO_PCS_STAGGER1_B 0x8430 -#define DPIO_PCS_STAGGER1 (port) _PORT(port, _DPIO_PCS_STAGGER1_A, \ - _DPIO_PCS_STAGGER1_B) - -#define _DPIO_PCS_CLOCKBUF0_A 0x8238 -#define _DPIO_PCS_CLOCKBUF0_B 0x8438 -#define DPIO_PCS_CLOCKBUF0 (port) _PORT(port, _DPIO_PCS_CLOCKBUF0_A, \ - _DPIO_PCS_CLOCKBUF0_B) - -#define _DPIO_PCS_CLOCKBUF8_A 0x825c -#define _DPIO_PCS_CLOCKBUF8_B 0x845c -#define DPIO_PCS_CLOCKBUF8 (port) _PORT(port, _DPIO_PCS_CLOCKBUF8_A, \ - _DPIO_PCS_CLOCKBUF8_B) - -#define _DPIO_TX_SWING_CTL2_A 0x8288 -#define _DPIO_TX_SWING_CTL2_B 0x8488 -#define DPIO_TX_SWING_CTL2 (port) _PORT(port, _DPIO_TX_SWING_CTL2_A, \ - _DPIO_TX_SWING_CTL2_B) - -#define _DPIO_TX_SWING_CTL3_A 0x828c -#define _DPIO_TX_SWING_CTL3_B 0x848c -#define DPIO_TX_SWING_CTL3 (port) _PORT(port, _DPIO_TX_SWING_CTL3_A, \ - _DPIO_TX_SWING_CTL3_B) - -#define _DPIO_TX_SWING_CTL4_A 0x8290 -#define _DPIO_TX_SWING_CTL4_B 0x8490 -#define DPIO_TX_SWING_CTL4 (port) _PORT(port, _DPIO_TX_SWING_CTL4_A, \ - _DPIO_TX_SWING_CTL4_B) - -#define _DPIO_TX_OCALINIT_0 0x8294 -#define _DPIO_TX_OCALINIT_1 0x8494 +#define VLV_PCS_DW1 (ch) _PORT(ch, _VLV_PCS_DW1_CH0, _VLV_PCS_DW1_CH1) + +#define _VLV_PCS_DW8_CH0 0x8220 +#define _VLV_PCS_DW8_CH1 0x8420 +#define VLV_PCS_DW8 (ch) _PORT(ch, _VLV_PCS_DW8_CH0, _VLV_PCS_DW8_CH1) + +#define _VLV_PCS01_DW8_CH0 0x0220 +#define _VLV_PCS23_DW8_CH0 0x0420 +#define _VLV_PCS01_DW8_CH1 0x2620 +#define _VLV_PCS23_DW8_CH1 0x2820 +#define VLV_PCS01_DW8 (port) _PORT(port, _VLV_PCS01_DW8_CH0, _VLV_PCS01_DW8_CH1) +#define VLV_PCS23_DW8 (port) _PORT(port, _VLV_PCS23_DW8_CH0, _VLV_PCS23_DW8_CH1) + +#define _VLV_PCS_DW9_CH0 0x8224 +#define _VLV_PCS_DW9_CH1 0x8424 +#define VLV_PCS_DW9 (ch) _PORT(ch, _VLV_PCS_DW9_CH0, _VLV_PCS_DW9_CH1) + +#define _VLV_PCS_DW11_CH0 0x822c +#define _VLV_PCS_DW11_CH1 0x842c +#define VLV_PCS_DW11 (ch) _PORT(ch, _VLV_PCS_DW11_CH0, _VLV_PCS_DW11_CH1) + +#define _VLV_PCS_DW12_CH0 0x8230 +#define _VLV_PCS_DW12_CH1 0x8430 +#define VLV_PCS_DW12 (ch) _PORT(ch, _VLV_PCS_DW12_CH0, _VLV_PCS_DW12_CH1) + +#define _VLV_PCS_DW14_CH0 0x8238 +#define _VLV_PCS_DW14_CH1 0x8438 +#define VLV_PCS_DW14 (ch) _PORT(ch, _VLV_PCS_DW14_CH0, _VLV_PCS_DW14_CH1) + +#define _VLV_PCS_DW23_CH0 0x825c +#define _VLV_PCS_DW23_CH1 0x845c +#define VLV_PCS_DW23 (ch) _PORT(ch, _VLV_PCS_DW23_CH0, _VLV_PCS_DW23_CH1) + +#define _VLV_TX_DW2_CH0 0x8288 +#define _VLV_TX_DW2_CH1 0x8488 +#define VLV_TX_DW2 (ch) _PORT(ch, _VLV_TX_DW2_CH0, _VLV_TX_DW2_CH1) + +#define _VLV_TX_DW3_CH0 0x828c +#define _VLV_TX_DW3_CH1 0x848c +#define VLV_TX_DW3 (ch) _PORT(ch, _VLV_TX_DW3_CH0, _VLV_TX_DW3_CH1) + +#define _VLV_TX_DW4_CH0 0x8290 +#define _VLV_TX_DW4_CH1 0x8490 +#define VLV_TX_DW4 (ch) _PORT(ch, _VLV_TX_DW4_CH0, _VLV_TX_DW4_CH1) + +#define _VLV_TX3_DW4_CH0 0x690 +#define _VLV_TX3_DW4_CH1 0x2a90 +#define VLV_TX3_DW4 (ch) _PORT(ch, _VLV_TX3_DW4_CH0, _VLV_TX3_DW4_CH1) + +#define _VLV_TX_DW5_CH0 0x8294 +#define _VLV_TX_DW5_CH1 0x8494#define DPIO_TX_OCALINIT_EN (1<<31) -#define DPIO_TX_OCALINIT (port) _PORT(port, _DPIO_TX_OCALINIT_0, \ - _DPIO_TX_OCALINIT_1) - -#define _DPIO_TX_CTL_0 0x82ac -#define _DPIO_TX_CTL_1 0x84ac -#define DPIO_TX_CTL (port) _PORT(port, _DPIO_TX_CTL_0, _DPIO_TX_CTL_1) - -#define _DPIO_TX_LANE_0 0x82b8 -#define _DPIO_TX_LANE_1 0x84b8 -#define DPIO_TX_LANE (port) _PORT(port, _DPIO_TX_LANE_0, _DPIO_TX_LANE_1) - -#define _DPIO_DATA_CHANNEL1 0x8220 -#define _DPIO_DATA_CHANNEL2 0x8420 -#define DPIO_DATA_CHANNEL (port) _PORT(port, _DPIO_DATA_CHANNEL1, _DPIO_DATA_CHANNEL2) - -#define _DPIO_PORT0_PCS0 0x0220 -#define _DPIO_PORT0_PCS1 0x0420 -#define _DPIO_PORT1_PCS2 0x2620 -#define _DPIO_PORT1_PCS3 0x2820 -#define DPIO_DATA_LANE_A (port) _PORT(port, _DPIO_PORT0_PCS0, _DPIO_PORT1_PCS2) -#define DPIO_DATA_LANE_B (port) _PORT(port, _DPIO_PORT0_PCS1, _DPIO_PORT1_PCS3) -#define DPIO_DATA_CHANNEL1 0x8220 -#define DPIO_DATA_CHANNEL2 0x8420 +#define VLV_TX_DW5 (ch) _PORT(ch, _VLV_TX_DW5_CH0, _VLV_TX_DW5_CH1) + +#define _VLV_TX_DW11_CH0 0x82ac +#define _VLV_TX_DW11_CH1 0x84ac +#define VLV_TX_DW11 (ch) _PORT(ch, _VLV_TX_DW11_CH0, _VLV_TX_DW11_CH1) + +#define _VLV_TX_DW14_CH0 0x82b8 +#define _VLV_TX_DW14_CH1 0x84b8 +#define VLV_TX_DW14 (ch) _PORT(ch, _VLV_TX_DW14_CH0, _VLV_TX_DW14_CH1)/* * Fence registers drivers/gpu/drm/i915/intel_display.c +24
-24@@ -4794,24 +4794,24 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipe* PLLB opamp always calibrates to max value of 0x3f, force enable it * and set it to a reasonable value instead. */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW11 (1 )); reg_val &=0xffffff00 ; reg_val |=0x00000030 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW11 ); reg_val &=0x8cffffff ; reg_val =0x8c000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW11 , reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW11 (1 )); reg_val &=0xffffff00 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW11 ); reg_val &=0x00ffffff ; reg_val |=0xb0000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW11 , reg_val); } static void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,@@ -4880,15 +4880,15 @@ static void vlv_update_pll(struct intel_crtc *crtc)vlv_pllb_recal_opamp (dev_priv, pipe);/* Set up Tx target for periodic Rcomp update */ -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_BCAST ,0x0100000f ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11_BCAST ,0x0100000f );/* Disable target IRef on PLL */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF_CTL (pipe)); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW10 (pipe)); reg_val &=0x00ffffff ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_CTL (pipe), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe), reg_val);/* Disable fast lock */ -vlv_dpio_write (dev_priv, pipe,DPIO_FASTCLK_DISABLE ,0x610 ); +vlv_dpio_write (dev_priv, pipe,VLV_CMN_DW0 ,0x610 );/* Set idtafcrecal before PLL is enabled */ mdiv = ((bestm1 <<DPIO_M1DIV_SHIFT ) | (bestm2 &DPIO_M2DIV_MASK ));@@ -4902,48 +4902,48 @@ static void vlv_update_pll(struct intel_crtc *crtc)* Note: don't use the DAC post divider as it seems unstable. */ mdiv |= (DPIO_POST_DIV_HDMIDP <<DPIO_POST_DIV_SHIFT ); -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv); mdiv |=DPIO_ENABLE_CALIBRATION ; -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv);/* 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 )) -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW12 (pipe),0x009f0003 );else -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW12 (pipe),0x00d0000f );if (intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_EDP ) ||intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_DISPLAYPORT )) {/* Use SSC source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 ); }else {/* HDMI or VGA */ /* Use bend source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 ); } - coreclk =vlv_dpio_read (dev_priv, pipe,DPIO_CORE_CLK (pipe)); + 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 )) coreclk |=0x01000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CORE_CLK (pipe), coreclk); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW7 (pipe), coreclk); -vlv_dpio_write (dev_priv, pipe,DPIO_PLL_CML (pipe),0x87871000 ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW13 (pipe),0x87871000 );/* Enable DPIO clock input */ dpll = DPLL_EXT_BUFFER_ENABLE_VLV | DPLL_REFA_CLK_ENABLE_VLV |@@ -5421,7 +5421,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,int refclk =100000 ;mutex_lock (&dev_priv->dpio_lock); - mdiv =vlv_dpio_read (dev_priv, pipe,DPIO_DIV (pipe)); + mdiv =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW3 (pipe));mutex_unlock (&dev_priv->dpio_lock); clock.m1 = (mdiv >>DPIO_M1DIV_SHIFT ) &7 ;drivers/gpu/drm/i915/intel_dp.c +16
-16@@ -1846,16 +1846,16 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);@@ -1881,19 +1881,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }@@ -2110,14 +2110,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;drivers/gpu/drm/i915/intel_hdmi.c +22
-32@@ -1090,36 +1090,28 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Enable clock channels for this port */ mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val);/* HDMI 1.0V-2dB */ -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), -0x2b245f5f ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), -0x5578b83a ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port), -0x0c782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX3_SWING_CTL4 (port), -0x2b247878 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port),0x2b245f5f ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port),0x5578b83a ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0c782040 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX3_DW4 (port),0x2b247878 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); +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 );/* Program lane clock */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port), -0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port), -0x00400888 ); +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);intel_enable_hdmi (encoder);@@ -1142,24 +1134,22 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); - -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +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 ); + +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); }@@ -1174,8 +1164,8 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)/* Reset lanes to avoid HDMI flicker (VLV w/a) */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port),0x00e00060 ); +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); }Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 2/2] drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Quoted 12 lines · Chon Ming
Quoted 10 lines · Ville Syrjälä
drivers/gpu/drm/i915/i915_reg.h line 494
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +3
-3-#define _DPIO_IREF_CTL_A 0x8040 -#define _DPIO_IREF_CTL_B 0x8060 -#define DPIO_IREF_CTL (pipe) _PIPE(pipe, _DPIO_IREF_CTL_A, _DPIO_IREF_CTL_B) +#define _VLV_PLL_DW10_CH0 0x8040 +#define _VLV_PLL_DW10_CH1 0x8060 +#define VLV_PLL_DW10 (ch) _PIPE(ch, _VLV_PLL_DW10_CH0, _VLV_PLL_DW10_CH1)Configdb starts counting from DW8 at 0x8040/60, which kind of make sense since the first PLL block ends at DW7.
Quoted 3 lines
The spreadsheet I refer to is using DW10. The spreadsheet might be incorrect. Looking at the register offset, it won't be anymore space left after first PLL block. Make sense for DW8 for second PLL block.
The spreadsheet is a bit weird. I was just looking at the web configdb. That at least has some sense in the offsets (apart from the ref block). The spreadsheet also uses hex numbers to count the dwords, which doesn't match what you've done for the > 8 numbers. So I'd go with the web configdb numbers since they're a bit more consistent.
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH v3 2/2 drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
In reply to Chon Ming LeeSome VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0 - Group access to PCS for lane 0 to 3 for PCS DWORD 0. VLV_PCS01_DW0_CH0 - PCS access to lane 0/1, channel 0 for PCS DWORD 0.
Another example is
VLV_TX_DW0 - Group access to TX lane 0 to 3 for TX DWORD 0 VLV_TX0_DW0 - Refer to TX Lane 0 access only for TX DWORD 0.
There is no functional change on this patch.
v2: Rebase based on previous patch change.
v3: There may be configdb different version that document the start DW differently. Add a comment to clarify. Fix up some mismatch start DW for second PLL block. (Ville)
--- drivers/gpu/drm/i915/i915_debugfs.c | 40 ++++---- drivers/gpu/drm/i915/i915_reg.h | 191 ++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 48 ++++---- drivers/gpu/drm/i915/intel_dp.c | 32 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 54 ++++------ 5 files changed, 172 insertions(+), 193 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +20 -20
@@ -1650,28 +1650,28 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CTL: 0x%08x\n" ,I915_READ (DPIO_CTL )); -seq_printf (m,"DPIO_DIV_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_A)); -seq_printf (m,"DPIO_DIV_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_B)); - -seq_printf (m,"DPIO_REFSFR_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_A)); -seq_printf (m,"DPIO_REFSFR_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_B)); - -seq_printf (m,"DPIO_CORE_CLK_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_A)); -seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_B)); - -seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_A)); -seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_B)); +seq_printf (m,"DPIO PLL DW3 CH0 : 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (0 ))); +seq_printf (m,"DPIO PLL DW3 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (1 ))); + +seq_printf (m,"DPIO PLL DW5 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (0 ))); +seq_printf (m,"DPIO PLL DW5 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (1 ))); + +seq_printf (m,"DPIO PLL DW7 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (0 ))); +seq_printf (m,"DPIO PLL DW7 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (1 ))); + +seq_printf (m,"DPIO PLL DW10 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW10 (0 ))); +seq_printf (m,"DPIO PLL DW10 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW10 (1 )));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A ,DPIO_FASTCLK_DISABLE )); +vlv_dpio_read (dev_priv,PIPE_A ,VLV_CMN_DW0 ));mutex_unlock (&dev_priv->dpio_lock);
drivers/gpu/drm/i915/i915_reg.h +90 -101
236 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +24 -24
118 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +16 -16
@@ -1846,16 +1846,16 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);
@@ -1881,19 +1881,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }
@@ -2110,14 +2110,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;
drivers/gpu/drm/i915/intel_hdmi.c +22 -32
90 lines not on this page · raw message
Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/2] drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Quoted 24 lines · Chon Ming Lee
Some VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0- Group access to PCS for lane 0 to 3 for PCS DWORD 0.VLV_PCS01_DW0_CH0- PCS access to lane 0/1, channel 0 for PCS DWORD 0.Another example is
VLV_TX_DW0- Group access to TX lane 0 to 3 for TX DWORD 0VLV_TX0_DW0- Refer to TX Lane 0 access only for TX DWORD 0.There is no functional change on this patch.
Quoted 7 lines
v2: Rebase based on previous patch change.
v3: There may be configdb different version that document the start DW differently. Add a comment to clarify. Fix up some mismatch start DW for second PLL block. (Ville)Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>
Yeah looks good to me.
Quoted 606 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 40 ++++---- drivers/gpu/drm/i915/i915_reg.h | 191 ++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 48 ++++---- drivers/gpu/drm/i915/intel_dp.c | 32 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 54 ++++------ 5 files changed, 172 insertions(+), 193 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +20
-20@@ -1650,28 +1650,28 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CTL: 0x%08x\n" ,I915_READ (DPIO_CTL )); -seq_printf (m,"DPIO_DIV_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_A)); -seq_printf (m,"DPIO_DIV_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_DIV_B)); - -seq_printf (m,"DPIO_REFSFR_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_A)); -seq_printf (m,"DPIO_REFSFR_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_REFSFR_B)); - -seq_printf (m,"DPIO_CORE_CLK_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_A)); -seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_CORE_CLK_B)); - -seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_A)); -seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A , _DPIO_LPF_COEFF_B)); +seq_printf (m,"DPIO PLL DW3 CH0 : 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (0 ))); +seq_printf (m,"DPIO PLL DW3 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW3 (1 ))); + +seq_printf (m,"DPIO PLL DW5 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (0 ))); +seq_printf (m,"DPIO PLL DW5 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW5 (1 ))); + +seq_printf (m,"DPIO PLL DW7 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (0 ))); +seq_printf (m,"DPIO PLL DW7 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW7 (1 ))); + +seq_printf (m,"DPIO PLL DW10 CH0: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW10 (0 ))); +seq_printf (m,"DPIO PLL DW10 CH1: 0x%08x\n" , +vlv_dpio_read (dev_priv,PIPE_A ,VLV_PLL_DW10 (1 )));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" , -vlv_dpio_read (dev_priv,PIPE_A ,DPIO_FASTCLK_DISABLE )); +vlv_dpio_read (dev_priv,PIPE_A ,VLV_CMN_DW0 ));mutex_unlock (&dev_priv->dpio_lock);drivers/gpu/drm/i915/i915_reg.h +90
-101@@ -452,18 +452,13 @@#define DPIO_SFR_BYPASS (1<<1)#define DPIO_CMNRST (1<<0) -#define _DPIO_TX3_SWING_CTL4_A 0x690 -#define _DPIO_TX3_SWING_CTL4_B 0x2a90 -#define DPIO_TX3_SWING_CTL4 (pipe) _PIPE(pipe, _DPIO_TX3_SWING_CTL4_A, \ - _DPIO_TX3_SWING_CTL4_B) -#define DPIO_PHY (pipe) ((pipe) >> 1)#define DPIO_PHY_IOSF_PORT (phy) (dev_priv->dpio_phy_iosf_port[phy])/* * Per pipe/PLL DPIO regs */ -#define _DPIO_DIV_A 0x800c +#define _VLV_PLL_DW3_CH0 0x800c#define DPIO_POST_DIV_SHIFT (28)/* 3 bits */ #define DPIO_POST_DIV_DAC 0#define DPIO_POST_DIV_HDMIDP 1/* DAC 225-400M rate */ @@ -476,10 +471,10 @@#define DPIO_ENABLE_CALIBRATION (1<<11)#define DPIO_M1DIV_SHIFT (8)/* 3 bits */ #define DPIO_M2DIV_MASK 0xff -#define _DPIO_DIV_B 0x802c -#define DPIO_DIV (pipe) _PIPE(pipe, _DPIO_DIV_A, _DPIO_DIV_B) +#define _VLV_PLL_DW3_CH1 0x802c +#define VLV_PLL_DW3 (ch) _PIPE(ch, _VLV_PLL_DW3_CH0, _VLV_PLL_DW3_CH1) -#define _DPIO_REFSFR_A 0x8014 +#define _VLV_PLL_DW5_CH0 0x8014#define DPIO_REFSEL_OVERRIDE 27#define DPIO_PLL_MODESEL_SHIFT 24/* 3 bits */ #define DPIO_BIAS_CURRENT_CTL_SHIFT 21/* 3 bits, always 0x7 */ @@ -487,118 +482,112 @@#define DPIO_PLL_REFCLK_SEL_MASK 3#define DPIO_DRIVER_CTL_SHIFT 12/* always set to 0x8 */ #define DPIO_CLK_BIAS_CTL_SHIFT 8/* always set to 0x5 */ -#define _DPIO_REFSFR_B 0x8034 -#define DPIO_REFSFR (pipe) _PIPE(pipe, _DPIO_REFSFR_A, _DPIO_REFSFR_B) +#define _VLV_PLL_DW5_CH1 0x8034 +#define VLV_PLL_DW5 (ch) _PIPE(ch, _VLV_PLL_DW5_CH0, _VLV_PLL_DW5_CH1) -#define _DPIO_CORE_CLK_A 0x801c -#define _DPIO_CORE_CLK_B 0x803c -#define DPIO_CORE_CLK (pipe) _PIPE(pipe, _DPIO_CORE_CLK_A, _DPIO_CORE_CLK_B) +#define _VLV_PLL_DW7_CH0 0x801c +#define _VLV_PLL_DW7_CH1 0x803c +#define VLV_PLL_DW7 (ch) _PIPE(ch, _VLV_PLL_DW7_CH0, _VLV_PLL_DW7_CH1) -#define _DPIO_IREF_CTL_A 0x8040 -#define _DPIO_IREF_CTL_B 0x8060 -#define DPIO_IREF_CTL (pipe) _PIPE(pipe, _DPIO_IREF_CTL_A, _DPIO_IREF_CTL_B) +#define _VLV_PLL_DW8_CH0 0x8040 +#define _VLV_PLL_DW8_CH1 0x8060 +#define VLV_PLL_DW8 (ch) _PIPE(ch, _VLV_PLL_DW8_CH0, _VLV_PLL_DW8_CH1) -#define DPIO_IREF_BCAST 0xc044 -#define _DPIO_IREF_A 0x8044 -#define _DPIO_IREF_B 0x8064 -#define DPIO_IREF (pipe) _PIPE(pipe, _DPIO_IREF_A, _DPIO_IREF_B) +#define VLV_PLL_DW9_BCAST 0xc044 +#define _VLV_PLL_DW9_CH0 0x8044 +#define _VLV_PLL_DW9_CH1 0x8064 +#define VLV_PLL_DW9 (ch) _PIPE(ch, _VLV_PLL_DW9_CH0, _VLV_PLL_DW9_CH1) -#define _DPIO_PLL_CML_A 0x804c -#define _DPIO_PLL_CML_B 0x806c -#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) +#define _VLV_PLL_DW10_CH0 0x8048 +#define _VLV_PLL_DW10_CH1 0x8068 +#define VLV_PLL_DW10 (ch) _PIPE(ch, _VLV_PLL_DW10_CH0, _VLV_PLL_DW10_CH1) -#define _DPIO_LPF_COEFF_A 0x8048 -#define _DPIO_LPF_COEFF_B 0x8068 -#define DPIO_LPF_COEFF (pipe) _PIPE(pipe, _DPIO_LPF_COEFF_A, _DPIO_LPF_COEFF_B) +#define _VLV_PLL_DW11_CH0 0x804c +#define _VLV_PLL_DW11_CH1 0x806c +#define VLV_PLL_DW11 (ch) _PIPE(ch, _VLV_PLL_DW11_CH0, _VLV_PLL_DW11_CH1) -#define DPIO_CALIBRATION 0x80ac +/* Spec for ref block start counts at DW10 */ +#define VLV_REF_DW13 0x80ac -#define DPIO_FASTCLK_DISABLE 0x8100 +#define VLV_CMN_DW0 0x8100/* * Per DDI channel DPIO regs */ -#define _DPIO_PCS_TX_0 0x8200 -#define _DPIO_PCS_TX_1 0x8400 +#define _VLV_PCS_DW0_CH0 0x8200 +#define _VLV_PCS_DW0_CH1 0x8400#define DPIO_PCS_TX_LANE2_RESET (1<<16)#define DPIO_PCS_TX_LANE1_RESET (1<<7) -#define DPIO_PCS_TX (port) _PORT(port, _DPIO_PCS_TX_0, _DPIO_PCS_TX_1) +#define VLV_PCS_DW0 (ch) _PORT(ch, _VLV_PCS_DW0_CH0, _VLV_PCS_DW0_CH1) -#define _DPIO_PCS_CLK_0 0x8204 -#define _DPIO_PCS_CLK_1 0x8404 +#define _VLV_PCS_DW1_CH0 0x8204 +#define _VLV_PCS_DW1_CH1 0x8404#define DPIO_PCS_CLK_CRI_RXEB_EIOS_EN (1<<22)#define DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN (1<<21)#define DPIO_PCS_CLK_DATAWIDTH_SHIFT (6)#define DPIO_PCS_CLK_SOFT_RESET (1<<5) -#define DPIO_PCS_CLK (port) _PORT(port, _DPIO_PCS_CLK_0, _DPIO_PCS_CLK_1) - -#define _DPIO_PCS_CTL_OVR1_A 0x8224 -#define _DPIO_PCS_CTL_OVR1_B 0x8424 -#define DPIO_PCS_CTL_OVER1 (port) _PORT(port, _DPIO_PCS_CTL_OVR1_A, \ - _DPIO_PCS_CTL_OVR1_B) - -#define _DPIO_PCS_STAGGER0_A 0x822c -#define _DPIO_PCS_STAGGER0_B 0x842c -#define DPIO_PCS_STAGGER0 (port) _PORT(port, _DPIO_PCS_STAGGER0_A, \ - _DPIO_PCS_STAGGER0_B) - -#define _DPIO_PCS_STAGGER1_A 0x8230 -#define _DPIO_PCS_STAGGER1_B 0x8430 -#define DPIO_PCS_STAGGER1 (port) _PORT(port, _DPIO_PCS_STAGGER1_A, \ - _DPIO_PCS_STAGGER1_B) - -#define _DPIO_PCS_CLOCKBUF0_A 0x8238 -#define _DPIO_PCS_CLOCKBUF0_B 0x8438 -#define DPIO_PCS_CLOCKBUF0 (port) _PORT(port, _DPIO_PCS_CLOCKBUF0_A, \ - _DPIO_PCS_CLOCKBUF0_B) - -#define _DPIO_PCS_CLOCKBUF8_A 0x825c -#define _DPIO_PCS_CLOCKBUF8_B 0x845c -#define DPIO_PCS_CLOCKBUF8 (port) _PORT(port, _DPIO_PCS_CLOCKBUF8_A, \ - _DPIO_PCS_CLOCKBUF8_B) - -#define _DPIO_TX_SWING_CTL2_A 0x8288 -#define _DPIO_TX_SWING_CTL2_B 0x8488 -#define DPIO_TX_SWING_CTL2 (port) _PORT(port, _DPIO_TX_SWING_CTL2_A, \ - _DPIO_TX_SWING_CTL2_B) - -#define _DPIO_TX_SWING_CTL3_A 0x828c -#define _DPIO_TX_SWING_CTL3_B 0x848c -#define DPIO_TX_SWING_CTL3 (port) _PORT(port, _DPIO_TX_SWING_CTL3_A, \ - _DPIO_TX_SWING_CTL3_B) - -#define _DPIO_TX_SWING_CTL4_A 0x8290 -#define _DPIO_TX_SWING_CTL4_B 0x8490 -#define DPIO_TX_SWING_CTL4 (port) _PORT(port, _DPIO_TX_SWING_CTL4_A, \ - _DPIO_TX_SWING_CTL4_B) - -#define _DPIO_TX_OCALINIT_0 0x8294 -#define _DPIO_TX_OCALINIT_1 0x8494 +#define VLV_PCS_DW1 (ch) _PORT(ch, _VLV_PCS_DW1_CH0, _VLV_PCS_DW1_CH1) + +#define _VLV_PCS_DW8_CH0 0x8220 +#define _VLV_PCS_DW8_CH1 0x8420 +#define VLV_PCS_DW8 (ch) _PORT(ch, _VLV_PCS_DW8_CH0, _VLV_PCS_DW8_CH1) + +#define _VLV_PCS01_DW8_CH0 0x0220 +#define _VLV_PCS23_DW8_CH0 0x0420 +#define _VLV_PCS01_DW8_CH1 0x2620 +#define _VLV_PCS23_DW8_CH1 0x2820 +#define VLV_PCS01_DW8 (port) _PORT(port, _VLV_PCS01_DW8_CH0, _VLV_PCS01_DW8_CH1) +#define VLV_PCS23_DW8 (port) _PORT(port, _VLV_PCS23_DW8_CH0, _VLV_PCS23_DW8_CH1) + +#define _VLV_PCS_DW9_CH0 0x8224 +#define _VLV_PCS_DW9_CH1 0x8424 +#define VLV_PCS_DW9 (ch) _PORT(ch, _VLV_PCS_DW9_CH0, _VLV_PCS_DW9_CH1) + +#define _VLV_PCS_DW11_CH0 0x822c +#define _VLV_PCS_DW11_CH1 0x842c +#define VLV_PCS_DW11 (ch) _PORT(ch, _VLV_PCS_DW11_CH0, _VLV_PCS_DW11_CH1) + +#define _VLV_PCS_DW12_CH0 0x8230 +#define _VLV_PCS_DW12_CH1 0x8430 +#define VLV_PCS_DW12 (ch) _PORT(ch, _VLV_PCS_DW12_CH0, _VLV_PCS_DW12_CH1) + +#define _VLV_PCS_DW14_CH0 0x8238 +#define _VLV_PCS_DW14_CH1 0x8438 +#define VLV_PCS_DW14 (ch) _PORT(ch, _VLV_PCS_DW14_CH0, _VLV_PCS_DW14_CH1) + +#define _VLV_PCS_DW23_CH0 0x825c +#define _VLV_PCS_DW23_CH1 0x845c +#define VLV_PCS_DW23 (ch) _PORT(ch, _VLV_PCS_DW23_CH0, _VLV_PCS_DW23_CH1) + +#define _VLV_TX_DW2_CH0 0x8288 +#define _VLV_TX_DW2_CH1 0x8488 +#define VLV_TX_DW2 (ch) _PORT(ch, _VLV_TX_DW2_CH0, _VLV_TX_DW2_CH1) + +#define _VLV_TX_DW3_CH0 0x828c +#define _VLV_TX_DW3_CH1 0x848c +#define VLV_TX_DW3 (ch) _PORT(ch, _VLV_TX_DW3_CH0, _VLV_TX_DW3_CH1) + +#define _VLV_TX_DW4_CH0 0x8290 +#define _VLV_TX_DW4_CH1 0x8490 +#define VLV_TX_DW4 (ch) _PORT(ch, _VLV_TX_DW4_CH0, _VLV_TX_DW4_CH1) + +#define _VLV_TX3_DW4_CH0 0x690 +#define _VLV_TX3_DW4_CH1 0x2a90 +#define VLV_TX3_DW4 (ch) _PORT(ch, _VLV_TX3_DW4_CH0, _VLV_TX3_DW4_CH1) + +#define _VLV_TX_DW5_CH0 0x8294 +#define _VLV_TX_DW5_CH1 0x8494#define DPIO_TX_OCALINIT_EN (1<<31) -#define DPIO_TX_OCALINIT (port) _PORT(port, _DPIO_TX_OCALINIT_0, \ - _DPIO_TX_OCALINIT_1) - -#define _DPIO_TX_CTL_0 0x82ac -#define _DPIO_TX_CTL_1 0x84ac -#define DPIO_TX_CTL (port) _PORT(port, _DPIO_TX_CTL_0, _DPIO_TX_CTL_1) - -#define _DPIO_TX_LANE_0 0x82b8 -#define _DPIO_TX_LANE_1 0x84b8 -#define DPIO_TX_LANE (port) _PORT(port, _DPIO_TX_LANE_0, _DPIO_TX_LANE_1) - -#define _DPIO_DATA_CHANNEL1 0x8220 -#define _DPIO_DATA_CHANNEL2 0x8420 -#define DPIO_DATA_CHANNEL (port) _PORT(port, _DPIO_DATA_CHANNEL1, _DPIO_DATA_CHANNEL2) - -#define _DPIO_PORT0_PCS0 0x0220 -#define _DPIO_PORT0_PCS1 0x0420 -#define _DPIO_PORT1_PCS2 0x2620 -#define _DPIO_PORT1_PCS3 0x2820 -#define DPIO_DATA_LANE_A (port) _PORT(port, _DPIO_PORT0_PCS0, _DPIO_PORT1_PCS2) -#define DPIO_DATA_LANE_B (port) _PORT(port, _DPIO_PORT0_PCS1, _DPIO_PORT1_PCS3) -#define DPIO_DATA_CHANNEL1 0x8220 -#define DPIO_DATA_CHANNEL2 0x8420 +#define VLV_TX_DW5 (ch) _PORT(ch, _VLV_TX_DW5_CH0, _VLV_TX_DW5_CH1) + +#define _VLV_TX_DW11_CH0 0x82ac +#define _VLV_TX_DW11_CH1 0x84ac +#define VLV_TX_DW11 (ch) _PORT(ch, _VLV_TX_DW11_CH0, _VLV_TX_DW11_CH1) + +#define _VLV_TX_DW14_CH0 0x82b8 +#define _VLV_TX_DW14_CH1 0x84b8 +#define VLV_TX_DW14 (ch) _PORT(ch, _VLV_TX_DW14_CH0, _VLV_TX_DW14_CH1)/* * Fence registers drivers/gpu/drm/i915/intel_display.c +24
-24@@ -4794,24 +4794,24 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipe* PLLB opamp always calibrates to max value of 0x3f, force enable it * and set it to a reasonable value instead. */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW9 (1 )); reg_val &=0xffffff00 ; reg_val |=0x00000030 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW13 ); reg_val &=0x8cffffff ; reg_val =0x8c000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW13 , reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF (1 )); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW9 (1 )); reg_val &=0xffffff00 ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF (1 ), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9 (1 ), reg_val); - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_CALIBRATION ); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW13 ); reg_val &=0x00ffffff ; reg_val |=0xb0000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CALIBRATION , reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_REF_DW13 , reg_val); } static void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,@@ -4880,15 +4880,15 @@ static void vlv_update_pll(struct intel_crtc *crtc)vlv_pllb_recal_opamp (dev_priv, pipe);/* Set up Tx target for periodic Rcomp update */ -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_BCAST ,0x0100000f ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9_BCAST ,0x0100000f );/* Disable target IRef on PLL */ - reg_val =vlv_dpio_read (dev_priv, pipe,DPIO_IREF_CTL (pipe)); + reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW8 (pipe)); reg_val &=0x00ffffff ; -vlv_dpio_write (dev_priv, pipe,DPIO_IREF_CTL (pipe), reg_val); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW8 (pipe), reg_val);/* Disable fast lock */ -vlv_dpio_write (dev_priv, pipe,DPIO_FASTCLK_DISABLE ,0x610 ); +vlv_dpio_write (dev_priv, pipe,VLV_CMN_DW0 ,0x610 );/* Set idtafcrecal before PLL is enabled */ mdiv = ((bestm1 <<DPIO_M1DIV_SHIFT ) | (bestm2 &DPIO_M2DIV_MASK ));@@ -4902,48 +4902,48 @@ static void vlv_update_pll(struct intel_crtc *crtc)* Note: don't use the DAC post divider as it seems unstable. */ mdiv |= (DPIO_POST_DIV_HDMIDP <<DPIO_POST_DIV_SHIFT ); -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv); mdiv |=DPIO_ENABLE_CALIBRATION ; -vlv_dpio_write (dev_priv, pipe,DPIO_DIV (pipe), mdiv); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv);/* 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 )) -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe),0x009f0003 );else -vlv_dpio_write (dev_priv, pipe,DPIO_LPF_COEFF (pipe), +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 )) {/* Use SSC source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 ); }else {/* HDMI or VGA */ /* Use bend source */ if (!pipe) -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df70000 );else -vlv_dpio_write (dev_priv, pipe,DPIO_REFSFR (pipe), +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe),0x0df40000 ); } - coreclk =vlv_dpio_read (dev_priv, pipe,DPIO_CORE_CLK (pipe)); + 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 )) coreclk |=0x01000000 ; -vlv_dpio_write (dev_priv, pipe,DPIO_CORE_CLK (pipe), coreclk); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW7 (pipe), coreclk); -vlv_dpio_write (dev_priv, pipe,DPIO_PLL_CML (pipe),0x87871000 ); +vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (pipe),0x87871000 );/* Enable DPIO clock input */ dpll = DPLL_EXT_BUFFER_ENABLE_VLV | DPLL_REFA_CLK_ENABLE_VLV |@@ -5421,7 +5421,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,int refclk =100000 ;mutex_lock (&dev_priv->dpio_lock); - mdiv =vlv_dpio_read (dev_priv, pipe,DPIO_DIV (pipe)); + mdiv =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW3 (pipe));mutex_unlock (&dev_priv->dpio_lock); clock.m1 = (mdiv >>DPIO_M1DIV_SHIFT ) &7 ;drivers/gpu/drm/i915/intel_dp.c +16
-16@@ -1846,16 +1846,16 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port),0x00400888 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); +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);@@ -1881,19 +1881,19 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); +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); }@@ -2110,14 +2110,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp) }mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), +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), uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0x80000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); +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);return 0 ;drivers/gpu/drm/i915/intel_hdmi.c +22
-32@@ -1090,36 +1090,28 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)/* Enable clock channels for this port */ mutex_lock (&dev_priv->dpio_lock); - val =vlv_dpio_read (dev_priv, pipe,DPIO_DATA_LANE_A (port)); + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); val =0 ;if (pipe) val |= (1 <<21 );else val &= ~(1 <<21 ); val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,DPIO_DATA_CHANNEL (port), val); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val);/* HDMI 1.0V-2dB */ -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port),0 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL4 (port), -0x2b245f5f ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL2 (port), -0x5578b83a ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_SWING_CTL3 (port), -0x0c782040 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX3_SWING_CTL4 (port), -0x2b247878 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER0 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port),0x2b245f5f ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port),0x5578b83a ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0c782040 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX3_DW4 (port),0x2b247878 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); +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 );/* Program lane clock */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF0 (port), -0x00760018 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLOCKBUF8 (port), -0x00400888 ); +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);intel_enable_hdmi (encoder);@@ -1142,24 +1134,22 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder)/* Program Tx lane resets to default */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),DPIO_PCS_TX_LANE2_RESET |DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port), +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) |DPIO_PCS_CLK_SOFT_RESET );/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_STAGGER1 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_CTL (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_LANE (port),0x40400000 ); - -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CTL_OVER1 (port), -0x00002000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_TX_OCALINIT (port), -DPIO_TX_OCALINIT_EN ); +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 ); + +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); }@@ -1174,8 +1164,8 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder)/* Reset lanes to avoid HDMI flicker (VLV w/a) */ mutex_lock (&dev_priv->dpio_lock); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_TX (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,DPIO_PCS_CLK (port),0x00e00060 ); +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); }Signature · 6 lines
1.7.7.6 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Daniel Vetter
AppliedRe: [PATCH v3 2/2] drm/i915/vlv: Rename VLV DPIO register to be more structure to match configdb document.
Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Chon Ming Lee
Some VLV PHY/PLL DPIO registers have group/lane/channel access. Current DPIO register definition doesn't have a structure way to break them down. As a result it is not easy to match the PHY/PLL registers with the configdb document. Rename those registers based on the configdb for easy cross references, and without the need to check the offset in the header file.
New format is as following.
<platform name>_<DPIO component><optional lane #>_DW<dword # in the doc>_<optional channel #>
For example,
VLV_PCS_DW0- Group access to PCS for lane 0 to 3 for PCS DWORD 0.VLV_PCS01_DW0_CH0- PCS access to lane 0/1, channel 0 for PCS DWORD 0.Another example is
VLV_TX_DW0- Group access to TX lane 0 to 3 for TX DWORD 0VLV_TX0_DW0- Refer to TX Lane 0 access only for TX DWORD 0.There is no functional change on this patch.
v2: Rebase based on previous patch change.
v3: There may be configdb different version that document the start DW differently. Add a comment to clarify. Fix up some mismatch start DW for second PLL block. (Ville)
Quoted 5 lines
Quoted 2 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Chon Ming Lee <[email protected]>Yeah looks good to me.
Reviewed-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch