eDP mode setting fixes
Subsystems (2)
A small collection of patches to make eDP mode setting work better, though still not 100% reliably. Includes a register read/write tracer so I can more easily collect dumps and send them to the hw guys.
Thanks,
Jesse
PATCH 1/5 drm/i915: add panel reset workaround
Ironlake requires that we clear the reset panel bit during power sequences and restore it afterwards. Uncondtionally add code to do that since it should be harmless on SNB+.
--- drivers/gpu/drm/i915/intel_dp.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +16 -1
@@ -728,6 +728,12 @@ static void ironlake_edp_panel_on (struct drm_device *dev)return ; pp =I915_READ (PCH_PP_CONTROL ); + +/* ILK workaround: disable reset around power sequence */ + pp &= ~PANEL_POWER_RESET ; +I915_WRITE (PCH_PP_CONTROL , pp); +POSTING_READ (PCH_PP_CONTROL ); + pp |=PANEL_UNLOCK_REGS |POWER_TARGET_ON ;I915_WRITE (PCH_PP_CONTROL , pp); do {
@@ -738,7 +744,9 @@ static void ironlake_edp_panel_on (struct drm_device *dev)DRM_DEBUG_KMS ("panel on wait timed out: 0x%08x\n" , pp_status); pp &= ~(PANEL_UNLOCK_REGS |EDP_FORCE_VDD ); + pp |=PANEL_POWER_RESET ;/* restore panel reset bit */ I915_WRITE (PCH_PP_CONTROL , pp); +POSTING_READ (PCH_PP_CONTROL ); }static void ironlake_edp_panel_off (struct drm_device *dev)
@@ -748,6 +756,12 @@ static void ironlake_edp_panel_off (struct drm_device *dev)u32 pp, pp_status; pp =I915_READ (PCH_PP_CONTROL ); + +/* ILK workaround: disable reset around power sequence */ + pp &= ~PANEL_POWER_RESET ; +I915_WRITE (PCH_PP_CONTROL , pp); +POSTING_READ (PCH_PP_CONTROL ); + pp &= ~POWER_TARGET_ON ;I915_WRITE (PCH_PP_CONTROL , pp); do {
@@ -758,8 +772,9 @@ static void ironlake_edp_panel_off (struct drm_device *dev)DRM_DEBUG_KMS ("panel off wait timed out\n" );/* Make sure VDD is enabled so DP AUX will work */ - pp |=EDP_FORCE_VDD ; + pp |=EDP_FORCE_VDD |PANEL_POWER_RESET ;/* restore panel reset bit */ I915_WRITE (PCH_PP_CONTROL , pp); +POSTING_READ (PCH_PP_CONTROL ); }static void ironlake_edp_backlight_on (struct drm_device *dev)
Signature · 1 line
1.7.0.4
PATCH 2/5 drm/i915: eDP mode set sequence corrections
In reply to Jesse BarnesWe should disable the panel first when shutting down an eDP link. And when turning one on, the panel needs to be enabled before link training or eDP I/O won't be enabled.
--- drivers/gpu/drm/i915/intel_dp.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +8 -7
@@ -809,20 +809,21 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)uint32_t dp_reg =I915_READ (dp_priv->output_reg);if (mode !=DRM_MODE_DPMS_ON ) { +if (IS_eDP (intel_encoder)) { +ironlake_edp_backlight_off (dev); +ironlake_edp_panel_off (dev); + }if (dp_reg &DP_PORT_EN ) {intel_dp_link_down (intel_encoder, dp_priv->DP); -if (IS_eDP (intel_encoder)) { -ironlake_edp_backlight_off (dev); -ironlake_edp_panel_off (dev); - } } }else {if (!(dp_reg &DP_PORT_EN )) { -intel_dp_link_train (intel_encoder, dp_priv->DP, dp_priv->link_configuration); -if (IS_eDP (intel_encoder)) { +if (IS_eDP (intel_encoder))ironlake_edp_panel_on (dev); +intel_dp_link_train (intel_encoder, dp_priv->DP, + dp_priv->link_configuration); +if (IS_eDP (intel_encoder))ironlake_edp_backlight_on (dev); - } } } dp_priv->dpms_mode = mode;
Signature · 1 line
1.7.0.4
PATCH 3/5 drm/i915: fix VGA plane disable for Ironlake+
In reply to Jesse BarnesWe need to use I/O port instructions to access VGA registers on Ironlake+, and it doesn't hurt on other platforms, so switch the VGA plane disable function over to using them. Move it to init time as well while we're at it, no need to repeatedly disable the VGA plane with every mode set and DPMS event.
--- drivers/gpu/drm/i915/intel_display.c | 52 +++++++++++++++------------------ 1 files changed, 24 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/intel_display.c +24 -28
@@ -1457,29 +1457,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,return 0 ; } -/* Disable the VGA plane that we never use */ -static void i915_disable_vga (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; -u8 sr1; -u32 vga_reg; - -if (HAS_PCH_SPLIT (dev)) - vga_reg =CPU_VGACNTRL ; -else - vga_reg =VGACNTRL ; - -if (I915_READ (vga_reg) &VGA_DISP_DISABLE ) -return ; - -I915_WRITE8 (VGA_SR_INDEX ,1 ); - sr1 =I915_READ8 (VGA_SR_DATA ); -I915_WRITE8 (VGA_SR_DATA , sr1 | (1 <<5 )); -udelay (100 ); - -I915_WRITE (vga_reg,VGA_DISP_DISABLE ); -} -static void ironlake_disable_pll_edp (struct drm_crtc *crtc) {struct drm_device *dev = crtc->dev;
@@ -1994,8 +1971,6 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)I915_READ (dspbase_reg); } -i915_disable_vga (dev); -/* disable cpu pipe, disable after all planes disabled */ temp =I915_READ (pipeconf_reg);if ((temp &PIPEACONF_ENABLE ) !=0 ) {
@@ -2253,9 +2228,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) dev_priv->display.disable_fbc) dev_priv->display.disable_fbc (dev); -/* Disable the VGA plane that we never use */ -i915_disable_vga (dev); -/* Disable display plane */ temp =I915_READ (dspcntr_reg);if ((temp &DISPLAY_PLANE_ENABLE ) !=0 ) {
@@ -5591,6 +5563,27 @@ static void intel_init_quirks(struct drm_device *dev) } } +/* Disable the VGA plane that we never use */ +static void i915_disable_vga (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u8 sr1; +u32 vga_reg; + +if (HAS_PCH_SPLIT (dev)) + vga_reg =CPU_VGACNTRL ; +else + vga_reg =VGACNTRL ; + +outb (1 ,VGA_SR_INDEX ); + sr1 =inb (VGA_SR_DATA ); +outb (sr1 |1 <<5 ,VGA_SR_DATA ); +udelay (300 ); + +I915_WRITE (vga_reg,VGA_DISP_DISABLE ); +POSTING_READ (vga_reg); +} +void intel_modeset_init (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -5639,6 +5632,9 @@ void intel_modeset_init(struct drm_device *dev)intel_init_clock_gating (dev); +/* Just disable it once at startup */ +i915_disable_vga (dev); +if (IS_IRONLAKE_M (dev)) {ironlake_enable_drps (dev);intel_init_emon (dev);
Signature · 1 line
1.7.0.4
Re: [PATCH 3/5] drm/i915: fix VGA plane disable for Ironlake+
Quoted 5 lines · Jesse Barnes
We need to use I/O port instructions to access VGA registers on Ironlake+, and it doesn't hurt on other platforms, so switch the VGA plane disable function over to using them. Move it to init time as well while we're at it, no need to repeatedly disable the VGA plane with every mode set and DPMS event.
This is missing a vga_get()/vga_put() pair.
- ajax
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: make sure eDP PLL is enabled at the right time
In reply to Jesse BarnesWe need to make sure the eDP PLL is enabled before the pipes or planes, so do it as part of the DP prepare mode set function.
--- drivers/gpu/drm/i915/intel_display.c | 39 +-------------------- drivers/gpu/drm/i915/intel_dp.c | 63 ++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -37
@@ -1457,31 +1457,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,return 0 ; } -static void ironlake_disable_pll_edp (struct drm_crtc *crtc) -{ -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 dpa_ctl; - -DRM_DEBUG_KMS ("\n" ); - dpa_ctl =I915_READ (DP_A ); - dpa_ctl &= ~DP_PLL_ENABLE ; -I915_WRITE (DP_A , dpa_ctl); -} - -static void ironlake_enable_pll_edp (struct drm_crtc *crtc) -{ -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 dpa_ctl; - - dpa_ctl =I915_READ (DP_A ); - dpa_ctl |=DP_PLL_ENABLE ; -I915_WRITE (DP_A , dpa_ctl); -udelay (200 ); -} - -static void ironlake_set_pll_edp (struct drm_crtc *crtc,int clock) {struct drm_device *dev = crtc->dev;
@@ -1785,11 +1760,7 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode) } } -if (HAS_eDP) { -/* enable eDP PLL */ -ironlake_enable_pll_edp (crtc); - }else { - +if (!HAS_eDP) {/* enable PCH FDI RX PLL, wait warmup plus DMI latency */ temp =I915_READ (fdi_rx_reg);/*
@@ -2099,10 +2070,6 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)I915_WRITE (pch_dpll_reg, temp & ~DPLL_VCO_ENABLE );I915_READ (pch_dpll_reg); -if (HAS_eDP) { -ironlake_disable_pll_edp (crtc); - } -/* Switch from PCDclk to Rawclk */ temp =I915_READ (fdi_rx_reg); temp &= ~FDI_SEL_PCDCLK ;
@@ -3663,9 +3630,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, dpll_reg = pch_dpll_reg; } -if (is_edp) { -ironlake_disable_pll_edp (crtc); - }else if ((dpll &DPLL_VCO_ENABLE )) { +if (!is_edp) {I915_WRITE (fp_reg, fp);I915_WRITE (dpll_reg, dpll & ~DPLL_VCO_ENABLE );I915_READ (dpll_reg);
drivers/gpu/drm/i915/intel_dp.c +61 -2
82 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 5/5 drm/i915: add MMIO debug output
In reply to Jesse BarnesUseful for capturing register read/write traces to send to the hw guys.
--- drivers/gpu/drm/i915/i915_drv.h | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +28 -2
@@ -256,6 +256,9 @@ typedef struct drm_i915_private {int front_offset;int current_page;int page_flipping; +#define I915_DEBUG_READ (1<<0) +#define I915_DEBUG_WRITE (1<<1) +unsigned long debug_flags;wait_queue_head_t irq_queue;atomic_t irq_received;
@@ -1065,8 +1068,26 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);LOCK_TEST_WITH_RETURN (dev, file_priv); \ }while (0 ) -#define I915_READ (reg) readl(dev_priv->regs + (reg)) -#define I915_WRITE (reg, val) writel(val, dev_priv->regs + (reg)) +static inline u32 i915_read(struct drm_i915_private *dev_priv, u32 reg) +{ +u32 val; + + val =readl (dev_priv->regs + reg); +if (dev_priv->debug_flags &I915_DEBUG_READ ) +printk (KERN_ERR "read 0x%08x from 0x%08x\n" , val, reg); +return val; +} + +static inline void i915_write (struct drm_i915_private *dev_priv,u32 reg, +u32 val) +{ +writel (val, dev_priv->regs + reg); +if (dev_priv->debug_flags &I915_DEBUG_WRITE ) +printk (KERN_ERR "wrote 0x%08x to 0x%08x\n" , val, reg); +} + +#define I915_READ (reg) i915_read(dev_priv, (reg)) +#define I915_WRITE (reg, val) i915_write(dev_priv, (reg), (val))#define I915_READ16 (reg) readw(dev_priv->regs + (reg))#define I915_WRITE16 (reg, val) writel(val, dev_priv->regs + (reg))#define I915_READ8 (reg) readb(dev_priv->regs + (reg))
@@ -1076,6 +1097,11 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);#define POSTING_READ (reg) (void)I915_READ(reg)#define POSTING_READ16 (reg) (void)I915_READ16(reg) +#define I915_DEBUG_ENABLE_IO () (dev_priv->debug_flags |= I915_DEBUG_READ | \ + I915_DEBUG_WRITE) +#define I915_DEBUG_DISABLE_IO () (dev_priv->debug_flags &= ~(I915_DEBUG_READ | \ + I915_DEBUG_WRITE)) +#define I915_VERBOSE 0#define BEGIN_LP_RING (n) do { \
Signature · 1 line
1.7.0.4