drm/i915: Fix VLV PLL LPF coefficients for DAC
Subsystems (2)
PATCH v2 1/2 drm/i915: Fix VLV PLL LPF coefficients for DAC
From: Ville Syrjälä <[email protected]>
The current PLL settings produce a rather unstable picture when I hook up a VLV to my HP ZR24w display via a VGA cable.
According to VLV2A0_DP_eDP_HDMI_DPIO_driver_vbios_notes_9, we should use the the same LPF coefficients for DAC as we do for HDMI and RBR DP. And indeed that seems to cure the shivers.
v2: Add the name of the relevant document to the commit message
--- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -4405,6 +4405,7 @@ static void vlv_update_pll(struct intel_crtc *crtc)/* Set HBR and RBR LPF coefficients */ if (crtc->config.port_clock ==162000 || +intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_ANALOG ) ||intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI ))vlv_dpio_write (dev_priv,DPIO_LFP_COEFF (pipe),0x005f0021 );
Signature · 6 lines
1.8.1.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: s/LFP/LPF in DPIO PLL register names
From: Ville Syrjälä <[email protected]>
LPF is short for "low pass filter".
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 6 +++--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -1862,10 +1862,10 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" ,vlv_dpio_read (dev_priv, _DPIO_CORE_CLK_B)); -seq_printf (m,"DPIO_LFP_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_A)); -seq_printf (m,"DPIO_LFP_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_B)); +seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_A)); +seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_B));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" ,vlv_dpio_read (dev_priv,DPIO_FASTCLK_DISABLE ));
drivers/gpu/drm/i915/i915_reg.h +3 -3
@@ -448,9 +448,9 @@#define _DPIO_PLL_CML_B 0x806c#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) -#define _DPIO_LFP_COEFF_A 0x8048 -#define _DPIO_LFP_COEFF_B 0x8068 -#define DPIO_LFP_COEFF (pipe) _PIPE(pipe, _DPIO_LFP_COEFF_A, _DPIO_LFP_COEFF_B) +#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 DPIO_CALIBRATION 0x80ac
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -4407,10 +4407,10 @@ static void vlv_update_pll(struct intel_crtc *crtc)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,DPIO_LFP_COEFF (pipe), +vlv_dpio_write (dev_priv,DPIO_LPF_COEFF (pipe),0x005f0021 );else -vlv_dpio_write (dev_priv,DPIO_LFP_COEFF (pipe), +vlv_dpio_write (dev_priv,DPIO_LPF_COEFF (pipe),0x00d0000f ); if (intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_EDP) ||
Signature · 6 lines
1.8.1.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: s/LFP/LPF in DPIO PLL register names
Quoted 54 lines · On Fri, 14 Jun 2013 14:02:53 +0300 [email protected] wrote:
From: Ville Syrjälä <[email protected]>
LPF is short for "low pass filter".
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 6 +++--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-4@@ -1862,10 +1862,10 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" ,vlv_dpio_read (dev_priv, _DPIO_CORE_CLK_B)); -seq_printf (m,"DPIO_LFP_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_A)); -seq_printf (m,"DPIO_LFP_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_B)); +seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_A)); +seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_B));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" ,vlv_dpio_read (dev_priv,DPIO_FASTCLK_DISABLE ));drivers/gpu/drm/i915/i915_reg.h +3
-3@@ -448,9 +448,9 @@#define _DPIO_PLL_CML_B 0x806c#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) -#define _DPIO_LFP_COEFF_A 0x8048 -#define _DPIO_LFP_COEFF_B 0x8068 -#define DPIO_LFP_COEFF (pipe) _PIPE(pipe, _DPIO_LFP_COEFF_A, _DPIO_LFP_COEFF_B) +#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 DPIO_CALIBRATION 0x80acdrivers/gpu/drm/i915/intel_display.c +0
-0@@ -4407,10 +4407,10 @@ static void vlv_update_pll(struct intel_crtc *crtc) if (crtc->config.port_clock == 162000 || intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_ANALOG) ||
drivers/gpu/drm/i915/intel_display.c static void vlv_update_pll(struct intel_crtc *crtc) · line 4416
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +2
-2intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_HDMI)) -vlv_dpio_write (dev_priv,DPIO_LFP_COEFF (pipe), +vlv_dpio_write (dev_priv,DPIO_LPF_COEFF (pipe),0x005f0021 ); else - vlv_dpio_write(dev_priv, DPIO_LFP_COEFF(pipe), + vlv_dpio_write(dev_priv, DPIO_LPF_COEFF(pipe), 0x00d0000f); if (intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_EDP) ||
Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: s/LFP/LPF in DPIO PLL register names
Quoted 66 lines · Jesse Barnes
Quoted 63 lines · On Fri, 14 Jun 2013 14:02:53 +0300 [email protected] wrote:
From: Ville Syrjälä <[email protected]>
LPF is short for "low pass filter".
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 6 +++--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-4@@ -1862,10 +1862,10 @@ static int i915_dpio_info(struct seq_file *m, void *data)seq_printf (m,"DPIO_CORE_CLK_B: 0x%08x\n" ,vlv_dpio_read (dev_priv, _DPIO_CORE_CLK_B)); -seq_printf (m,"DPIO_LFP_COEFF_A: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_A)); -seq_printf (m,"DPIO_LFP_COEFF_B: 0x%08x\n" , -vlv_dpio_read (dev_priv, _DPIO_LFP_COEFF_B)); +seq_printf (m,"DPIO_LPF_COEFF_A: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_A)); +seq_printf (m,"DPIO_LPF_COEFF_B: 0x%08x\n" , +vlv_dpio_read (dev_priv, _DPIO_LPF_COEFF_B));seq_printf (m,"DPIO_FASTCLK_DISABLE: 0x%08x\n" ,vlv_dpio_read (dev_priv,DPIO_FASTCLK_DISABLE ));drivers/gpu/drm/i915/i915_reg.h +3
-3@@ -448,9 +448,9 @@#define _DPIO_PLL_CML_B 0x806c#define DPIO_PLL_CML (pipe) _PIPE(pipe, _DPIO_PLL_CML_A, _DPIO_PLL_CML_B) -#define _DPIO_LFP_COEFF_A 0x8048 -#define _DPIO_LFP_COEFF_B 0x8068 -#define DPIO_LFP_COEFF (pipe) _PIPE(pipe, _DPIO_LFP_COEFF_A, _DPIO_LFP_COEFF_B) +#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 DPIO_CALIBRATION 0x80acdrivers/gpu/drm/i915/intel_display.c +2
-2@@ -4407,10 +4407,10 @@ static void vlv_update_pll(struct intel_crtc *crtc)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,DPIO_LFP_COEFF (pipe), +vlv_dpio_write (dev_priv,DPIO_LPF_COEFF (pipe),0x005f0021 );else -vlv_dpio_write (dev_priv,DPIO_LFP_COEFF (pipe), +vlv_dpio_write (dev_priv,DPIO_LPF_COEFF (pipe),0x00d0000f );
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c static void vlv_update_pll(struct intel_crtc *crtc) · line 4416
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0
-0if (intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_EDP) ||Reviewed-by Jesse Barnes <[email protected]>
Both patches merged to dinq, thanks.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 21 lines · On Fri, 14 Jun 2013 14:02:52 +0300 [email protected] wrote:
From: Ville Syrjälä <[email protected]>
The current PLL settings produce a rather unstable picture when I hook up a VLV to my HP ZR24w display via a VGA cable.
According to
VLV2A0_DP_eDP_HDMI_DPIO_driver_vbios_notes_9, we should use the the same LPF coefficients for DAC as we do for HDMI and RBR DP. And indeed that seems to cure the shivers.v2: Add the name of the relevant document to the commit message
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void vlv_update_pll(struct intel_crtc *crtc) · line 4411
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1
-0@@ -4405,6 +4405,7 @@ static void vlv_update_pll(struct intel_crtc *crtc)/* Set HBR and RBR LPF coefficients */ if (crtc->config.port_clock ==162000 || +intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_ANALOG ) ||intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI ))vlv_dpio_write (dev_priv,DPIO_LFP_COEFF (pipe),0x005f0021 );
Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx