Haswell fixes
Subsystems (3)
cover Haswell fixes
Hi,
Essentially those are the same patches as in the previous round, rebased on yesterday's drm-intel-next-queued, and with the following comments and suggestions from Daniel and Jesse addressed:
- Added all the new DIP controls, and a switch into hsw_write_infoframe to properly write frame contents for each type (asked by Jesse, Daniel).
- Rebased the interrupts handling code on top of drm-intel-next-queued (asked by Jesse).
- Show an error message when we are trying to use FDI over HSW+PPT combination (this was not tested yet, so probably won't work anyway) (asked by Jesse, Daniel).
- DDI module split clean-up to simplify patches reviewing (asked by Daniel).
- Added a new intel_update_linetime_watermarks callback, to setup line time watermarks that are dependant on the mode clock settings; add a note about IPS watermarks which are not yet there (asked by Jesse).
- Reworked iCLKIP clock setting to use algorithm for mode calculation instead of table, added checks for invalid values from Ben (thanks!!). WR PLL table is still there, but with an explicit comment saying that it is temporary and will go away at some point (asked pretty much everyone :))
- Adapted to the latest HDMI infoframes changes in drm-intel-next.
- Misc cleanups all around.
The CRT and higher level function separations for the LPT paths are not there. There is only 1 way to use VGA output on Haswell, and only 1 DDI can work in FDI mode for that, so I don't think it makes much sense adding specific functions for that considering that the LPT-specific chunks are quite small. We could simplify it later in the intel_display refactoring if the need arises.
Please review and comment, unless someone has any major concerns or issues with those I'd like to have them merged to drm-intel-next, for wider testing and availability!
Thanks,
Eugeni Dodonov (25):
drm/i915: add new Haswell DIP controls registers drm/i915: reuse Ivy Bridge interrupts code for Haswell drm/i915: add support for SBI ops
drm/i915: calculate watermarks for devices that have 3 pipes drm/i915: properly check for pipe count
drm/i915: show unknown sdvox registers on hdmi init drm/i915: do not use fdi_normal_train on Haswell drm/i915: detect PCH encoders on Haswell
drm/i915: enable power wells on Haswell init drm/i915: add LPT PCH checks
drm/i915: handle DDI-related assertions
drm/i915: account for only one PCH receiver on Haswell drm/i915: initialize DDI buffer translations drm/i915: support DDI training in FDI mode drm/i915: use ironlake eld write routine for Haswell drm/i915: define Haswell watermarks and clock gating drm/i915: program WM_LINETIME on Haswell
drm/i915: disable pipe DDI function when disabling pipe drm/i915: program iCLKIP on Lynx Point
drm/i915: detect digital outputs on Haswell drm/i915: add support for DDI-controlled digital outputs drm/i915: add WR PLL programming table
drm/i915: move HDMI structs to shared location drm/i915: prepare HDMI link for Haswell
drm/i915: hook Haswell devices in place
drivers/char/agp/intel-agp.c | 4 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 7 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_irq.c | 11 +- drivers/gpu/drm/i915/i915_reg.h | 36 ++ drivers/gpu/drm/i915/intel_crt.c | 6 +- drivers/gpu/drm/i915/intel_ddi.c | 755 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 306 ++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 29 +- drivers/gpu/drm/i915/intel_hdmi.c | 107 ++++- drivers/gpu/drm/i915/intel_pm.c | 87 +++- 12 files changed, 1299 insertions(+), 52 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_ddi.c
Signature · 1 line
1.7.10
PATCH 1/25 drm/i915: add new Haswell DIP controls registers
Haswell has different DIP control registers and offsets which we need to use for infoframes, which this patch adds.
Note that this does not adds full DIP frames support, but only the basic functionality necessary for HDMI to work in early enablement.
--- drivers/gpu/drm/i915/i915_reg.h | 36 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 54 +++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +36 -0
@@ -3524,6 +3524,42 @@#define VLV_TVIDEO_DIP_GCP (pipe) \ _PIPE(pipe, VLV_VIDEO_DIP_GDCP_PAYLOAD_A, VLV_VIDEO_DIP_GDCP_PAYLOAD_B) +/* Haswell DIP controls */ +#define HSW_VIDEO_DIP_CTL_A 0x60200 +#define HSW_VIDEO_DIP_AVI_DATA_A 0x60220 +#define HSW_VIDEO_DIP_VS_DATA_A 0x60260 +#define HSW_VIDEO_DIP_SPD_DATA_A 0x602A0 +#define HSW_VIDEO_DIP_GMP_DATA_A 0x602E0 +#define HSW_VIDEO_DIP_VSC_DATA_A 0x60320 +#define HSW_VIDEO_DIP_AVI_ECC_A 0x60240 +#define HSW_VIDEO_DIP_VS_ECC_A 0x60280 +#define HSW_VIDEO_DIP_SPD_ECC_A 0x602C0 +#define HSW_VIDEO_DIP_GMP_ECC_A 0x60300 +#define HSW_VIDEO_DIP_VSC_ECC_A 0x60344 +#define HSW_VIDEO_DIP_GCP_A 0x60210 + +#define HSW_VIDEO_DIP_CTL_B 0x61200 +#define HSW_VIDEO_DIP_AVI_DATA_B 0x61220 +#define HSW_VIDEO_DIP_VS_DATA_B 0x61260 +#define HSW_VIDEO_DIP_SPD_DATA_B 0x612A0 +#define HSW_VIDEO_DIP_GMP_DATA_B 0x612E0 +#define HSW_VIDEO_DIP_VSC_DATA_B 0x61320 +#define HSW_VIDEO_DIP_BVI_ECC_B 0x61240 +#define HSW_VIDEO_DIP_VS_ECC_B 0x61280 +#define HSW_VIDEO_DIP_SPD_ECC_B 0x612C0 +#define HSW_VIDEO_DIP_GMP_ECC_B 0x61300 +#define HSW_VIDEO_DIP_VSC_ECC_B 0x61344 +#define HSW_VIDEO_DIP_GCP_B 0x61210 + +#define HSW_TVIDEO_DIP_CTL (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_CTL_A, HSW_VIDEO_DIP_CTL_B) +#define HSW_TVIDEO_DIP_AVI_DATA (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_AVI_DATA_A, HSW_VIDEO_DIP_AVI_DATA_B) +#define HSW_TVIDEO_DIP_SPD_DATA (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_SPD_DATA_A, HSW_VIDEO_DIP_SPD_DATA_B) +#define HSW_TVIDEO_DIP_GCP (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_GCP_A, HSW_VIDEO_DIP_GCP_B) +#define _TRANS_HTOTAL_B 0xe1000#define _TRANS_HBLANK_B 0xe1004#define _TRANS_HSYNC_B 0xe1008
drivers/gpu/drm/i915/intel_hdmi.c +54 -0
66 lines not on this page · raw message
Signature · 1 line
1.7.10
Re: [PATCH 01/25] drm/i915: add new Haswell DIP controls registers
2012/5/9 Eugeni Dodonov <[email protected]>:
Quoted 8 lines
Haswell has different DIP control registers and offsets which we need to use for infoframes, which this patch adds.
Note that this does not adds full DIP frames support, but only the basic functionality necessary for HDMI to work in early enablement.
Signed-off-by Eugeni Dodonov <[email protected]>---
Hi
The i915_reg.h chunk seems correct, but I believe hsw_write_infoframe is wrong. The DIP control register completely changed, and the way we write the infoframes has also changed. Previously, we had just one "data" register for the full 32-byte buffer and we controlled which part of the buffer we wanted to write by the last 4 bits of the "control" register. These last 4 bits on the control register don't exist anymore (the whole register changed) and we have a ton of "data" registers now. I didn't test anything I wrote here, I'm just assuming based on the docs I have :)
For basic HDMI enablement this function is not strictly necessary, so maybe just adding a FIXME (like you did) and returning without doing anything would be fine. I'm going to provide a patch for this.
I checked each of the "0x" bits on the i915_reg.h chunk, so if just committing them, you can add my Reviewed-By.
Signature · 1 line
Paulo Zanoni
Re: [PATCH 01/25] drm/i915: add new Haswell DIP controls registers
Quoted 22 lines · Paulo Zanoni
2012/5/9 Eugeni Dodonov<[email protected]>:
Quoted 8 lines
Haswell has different DIP control registers and offsets which we need to use for infoframes, which this patch adds.
Note that this does not adds full DIP frames support, but only the basic functionality necessary for HDMI to work in early enablement.
Signed-off-by Eugeni Dodonov<[email protected]>---
Hi
The
i915_reg.hchunk seems correct, but I believehsw_write_infoframeis wrong. The DIP control register completely changed, and the way we write the infoframes has also changed. Previously, we had just one "data" register for the full 32-byte buffer and we controlled which part of the buffer we wanted to write by the last 4 bits of the "control" register. These last 4 bits on the control register don't exist anymore (the whole register changed) and we have a ton of "data" registers now. I didn't test anything I wrote here, I'm just assuming based on the docs I have :)
Quoted 3 lines
For basic HDMI enablement this function is not strictly necessary, so maybe just adding a FIXME (like you did) and returning without doing anything would be fine. I'm going to provide a patch for this.
(Just following up on what we discussed with Paulo over irc).
Without this, I am getting a nice black screen though . But the latest theory is that perhaps we just need to send any infoframe for the hardware to catch up and work in HDMI mode?
Eugeni
Re: [PATCH 01/25] drm/i915: add new Haswell DIP controls registers
2012/5/9 Eugeni Dodonov <[email protected]>:
Quoted 5 lines
Without this, I am getting a nice black screen though . But the latest theory is that perhaps we just need to send any infoframe for the hardware to catch up and work in HDMI mode?
I finally tested this :) I don't think anymore this is the case since the ddi_func_ctl register seems correct.
Lots of theories:
- Without this patch, you just run cpt_write_infoframe, which can be messing with a lot of registers that are not DIP registers on HSW
- With the patch, you set the control register to 0 at the HDMI init time, which disables any DIP that might be sending bad data and causing the black screen
- On my machine, with this patch, after booting and doing everything, the dip control register is 0x00110000, which is totally not what we set/want :)
Signature · 1 line
Paulo Zanoni
Re: [PATCH 01/25] drm/i915: add new Haswell DIP controls registers
Quoted 11 lines · Paulo Zanoni
2012/5/9 Eugeni Dodonov <[email protected]>:
Quoted 5 lines
Without this, I am getting a nice black screen though . But the latest theory is that perhaps we just need to send any infoframe for the hardware to catch up and work in HDMI mode?
I finally tested this :) I don't think anymore this is the case since the
ddi_func_ctlregister seems correct.Lots of theories:
Quoted 8 lines
- Without this patch, you just run
cpt_write_infoframe, which can be messing with a lot of registers that are not DIP registers on HSW
- With the patch, you set the control register to 0 at the HDMI init time, which disables any DIP that might be sending bad data and causing the black screen
- On my machine, with this patch, after booting and doing everything, the dip control register is0x00110000, which is totally not what we set/want :)
Ok, can I have a minimal hsw_write_infoframe with a big yelling FIXME which just set the hw state such that basic hdmi works? -Daniel
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
PATCH 1/25 drm/i915: add new Haswell DIP controls registers
In reply to Eugeni DodonovHaswell has different DIP control registers and offsets which we need to use for infoframes, which this patch adds.
Note that this does not adds full DIP frames support, but only the basic functionality necessary for HDMI to work in early enablement.
v2: replace infoframe handling with a debug message, proper support will be added via a patch from Paulo Zanoni later.
--- drivers/gpu/drm/i915/i915_reg.h | 36 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 19 +++++++++++++++++++ 2 files changed, 55 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +36 -0
@@ -3524,6 +3524,42 @@#define VLV_TVIDEO_DIP_GCP (pipe) \ _PIPE(pipe, VLV_VIDEO_DIP_GDCP_PAYLOAD_A, VLV_VIDEO_DIP_GDCP_PAYLOAD_B) +/* Haswell DIP controls */ +#define HSW_VIDEO_DIP_CTL_A 0x60200 +#define HSW_VIDEO_DIP_AVI_DATA_A 0x60220 +#define HSW_VIDEO_DIP_VS_DATA_A 0x60260 +#define HSW_VIDEO_DIP_SPD_DATA_A 0x602A0 +#define HSW_VIDEO_DIP_GMP_DATA_A 0x602E0 +#define HSW_VIDEO_DIP_VSC_DATA_A 0x60320 +#define HSW_VIDEO_DIP_AVI_ECC_A 0x60240 +#define HSW_VIDEO_DIP_VS_ECC_A 0x60280 +#define HSW_VIDEO_DIP_SPD_ECC_A 0x602C0 +#define HSW_VIDEO_DIP_GMP_ECC_A 0x60300 +#define HSW_VIDEO_DIP_VSC_ECC_A 0x60344 +#define HSW_VIDEO_DIP_GCP_A 0x60210 + +#define HSW_VIDEO_DIP_CTL_B 0x61200 +#define HSW_VIDEO_DIP_AVI_DATA_B 0x61220 +#define HSW_VIDEO_DIP_VS_DATA_B 0x61260 +#define HSW_VIDEO_DIP_SPD_DATA_B 0x612A0 +#define HSW_VIDEO_DIP_GMP_DATA_B 0x612E0 +#define HSW_VIDEO_DIP_VSC_DATA_B 0x61320 +#define HSW_VIDEO_DIP_BVI_ECC_B 0x61240 +#define HSW_VIDEO_DIP_VS_ECC_B 0x61280 +#define HSW_VIDEO_DIP_SPD_ECC_B 0x612C0 +#define HSW_VIDEO_DIP_GMP_ECC_B 0x61300 +#define HSW_VIDEO_DIP_VSC_ECC_B 0x61344 +#define HSW_VIDEO_DIP_GCP_B 0x61210 + +#define HSW_TVIDEO_DIP_CTL (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_CTL_A, HSW_VIDEO_DIP_CTL_B) +#define HSW_TVIDEO_DIP_AVI_DATA (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_AVI_DATA_A, HSW_VIDEO_DIP_AVI_DATA_B) +#define HSW_TVIDEO_DIP_SPD_DATA (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_SPD_DATA_A, HSW_VIDEO_DIP_SPD_DATA_B) +#define HSW_TVIDEO_DIP_GCP (pipe) \ + _PIPE(pipe, HSW_VIDEO_DIP_GCP_A, HSW_VIDEO_DIP_GCP_B) +#define _TRANS_HTOTAL_B 0xe1000#define _TRANS_HBLANK_B 0xe1004#define _TRANS_HSYNC_B 0xe1008
drivers/gpu/drm/i915/intel_hdmi.c +19 -0
@@ -294,6 +294,18 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,I915_WRITE (reg, val); } +static void hsw_write_infoframe (struct drm_encoder *encoder, +struct dip_infoframe *frame) +{ +/* Not implemented yet, so avoid doing anything at all. +* This is the placeholder for Paulo Zanoni's infoframe writing patch +*/ +DRM_DEBUG_DRIVER ("Attempting to write infoframe on Haswell, this is not implemented yet.\n" ); + +return ; + +} +static void intel_set_infoframe (struct drm_encoder *encoder,struct dip_infoframe *frame) {
@@ -677,6 +689,13 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) intel_hdmi->write_infoframe = vlv_write_infoframe;for_each_pipe (i)I915_WRITE (VLV_TVIDEO_DIP_CTL (i),0 ); + }else if (IS_HASWELL (dev)) { +/* FIXME: Haswell has a new set of DIP frame registers, but we are +* just doing the minimal required for HDMI to work at this stage. +*/ + intel_hdmi->write_infoframe = hsw_write_infoframe; +for_each_pipe (i) +I915_WRITE (HSW_TVIDEO_DIP_CTL (i),0 ); }else if (HAS_PCH_IBX (dev)) { intel_hdmi->write_infoframe = ibx_write_infoframe;for_each_pipe (i)
Signature · 1 line
1.7.10
PATCH 2/25 drm/i915: reuse Ivy Bridge interrupts code for Haswell
In reply to Eugeni DodonovHaswell interrupts are mostly similar with Ivy Bridge, so we share same routines with it.
This patch also simplifies the vblank counter handling for all the Gen5+ architectures.
--- drivers/gpu/drm/i915/i915_irq.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +9 -2
@@ -2597,8 +2597,7 @@ void intel_irq_init(struct drm_device *dev) dev->driver->get_vblank_counter = i915_get_vblank_counter; dev->max_vblank_count =0xffffff ;/* only 24 bits of frame count */ -if (IS_G4X (dev) ||IS_GEN5 (dev) ||IS_GEN6 (dev) ||IS_IVYBRIDGE (dev) || -IS_VALLEYVIEW (dev)) { +if (IS_G4X (dev) ||INTEL_INFO (dev)->gen >=5 ) { dev->max_vblank_count =0xffffffff ;/* full 32 bit counter */ dev->driver->get_vblank_counter = gm45_get_vblank_counter; }
@@ -2624,6 +2623,14 @@ void intel_irq_init(struct drm_device *dev) dev->driver->irq_uninstall = ironlake_irq_uninstall; dev->driver->enable_vblank = ivybridge_enable_vblank; dev->driver->disable_vblank = ivybridge_disable_vblank; + }else if (IS_HASWELL (dev)) { +/* Share interrupts handling with IVB */ + dev->driver->irq_handler = ivybridge_irq_handler; + dev->driver->irq_preinstall = ironlake_irq_preinstall; + dev->driver->irq_postinstall = ivybridge_irq_postinstall; + dev->driver->irq_uninstall = ironlake_irq_uninstall; + dev->driver->enable_vblank = ivybridge_enable_vblank; + dev->driver->disable_vblank = ivybridge_disable_vblank; }else if (HAS_PCH_SPLIT (dev)) { dev->driver->irq_handler = ironlake_irq_handler; dev->driver->irq_preinstall = ironlake_irq_preinstall;
Signature · 1 line
1.7.10
PATCH 3/25 drm/i915: add support for SBI ops
In reply to Eugeni DodonovWith Lynx Point, we need to use SBI to communicate with the display clock control. This commit adds helper functions to access the registers via SBI.
v2: de-inline the function and address changes in bits names
v3: protect operations with dpio_lock, increase timeout to 100 for paranoia sake.
v4: decrease paranoia a bit, as noticed by Chris Wilson
--- drivers/gpu/drm/i915/intel_display.c | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
drivers/gpu/drm/i915/intel_display.c +63 -0
@@ -1299,6 +1299,69 @@ static void intel_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)POSTING_READ (reg); } +/* SBI access */ +static void +intel_sbi_write (struct drm_i915_private *dev_priv,u16 reg,u32 value) +{ +unsigned long flags; + +spin_lock_irqsave (&dev_priv->dpio_lock, flags); +if (wait_for ((I915_READ (SBI_CTL_STAT ) &SBI_READY ) ==0 , +100 )) { +DRM_ERROR ("timeout waiting for SBI to become ready\n" ); + goto out_unlock; + } + +I915_WRITE (SBI_ADDR , + (reg <<16 )); +I915_WRITE (SBI_DATA , + value); +I915_WRITE (SBI_CTL_STAT , +SBI_BUSY | +SBI_CTL_OP_CRWR ); + +if (wait_for ((I915_READ (SBI_CTL_STAT ) & (SBI_READY |SBI_RESPONSE_SUCCESS )) ==0 , +100 )) { +DRM_ERROR ("timeout waiting for SBI to complete write transaction\n" ); + goto out_unlock; + } + +out_unlock: +spin_unlock_irqrestore (&dev_priv->dpio_lock, flags); +} + +static u32 +intel_sbi_read (struct drm_i915_private *dev_priv,u16 reg) +{ +unsigned long flags; +u32 value; + +spin_lock_irqsave (&dev_priv->dpio_lock, flags); +if (wait_for ((I915_READ (SBI_CTL_STAT ) &SBI_READY ) ==0 , +100 )) { +DRM_ERROR ("timeout waiting for SBI to become ready\n" ); + goto out_unlock; + } + +I915_WRITE (SBI_ADDR , + (reg <<16 )); +I915_WRITE (SBI_CTL_STAT , +SBI_BUSY | +SBI_CTL_OP_CRRD ); + +if (wait_for ((I915_READ (SBI_CTL_STAT ) & (SBI_READY |SBI_RESPONSE_SUCCESS )) ==0 , +100 )) { +DRM_ERROR ("timeout waiting for SBI to complete read transaction\n" ); + goto out_unlock; + } + + value =I915_READ (SBI_DATA ); + +out_unlock: +spin_unlock_irqrestore (&dev_priv->dpio_lock, flags); +return value; +} +/** * intel_enable_pch_pll - enable PCH PLL * @dev_priv: i915 private structure
Signature · 1 line
1.7.10
PATCH 4/25 drm/i915: calculate watermarks for devices that have 3 pipes
In reply to Eugeni DodonovThis adds proper support for calculating those watermarks, checking for number of available pipes instead of specific GPU variants when deciding if watermarks for 3rd pipe are necessary.
--- drivers/gpu/drm/i915/intel_pm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -2
@@ -1803,8 +1803,7 @@ static void sandybridge_update_wm(struct drm_device *dev) enabled |=2 ; } -/* IVB has 3 pipes */ -if (IS_IVYBRIDGE (dev) && +if ((dev_priv->num_pipe ==3 ) && g4x_compute_wm0(dev, 2, &sandybridge_display_wm_info, latency, &sandybridge_cursor_wm_info, latency,
Signature · 1 line
1.7.10
PATCH 5/25 drm/i915: properly check for pipe count
In reply to Eugeni DodonovAs suggested by Chris Wilson and Daniel Vetter, this chunk of code can be simplified with a more simple check.
Also, as noticed by Jesse Barnes, it is worth mentioning that plane is an enum and num_pipe is an int, so we could be more paranoid here about those validation checks eventually.
--- drivers/gpu/drm/i915/intel_display.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -10
@@ -1980,16 +1980,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,return 0 ; } -switch (intel_crtc->plane) { -case 0 : -case 1 : -break ; -case 2 : -if (IS_IVYBRIDGE (dev)) -break ; -/* fall through otherwise */ -default : -DRM_ERROR ("no plane for crtc\n" ); +if (intel_crtc->plane > dev_priv->num_pipe) { +DRM_ERROR ("no plane for crtc: plane %d, num_pipes %d\n" , + intel_crtc->plane, + dev_priv->num_pipe);return -EINVAL ; }
Signature · 1 line
1.7.10
PATCH 6/25 drm/i915: show unknown sdvox registers on hdmi init
In reply to Eugeni DodonovThis will throw a BUG() message when an unknown sdvox register is given to intel_hdmi_init. When this happens, things could going to be pretty much broken afterwards, so we better detect this as soon as possible.
--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
@@ -713,6 +713,10 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) intel_encoder->clone_mask = (1 <<INTEL_HDMIF_CLONE_BIT ); intel_hdmi->ddc_bus =GMBUS_PORT_DPD ; dev_priv->hotplug_supported_mask |=HDMID_HOTPLUG_INT_STATUS ; + }else { +/* If we got an unknown sdvox_reg, things are pretty much broken +* in a way that we should let the kernel know about it */ +BUG (); } intel_hdmi->sdvox_reg = sdvox_reg;
Signature · 1 line
1.7.10
PATCH 7/25 drm/i915: do not use fdi_normal_train on Haswell
In reply to Eugeni DodonovThis should be already configured when FDI auto-negotiation is done.
--- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -2679,7 +2679,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)I915_WRITE (TRANS_VSYNC (pipe),I915_READ (VSYNC (pipe)));I915_WRITE (TRANS_VSYNCSHIFT (pipe),I915_READ (VSYNCSHIFT (pipe))); -intel_fdi_normal_train (crtc); +if (!IS_HASWELL (dev)) +intel_fdi_normal_train (crtc);/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT(dev) &&
Signature · 1 line
1.7.10
PATCH 8/25 drm/i915: detect PCH encoders on Haswell
In reply to Eugeni DodonovOn Haswell, the recommended PCH-connected output is the one driven by DDI E in FDI mode, used for VGA connection. All the others are handled by the CPU.
Note that this does not accounts for Haswell/PPT combination yet, so if we encounter such combination an error message is thrown to indicate that things could go wrong.
--- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_display.c +16 -0
@@ -2610,6 +2610,22 @@ static bool intel_crtc_driving_pch(struct drm_crtc *crtc)if (encoder->base.crtc != crtc)continue ; +/* On Haswell, LPT PCH handles the VGA connection via FDI, and Haswell +* CPU handles all others */ +if (IS_HASWELL (dev)) { +if (encoder->type ==DRM_MODE_ENCODER_DAC ) { +/* It is still unclear how this would work on PPT, so throw up an error */ +if (!HAS_PCH_LPT (dev)) +DRM_ERROR ("DAC detected on a non-LPT PCH, this probably won't work\n" ); + +return true; + }else { +DRM_DEBUG_KMS ("Haswell detected encoder %d, assuming is CPU\n" , + encoder->type); +return false; + } + } +switch (encoder->type) {case INTEL_OUTPUT_EDP :if (!intel_encoder_is_pch_edp (&encoder->base))
Signature · 1 line
1.7.10
Re: [PATCH 08/25] drm/i915: detect PCH encoders on Haswell
Quoted 18 lines · Eugeni Dodonov
On Haswell, the recommended PCH-connected output is the one driven by DDI E in FDI mode, used for VGA connection. All the others are handled by the CPU.
Note that this does not accounts for Haswell/PPT combination yet, so if we encounter such combination an error message is thrown to indicate that things could go wrong.
Signed-off-by Eugeni Dodonov <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static bool intel_crtc_driving_pch(struct drm_crtc *crtc) · line 2619
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-0@@ -2610,6 +2610,22 @@ static bool intel_crtc_driving_pch(struct drm_crtc *crtc)if (encoder->base.crtc != crtc)continue ; +/* On Haswell, LPT PCH handles the VGA connection via FDI, and Haswell +* CPU handles all others */ +if (IS_HASWELL (dev)) { +if (encoder->type ==DRM_MODE_ENCODER_DAC ) { +/* It is still unclear how this would work on PPT, so throw up an error */ +if (!HAS_PCH_LPT (dev)) +DRM_ERROR ("DAC detected on a non-LPT PCH, this probably won't work\n" );
Hm, I guess we should move the LPT check out of the DAC check - after all we could drive a DP output through FDI on a PPT. Or maybe not, which implies that we have no clue in either case ;-)
-Daniel
Quoted 19 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+ +return true; + }else { +DRM_DEBUG_KMS ("Haswell detected encoder %d, assuming is CPU\n" , + encoder->type); +return false; + } + } +switch (encoder->type) {case INTEL_OUTPUT_EDP :if (!intel_encoder_is_pch_edp (&encoder->base))Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
PATCH 8/25 drm/i915: detect PCH encoders on Haswell
On Haswell, the recommended PCH-connected output is the one driven by DDI E in FDI mode, used for VGA connection. All the others are handled by the CPU.
Note that this does not accounts for Haswell/PPT combination yet, so if we encounter such combination an error message is thrown to indicate that things could go wrong.
v2: improve non-LPT detection warning per Daniel Vetter's suggestion.
--- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_display.c +16 -0
@@ -2610,6 +2610,22 @@ static bool intel_crtc_driving_pch(struct drm_crtc *crtc)if (encoder->base.crtc != crtc)continue ; +/* On Haswell, LPT PCH handles the VGA connection via FDI, and Haswell +* CPU handles all others */ +if (IS_HASWELL (dev)) { +/* It is still unclear how this will work on PPT, so throw up a warning */ +WARN_ON (!HAS_PCH_LPT (dev)); + +if (encoder->type ==DRM_MODE_ENCODER_DAC ) { +DRM_DEBUG_KMS ("Haswell detected DAC encoder, assuming is PCH\n" ); +return true; + }else { +DRM_DEBUG_KMS ("Haswell detected encoder %d, assuming is CPU\n" , + encoder->type); +return false; + } + } +switch (encoder->type) {case INTEL_OUTPUT_EDP :if (!intel_encoder_is_pch_edp (&encoder->base))
Signature · 1 line
1.7.10
PATCH 9/25 drm/i915: enable power wells on Haswell init
In reply to Eugeni DodonovThis attempts to enable all the available power wells during the initialization.
Those power wells can be enabled in parallel or on-demand, and disabled when no longer needed, but this is out of scope of this initial enablement. Proper tracking of who uses which power well will require a considerable rework of our display handling, so we just leave them all enabled when the driver is loaded for now.
v2: use more generic and future-proof code
--- drivers/gpu/drm/i915/intel_pm.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +36 -0
@@ -3559,6 +3559,37 @@ void intel_sanitize_pm(struct drm_device *dev) dev_priv->display.sanitize_pm (dev); } +/* Starting with Haswell, we have different power wells for +* different parts of the GPU. This attempts to enable them all. +*/ +void intel_init_power_wells (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long power_wells[] = { +HSW_PWR_WELL_CTL1 , +HSW_PWR_WELL_CTL2 , +HSW_PWR_WELL_CTL4 + }; +int i; + +if (!IS_HASWELL (dev)) +return ; + +mutex_lock (&dev->struct_mutex); + +for (i =0 ; i <ARRAY_SIZE (power_wells); i++) { +int well =I915_READ (power_wells[i]); + +if ((well &HSW_PWR_WELL_STATE ) ==0 ) { +I915_WRITE (power_wells[i], well &HSW_PWR_WELL_ENABLE ); +if (wait_for (I915_READ (power_wells[i] &HSW_PWR_WELL_STATE ),20 )) +DRM_ERROR ("Error enabling power well %lx\n" , power_wells[i]); + } + } + +mutex_unlock (&dev->struct_mutex); +} +/* Set up chip specific power management-related functions */ void intel_init_pm (struct drm_device *dev) {
@@ -3707,5 +3738,10 @@ void intel_init_pm(struct drm_device *dev)else dev_priv->display.get_fifo_size = i830_get_fifo_size; } + +/* We attempt to init the necessary power wells early in the initialization +* time, so the subsystems that expect power to be enabled can work. +*/ +intel_init_power_wells (dev); }
Signature · 1 line
1.7.10
Re: [PATCH 09/25] drm/i915: enable power wells on Haswell init
Quoted 59 lines · Eugeni Dodonov
This attempts to enable all the available power wells during the initialization.
Those power wells can be enabled in parallel or on-demand, and disabled when no longer needed, but this is out of scope of this initial enablement. Proper tracking of who uses which power well will require a considerable rework of our display handling, so we just leave them all enabled when the driver is loaded for now.
v2: use more generic and future-proof code
Signed-off-by Eugeni Dodonov <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)drivers/gpu/drm/i915/intel_pm.c +31
-0@@ -3559,6 +3559,37 @@ void intel_sanitize_pm(struct drm_device *dev) dev_priv->display.sanitize_pm (dev); } +/* Starting with Haswell, we have different power wells for +* different parts of the GPU. This attempts to enable them all. +*/ +void intel_init_power_wells (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long power_wells[] = { +HSW_PWR_WELL_CTL1 , +HSW_PWR_WELL_CTL2 , +HSW_PWR_WELL_CTL4 + }; +int i; + +if (!IS_HASWELL (dev)) +return ; + +mutex_lock (&dev->struct_mutex); + +for (i =0 ; i <ARRAY_SIZE (power_wells); i++) { +int well =I915_READ (power_wells[i]); + +if ((well &HSW_PWR_WELL_STATE ) ==0 ) { +I915_WRITE (power_wells[i], well &HSW_PWR_WELL_ENABLE ); +if (wait_for (I915_READ (power_wells[i] &HSW_PWR_WELL_STATE ),20 )) +DRM_ERROR ("Error enabling power well %lx\n" , power_wells[i]); + } + } + +mutex_unlock (&dev->struct_mutex); +} +/* Set up chip specific power management-related functions */ void intel_init_pm (struct drm_device *dev) {
drivers/gpu/drm/i915/intel_pm.c void intel_init_pm(struct drm_device *dev) · line 3745
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +5
-0@@ -3707,5 +3738,10 @@ void intel_init_pm(struct drm_device *dev)else dev_priv->display.get_fifo_size = i830_get_fifo_size; } + +/* We attempt to init the necessary power wells early in the initialization +* time, so the subsystems that expect power to be enabled can work. +*/ +intel_init_power_wells (dev);
Setting up hw registers in init_pm is a no-go, this function is not called on resume (and after hw reset). Also note that I've just merged a patch from Chris that moves around our hw init stuff a bit (it's now consistent between driver load, gpu reset and resume). So if this needs to run before we can set up the rings, it'll fail on latest dinq.
-Daniel
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
PATCH 9/25 drm/i915: enable power wells on Haswell init
This attempts to enable all the available power wells during the initialization.
Those power wells can be enabled in parallel or on-demand, and disabled when no longer needed, but this is out of scope of this initial enablement. Proper tracking of who uses which power well will require a considerable rework of our display handling, so we just leave them all enabled when the driver is loaded for now.
v2: use more generic and future-proof code
v3: call intel_init_power_wells from within intel_modeset_init_hw, so it would be called upon resume path as well.
--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -6738,6 +6738,13 @@ void intel_modeset_init_hw(struct drm_device *dev)if (IS_IVYBRIDGE (dev))ivb_pch_pwm_override (dev); + +if (IS_HASWELL (dev)) { +/* We attempt to init the necessary power wells early in the initialization +* time, so the subsystems that expect power to be enabled can work. +*/ +intel_init_power_wells (dev); + } }void intel_modeset_init (struct drm_device *dev)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -443,6 +443,7 @@ extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe,#define assert_pipe_disabled (d, p) assert_pipe(d, p, false)extern void intel_init_clock_gating (struct drm_device *dev); +extern void intel_init_power_wells (struct drm_device *dev);extern void intel_write_eld (struct drm_encoder *encoder,struct drm_display_mode *mode);extern void intel_cpt_verify_modeset (struct drm_device *dev,int pipe);
drivers/gpu/drm/i915/intel_pm.c +31 -0
@@ -3559,6 +3559,37 @@ void intel_sanitize_pm(struct drm_device *dev) dev_priv->display.sanitize_pm (dev); } +/* Starting with Haswell, we have different power wells for +* different parts of the GPU. This attempts to enable them all. +*/ +void intel_init_power_wells (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long power_wells[] = { +HSW_PWR_WELL_CTL1 , +HSW_PWR_WELL_CTL2 , +HSW_PWR_WELL_CTL4 + }; +int i; + +if (!IS_HASWELL (dev)) +return ; + +mutex_lock (&dev->struct_mutex); + +for (i =0 ; i <ARRAY_SIZE (power_wells); i++) { +int well =I915_READ (power_wells[i]); + +if ((well &HSW_PWR_WELL_STATE ) ==0 ) { +I915_WRITE (power_wells[i], well &HSW_PWR_WELL_ENABLE ); +if (wait_for (I915_READ (power_wells[i] &HSW_PWR_WELL_STATE ),20 )) +DRM_ERROR ("Error enabling power well %lx\n" , power_wells[i]); + } + } + +mutex_unlock (&dev->struct_mutex); +} +/* Set up chip specific power management-related functions */ void intel_init_pm (struct drm_device *dev) {
Signature · 1 line
1.7.10
Re: [PATCH 09/25] drm/i915: enable power wells on Haswell init
Quoted 9 lines · Eugeni Dodonov
This attempts to enable all the available power wells during the initialization.
Those power wells can be enabled in parallel or on-demand, and disabled when no longer needed, but this is out of scope of this initial enablement. Proper tracking of who uses which power well will require a considerable rework of our display handling, so we just leave them all enabled when the driver is loaded for now.
Quoted 6 lines
v2: use more generic and future-proof code
v3: call
intel_init_power_wellsfrom withinintel_modeset_init_hw, so it would be called upon resume path as well.Signed-off-by Eugeni Dodonov <[email protected]>
I've picked up everything up to this one here into dinq. Can you please double-check whether the power well enabling is still at the right place? I've somehow dropped Chris' patch to move around things for the rps stuff that I've merged yesterday, but now it's back as:
commit 2e1352cf196094f44e73776f41087f4c489ab936
Author: Chris Wilson <[email protected]> Date: Wed May 9 11:56:28 2012 +0100
drm/i915: gen6_enable_rps() wants to be called after ring initialisation
Cheers, Daniel
Quoted 85 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 +++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+)drivers/gpu/drm/i915/intel_display.c +7
-0@@ -6738,6 +6738,13 @@ void intel_modeset_init_hw(struct drm_device *dev)if (IS_IVYBRIDGE (dev))ivb_pch_pwm_override (dev); + +if (IS_HASWELL (dev)) { +/* We attempt to init the necessary power wells early in the initialization +* time, so the subsystems that expect power to be enabled can work. +*/ +intel_init_power_wells (dev); + } }void intel_modeset_init (struct drm_device *dev)drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -443,6 +443,7 @@ extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe,#define assert_pipe_disabled (d, p) assert_pipe(d, p, false)extern void intel_init_clock_gating (struct drm_device *dev); +extern void intel_init_power_wells (struct drm_device *dev);extern void intel_write_eld (struct drm_encoder *encoder,struct drm_display_mode *mode);extern void intel_cpt_verify_modeset (struct drm_device *dev,int pipe);drivers/gpu/drm/i915/intel_pm.c +31
-0@@ -3559,6 +3559,37 @@ void intel_sanitize_pm(struct drm_device *dev) dev_priv->display.sanitize_pm (dev); } +/* Starting with Haswell, we have different power wells for +* different parts of the GPU. This attempts to enable them all. +*/ +void intel_init_power_wells (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long power_wells[] = { +HSW_PWR_WELL_CTL1 , +HSW_PWR_WELL_CTL2 , +HSW_PWR_WELL_CTL4 + }; +int i; + +if (!IS_HASWELL (dev)) +return ; + +mutex_lock (&dev->struct_mutex); + +for (i =0 ; i <ARRAY_SIZE (power_wells); i++) { +int well =I915_READ (power_wells[i]); + +if ((well &HSW_PWR_WELL_STATE ) ==0 ) { +I915_WRITE (power_wells[i], well &HSW_PWR_WELL_ENABLE ); +if (wait_for (I915_READ (power_wells[i] &HSW_PWR_WELL_STATE ),20 )) +DRM_ERROR ("Error enabling power well %lx\n" , power_wells[i]); + } + } + +mutex_unlock (&dev->struct_mutex); +} +/* Set up chip specific power management-related functions */ void intel_init_pm (struct drm_device *dev) {Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
Re: [PATCH 09/25] drm/i915: enable power wells on Haswell init
Quoted 22 lines · Daniel Vetter
Quoted 9 lines · Eugeni Dodonov
This attempts to enable all the available power wells during the initialization.
Those power wells can be enabled in parallel or on-demand, and disabled when no longer needed, but this is out of scope of this initial enablement. Proper tracking of who uses which power well will require a considerable rework of our display handling, so we just leave them all enabled when the driver is loaded for now.
Quoted 6 lines
v2: use more generic and future-proof code
v3: call
intel_init_power_wellsfrom withinintel_modeset_init_hw, so it would be called upon resume path as well.Signed-off-by Eugeni Dodonov<[email protected]>I've picked up everything up to this one here into dinq. Can you please double-check whether the power well enabling is still at the right place? I've somehow dropped Chris' patch to move around things for the rps stuff that I've merged yesterday, but now it's back as:
Quoted 8 lines
commit
2e1352cf196094f44e73776f41087f4c489ab936Author: Chris Wilson<[email protected]> Date: Wed May 9 11:56:28 2012 +0100drm/i915:
gen6_enable_rps()wants to be called after ring initialisationCheers, Daniel
I re-tested with latest drm-intel-next-queued (with everything applied up to this patch), and applied the remaining patches on top of it - including this power wells patch - and confirmed that it still works.
I haven't tested suspend-resume yet (as this does not works yet anyway :)).
PATCH 10/25 drm/i915: add LPT PCH checks
In reply to Eugeni DodonovAvoid bogus asserts and PCH PLL accesses on Lynx Point.
--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +16 -2
@@ -916,6 +916,11 @@ static void assert_pch_pll(struct drm_i915_private *dev_priv,u32 val;bool cur_state; +if (HAS_PCH_LPT (dev_priv->dev)) { +DRM_DEBUG_DRIVER ("LPT detected: skipping PCH PLL test\n" ); +return ; + } +if (!intel_crtc->pch_pll) {WARN (1 ,"asserting PCH PLL enabled with no PLL\n" );return ;
@@ -1101,6 +1106,11 @@ static void assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)u32 val;bool enabled; +if (HAS_PCH_LPT (dev_priv->dev)) { +DRM_DEBUG_DRIVER ("LPT does not has PCH refclk, skipping check\n" ); +return ; + } + val =I915_READ (PCH_DREF_CONTROL ); enabled = !!(val & (DREF_SSC_SOURCE_MASK |DREF_NONSPREAD_SOURCE_MASK |DREF_SUPERSPREAD_SOURCE_MASK ));
@@ -4406,8 +4416,12 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,DRM_DEBUG_KMS ("Mode for pipe %d:\n" , pipe);drm_mode_debug_printmodeline (mode); -/* CPU eDP is the only output that doesn't need a PCH PLL of its own */ -if (!is_cpu_edp) { +/* CPU eDP is the only output that doesn't need a PCH PLL of its own on +* pre-Haswell/LPT generation */ +if (HAS_PCH_LPT (dev)) { +DRM_DEBUG_KMS ("LPT detected: no PLL for pipe %d necessary\n" , + pipe); + }else if (!is_cpu_edp) {struct intel_pch_pll *pll; pll =intel_get_pch_pll (intel_crtc, dpll, fp);
Signature · 1 line
1.7.10
PATCH 11/25 drm/i915: handle DDI-related assertions
In reply to Eugeni DodonovPrevent bogus asserts on DDI-related paths.
--- drivers/gpu/drm/i915/intel_display.c | 35 ++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +25 -10
@@ -953,9 +953,16 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,u32 val;bool cur_state; - reg =FDI_TX_CTL (pipe); - val =I915_READ (reg); - cur_state = !!(val &FDI_TX_ENABLE ); +if (IS_HASWELL (dev_priv->dev)) { +/* On Haswell, DDI is used instead of FDI_TX_CTL */ + reg =DDI_FUNC_CTL (pipe); + val =I915_READ (reg); + cur_state = !!(val &PIPE_DDI_FUNC_ENABLE ); + }else { + reg =FDI_TX_CTL (pipe); + val =I915_READ (reg); + cur_state = !!(val &FDI_TX_ENABLE ); + }WARN (cur_state != state,"FDI TX state assertion failure (expected %s, current %s)\n" ,state_string (state),state_string (cur_state));
@@ -990,6 +997,10 @@ static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv,if (dev_priv->info->gen ==5 )return ; +/* On Haswell, DDI ports are responsible for the FDI PLL setup */ +if (IS_HASWELL (dev_priv->dev)) +return ; + reg =FDI_TX_CTL (pipe); val =I915_READ (reg);WARN (!(val &FDI_TX_PLL_ENABLE ),"FDI TX PLL assertion failure, should be active but is disabled\n" );
@@ -2514,14 +2525,18 @@ static void ironlake_fdi_pll_enable(struct drm_crtc *crtc)POSTING_READ (reg);udelay (200 ); -/* Enable CPU FDI TX PLL, always on for Ironlake */ - reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); -if ((temp &FDI_TX_PLL_ENABLE ) ==0 ) { -I915_WRITE (reg, temp |FDI_TX_PLL_ENABLE ); +/* On Haswell, the PLL configuration for ports and pipes is handled +* separately, as part of DDI setup */ +if (!IS_HASWELL (dev)) { +/* Enable CPU FDI TX PLL, always on for Ironlake */ + reg =FDI_TX_CTL (pipe); + temp =I915_READ (reg); +if ((temp &FDI_TX_PLL_ENABLE ) ==0 ) { +I915_WRITE (reg, temp |FDI_TX_PLL_ENABLE ); -POSTING_READ (reg); -udelay (100 ); +POSTING_READ (reg); +udelay (100 ); + } } }
Signature · 1 line
1.7.10
PATCH 12/25 drm/i915: account for only one PCH receiver on Haswell
In reply to Eugeni DodonovOn Haswell, only one pipe can work in FDI mode, so this patch prevents messing with wrong registers when FDI is being used by non-first pipe. And to prevent this, we also specify that the VGA can only be used on pipe 0 for now in the crtc_mask value.
--- drivers/gpu/drm/i915/intel_crt.c | 6 +++++- drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +5 -1
@@ -615,7 +615,11 @@ void intel_crt_init(struct drm_device *dev) crt->base.clone_mask = (1 <<INTEL_SDVO_NON_TV_CLONE_BIT |1 <<INTEL_ANALOG_CLONE_BIT |1 <<INTEL_SDVO_LVDS_CLONE_BIT ); - crt->base.crtc_mask = (1 <<0 ) | (1 <<1 ); +if (IS_HASWELL (dev)) + crt->base.crtc_mask = (1 <<0 ); +else + crt->base.crtc_mask = (1 <<0 ) | (1 <<1 ); +if (IS_GEN2 (dev)) connector->interlace_allowed =0 ;else
drivers/gpu/drm/i915/intel_display.c +16 -3
@@ -977,9 +977,14 @@ static void assert_fdi_rx(struct drm_i915_private *dev_priv,u32 val;bool cur_state; - reg =FDI_RX_CTL (pipe); - val =I915_READ (reg); - cur_state = !!(val &FDI_RX_ENABLE ); +if (IS_HASWELL (dev_priv->dev) && pipe >0 ) { +DRM_ERROR ("Attempting to enable FDI_RX on Haswell pipe > 0\n" ); +return ; + }else { + reg =FDI_RX_CTL (pipe); + val =I915_READ (reg); + cur_state = !!(val &FDI_RX_ENABLE ); + }WARN (cur_state != state,"FDI RX state assertion failure (expected %s, current %s)\n" ,state_string (state),state_string (cur_state));
@@ -1012,6 +1017,10 @@ static void assert_fdi_rx_pll_enabled(struct drm_i915_private *dev_priv,int reg;u32 val; +if (IS_HASWELL (dev_priv->dev) && pipe >0 ) { +DRM_ERROR ("Attempting to enable FDI on Haswell with pipe > 0\n" ); +return ; + } reg =FDI_RX_CTL (pipe); val =I915_READ (reg);WARN (!(val &FDI_RX_PLL_ENABLE ),"FDI RX PLL assertion failure, should be active but is disabled\n" );
@@ -1483,6 +1492,10 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv,assert_fdi_tx_enabled (dev_priv, pipe);assert_fdi_rx_enabled (dev_priv, pipe); +if (IS_HASWELL (dev_priv->dev) && pipe >0 ) { +DRM_ERROR ("Attempting to enable transcoder on Haswell with pipe > 0\n" ); +return ; + } reg =TRANSCONF (pipe); val =I915_READ (reg); pipeconf_val =I915_READ (PIPECONF (pipe));
Signature · 1 line
1.7.10
PATCH 13/25 drm/i915: initialize DDI buffer translations
In reply to Eugeni DodonovDDI is introduced starting with Haswell GPU generation. So to simplify its management in the future, we also add intel_ddi.c to hold all the DDI-related items.
Buffer translations for DDI links must be initialized prior to enablement. For FDI and DP, first 9 pairs of values are used to select the connection parameters. HDMI uses the last pair of values and ignores the first 9 pairs. So we program HDMI values in both cases, which allows HDMI to work over both FDI and DP-friendly buffers.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_ddi.c | 107 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 2 + drivers/gpu/drm/i915/intel_drv.h | 1 + 4 files changed, 111 insertions(+) create mode 100644 drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -19,6 +19,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ intel_crt.o \ intel_lvds.o \ intel_bios.o \ + intel_ddi.o \ intel_dp.o \ intel_hdmi.o \ intel_sdvo.o \
drivers/gpu/drm/i915/intel_ddi.c new file +107 -0
107 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -6801,6 +6801,8 @@ void intel_modeset_init(struct drm_device *dev)intel_init_pm (dev); +intel_prepare_ddi (dev); +intel_init_display (dev);if (IS_GEN2 (dev)) {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -446,6 +446,7 @@ extern void intel_init_clock_gating(struct drm_device *dev);extern void intel_write_eld (struct drm_encoder *encoder,struct drm_display_mode *mode);extern void intel_cpt_verify_modeset (struct drm_device *dev,int pipe); +extern void intel_prepare_ddi (struct drm_device *dev);/* For use by IVB LP watermark workaround in intel_sprite.c */ extern void intel_update_watermarks (struct drm_device *dev);
Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/25 drm/i915: support DDI training in FDI mode
In reply to Eugeni DodonovStarting with Haswell, DDI ports can work in FDI mode to support connectivity with the outputs located on the PCH.
This commit adds support for such connections in the intel_ddi module, and provides Haswell-specific functionality to make it work.
v2: simplify the commit as per Daniel Vetter suggestion.
--- drivers/gpu/drm/i915/intel_ddi.c | 115 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 2 + drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 118 insertions(+)
drivers/gpu/drm/i915/intel_ddi.c +115 -0
@@ -105,3 +105,118 @@ void intel_prepare_ddi(struct drm_device *dev)intel_prepare_ddi_buffers (dev,PORT_E , true); } } + +static const long hsw_ddi_buf_ctl_values[] = { +DDI_BUF_EMP_400MV_0DB_HSW , +DDI_BUF_EMP_400MV_3_5DB_HSW , +DDI_BUF_EMP_400MV_6DB_HSW , +DDI_BUF_EMP_400MV_9_5DB_HSW , +DDI_BUF_EMP_600MV_0DB_HSW , +DDI_BUF_EMP_600MV_3_5DB_HSW , +DDI_BUF_EMP_600MV_6DB_HSW , +DDI_BUF_EMP_800MV_0DB_HSW , +DDI_BUF_EMP_800MV_3_5DB_HSW +}; + + +/* Starting with Haswell, different DDI ports can work in FDI mode for +* connection to the PCH-located connectors. For this, it is necessary to train +* both the DDI port and PCH receiver for the desired DDI buffer settings. +* +* The recommended port to work in FDI mode is DDI E, which we use here. Also, +* please note that when FDI mode is active on DDI E, it shares 2 lines with +* DDI A (which is used for eDP) +*/ + +void hsw_fdi_link_train (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +int pipe = intel_crtc->pipe; +u32 reg, temp, i; + +/* Configure CPU PLL, wait for warmup */ +I915_WRITE (SPLL_CTL , +SPLL_PLL_ENABLE | + SPLL_PLL_FREQ_1350MHz | +SPLL_PLL_SCC ); + +/* Use SPLL to drive the output when in FDI mode */ +I915_WRITE (PORT_CLK_SEL (PORT_E ), +PORT_CLK_SEL_SPLL ); +I915_WRITE (PIPE_CLK_SEL (pipe), +PIPE_CLK_SEL_PORT (PORT_E )); + +udelay (20 ); + +/* Start the training iterating through available voltages and emphasis */ +for (i=0 ; i <ARRAY_SIZE (hsw_ddi_buf_ctl_values); i++) { +/* Configure DP_TP_CTL with auto-training */ +I915_WRITE (DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN | +DP_TP_CTL_ENHANCED_FRAME_ENABLE | +DP_TP_CTL_LINK_TRAIN_PAT1 | +DP_TP_CTL_ENABLE ); + +/* Configure and enable DDI_BUF_CTL for DDI E with next voltage */ + temp =I915_READ (DDI_BUF_CTL (PORT_E )); + temp = (temp & ~DDI_BUF_EMP_MASK ); +I915_WRITE (DDI_BUF_CTL (PORT_E ), + temp | +DDI_BUF_CTL_ENABLE | +DDI_PORT_WIDTH_X2 | + hsw_ddi_buf_ctl_values[i]); + +udelay (600 ); + +/* Enable CPU FDI Receiver with auto-training */ + reg =FDI_RX_CTL (pipe); +I915_WRITE (reg, +I915_READ (reg) | +FDI_LINK_TRAIN_AUTO | +FDI_RX_ENABLE | +FDI_LINK_TRAIN_PATTERN_1_CPT | +FDI_RX_ENHANCE_FRAME_ENABLE | +FDI_PORT_WIDTH_2X_LPT | +FDI_RX_PLL_ENABLE ); +POSTING_READ (reg); +udelay (100 ); + + temp =I915_READ (DP_TP_STATUS (PORT_E )); +if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) { +DRM_DEBUG_DRIVER ("BUF_CTL training done on %d step\n" , i); + +/* Enable normal pixel sending for FDI */ +I915_WRITE (DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN | +DP_TP_CTL_LINK_TRAIN_NORMAL | +DP_TP_CTL_ENHANCED_FRAME_ENABLE | +DP_TP_CTL_ENABLE ); + +/* Enable PIPE_DDI_FUNC_CTL for the pipe to work in FDI mode */ + temp =I915_READ (DDI_FUNC_CTL (pipe)); + temp &= ~PIPE_DDI_PORT_MASK ; + temp |=PIPE_DDI_SELECT_PORT (PORT_E ) | +PIPE_DDI_MODE_SELECT_FDI | +PIPE_DDI_FUNC_ENABLE | +PIPE_DDI_PORT_WIDTH_X2 ; +I915_WRITE (DDI_FUNC_CTL (pipe), + temp); +break ; + }else { +DRM_ERROR ("Error training BUF_CTL %d\n" , i); + +/* Disable DP_TP_CTL and FDI_RX_CTL) and retry */ +I915_WRITE (DP_TP_CTL (PORT_E ), +I915_READ (DP_TP_CTL (PORT_E )) & + ~DP_TP_CTL_ENABLE ); +I915_WRITE (FDI_RX_CTL (pipe), +I915_READ (FDI_RX_CTL (pipe)) & + ~FDI_RX_PLL_ENABLE ); +continue ; + } + } + +DRM_DEBUG_KMS ("FDI train done.\n" ); +}
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -6603,6 +6603,8 @@ static void intel_init_display(struct drm_device *dev)/* FIXME: detect B0+ stepping and use auto training */ dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; dev_priv->display.write_eld = ironlake_write_eld; + }else if (IS_HASWELL (dev)) { + dev_priv->display.fdi_link_train = hsw_fdi_link_train; }else dev_priv->display.update_wm =NULL ; }else if (IS_VALLEYVIEW (dev)) {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -447,6 +447,7 @@ extern void intel_write_eld(struct drm_encoder *encoder, struct drm_display_mode *mode);extern void intel_cpt_verify_modeset (struct drm_device *dev,int pipe);extern void intel_prepare_ddi (struct drm_device *dev); +extern void hsw_fdi_link_train (struct drm_crtc *crtc);/* For use by IVB LP watermark workaround in intel_sprite.c */ extern void intel_update_watermarks (struct drm_device *dev);
Signature · 1 line
1.7.10
PATCH 15/25 drm/i915: use ironlake eld write routine for Haswell
In reply to Eugeni Dodonov--- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -6605,6 +6605,7 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.write_eld = ironlake_write_eld; }else if (IS_HASWELL (dev)) { dev_priv->display.fdi_link_train = hsw_fdi_link_train; + dev_priv->display.write_eld = ironlake_write_eld; }else dev_priv->display.update_wm =NULL ; }else if (IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.7.10
PATCH 16/25 drm/i915: define Haswell watermarks and clock gating
In reply to Eugeni DodonovFor now, we simple reuse the Ivy Bridge routines here.
--- drivers/gpu/drm/i915/intel_pm.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +11 -0
@@ -3685,6 +3685,17 @@ void intel_init_pm(struct drm_device *dev) } dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; dev_priv->display.sanitize_pm = gen6_sanitize_pm; + }else if (IS_HASWELL (dev)) { +if (SNB_READ_WM0_LATENCY ()) { + dev_priv->display.update_wm = sandybridge_update_wm; + dev_priv->display.update_sprite_wm = sandybridge_update_sprite_wm; + }else { +DRM_DEBUG_KMS ("Failed to read display plane latency. " +"Disable CxSR\n" ); + dev_priv->display.update_wm =NULL ; + } + dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; + dev_priv->display.sanitize_pm = gen6_sanitize_pm; }else dev_priv->display.update_wm =NULL ; }else if (IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.7.10
PATCH 17/25 drm/i915: program WM_LINETIME on Haswell
In reply to Eugeni DodonovThe line time can be programmed according to the number of horizontal pixels vs effective pixel rate ratio.
v2: improve comment as per Chris Wilson suggestion
v3: incorporate latest changes in specs.
v4: move into wm update routine, also mention that the same routine can program IPS watermarks. We do not have their enablement code yet, nor handle the required clock settings at the moment, so this patch won't program those values for now.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 2 ++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_pm.c | 37 ++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -243,6 +243,8 @@ struct drm_i915_display_funcs {void (*update_sprite_wm)(struct drm_device *dev,int pipe,uint32_t sprite_width,int pixel_size);void (*sanitize_pm)(struct drm_device *dev); +void (*update_linetime_wm)(struct drm_device *dev,int pipe, +struct drm_display_mode *mode); int (*crtc_mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode,
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -4609,6 +4609,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,intel_update_watermarks (dev); +intel_update_linetime_watermarks (dev, pipe, adjusted_mode); +return ret; }
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -454,6 +454,8 @@ extern void intel_update_watermarks(struct drm_device *dev);extern void intel_update_sprite_watermarks (struct drm_device *dev,int pipe,uint32_t sprite_width,int pixel_size); +extern void intel_update_linetime_watermarks (struct drm_device *dev,int pipe, +struct drm_display_mode *mode);extern int intel_sprite_set_colorkey (struct drm_device *dev,void *data,struct drm_file *file_priv);
drivers/gpu/drm/i915/intel_pm.c +37 -0
@@ -1883,6 +1883,33 @@ static void sandybridge_update_wm(struct drm_device *dev) cursor_wm); } +static void +haswell_update_linetime_wm (struct drm_device *dev,int pipe, +struct drm_display_mode *mode) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u32 temp; + + temp =I915_READ (PIPE_WM_LINETIME (pipe)); + temp &= ~PIPE_WM_LINETIME_MASK ; + +/* The WM are computed with base on how long it takes to fill a single +* row at the given clock rate, multiplied by 8. +* */ + temp |=PIPE_WM_LINETIME_TIME ( + ((mode->crtc_hdisplay *1000 ) / mode->clock) *8 ); + +/* IPS watermarks are only used by pipe A, and are ignored by +* pipes B and C. They are calculated similarly to the common +* linetime values, except that we are using CD clock frequency +* in MHz instead of pixel rate for the division. +* +* This is a placeholder for the IPS watermark calculation code. +*/ + +I915_WRITE (PIPE_WM_LINETIME (pipe), temp); +} + static bool sandybridge_compute_sprite_wm(struct drm_device *dev, int plane, uint32_t sprite_width, int pixel_size,
@@ -2078,6 +2105,15 @@ void intel_update_watermarks(struct drm_device *dev) dev_priv->display.update_wm (dev); } +void intel_update_linetime_watermarks (struct drm_device *dev, +int pipe,struct drm_display_mode *mode) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +if (dev_priv->display.update_linetime_wm) + dev_priv->display.update_linetime_wm (dev, pipe, mode); +} +void intel_update_sprite_watermarks (struct drm_device *dev,int pipe,uint32_t sprite_width,int pixel_size) {
@@ -3689,6 +3725,7 @@ void intel_init_pm(struct drm_device *dev)if (SNB_READ_WM0_LATENCY ()) { dev_priv->display.update_wm = sandybridge_update_wm; dev_priv->display.update_sprite_wm = sandybridge_update_sprite_wm; + dev_priv->display.update_linetime_wm = haswell_update_linetime_wm; }else {DRM_DEBUG_KMS ("Failed to read display plane latency. " "Disable CxSR\n" );
Signature · 1 line
1.7.10
PATCH 18/25 drm/i915: disable pipe DDI function when disabling pipe
In reply to Eugeni DodonovThis can be acomplished by simple writing 0 to the DDI function control register too, but better be explicit about what fields we are unsetting here to prevent possible issues.
--- drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_display.c +10 -0
@@ -1626,6 +1626,16 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv,I915_WRITE (reg, val & ~PIPECONF_ENABLE );intel_wait_for_pipe_off (dev_priv->dev, pipe); + +/* On HSW, disable pipe DDI function with the pipe */ +if (IS_HASWELL (dev_priv->dev)) { + val =I915_READ (DDI_FUNC_CTL (pipe)); + val &= ~PIPE_DDI_PORT_MASK ; + val &= ~PIPE_DDI_FUNC_ENABLE ; +I915_WRITE (DDI_FUNC_CTL (pipe), + val); + } + }/*
Signature · 1 line
1.7.10
PATCH 19/25 drm/i915: program iCLKIP on Lynx Point
In reply to Eugeni DodonovThe iCLKIP clock is used to drive the VGA pixel clock on the PCH. In order to do so, it must be programmed to properly do the clock ticks according to the divisor, phase direction, phase increments and a special auxiliary divisor for 20MHz clock.
v2: calculate divisor values directly instead of relying on a table.
v3: merged a fix from Ben to properly check for invalid divider values.
--- drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +97 -3
@@ -2685,6 +2685,97 @@ static bool intel_crtc_driving_pch(struct drm_crtc *crtc)return true; } +/* Program iCLKIP clock to the desired frequency */ +static void lpt_program_iclkip (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +u32 divsel, phaseinc, auxdiv, phasedir =0 ; +u32 temp; + +/* It is necessary to ungate the pixclk gate prior to programming +* the divisors, and gate it back when it is done. +*/ +I915_WRITE (PIXCLK_GATE ,PIXCLK_GATE_GATE ); + +/* Disable SSCCTL */ +intel_sbi_write (dev_priv,SBI_SSCCTL6 , +intel_sbi_read (dev_priv,SBI_SSCCTL6 ) | +SBI_SSCCTL_DISABLE ); + +/* 20MHz is a corner case which is out of range for the 7-bit divisor */ +if (crtc->mode.clock ==20000 ) { + auxdiv =1 ; + divsel =0x41 ; + phaseinc =0x20 ; + }else { +/* The iCLK virtual clock root frequency is in MHz, +* but the crtc->mode.clock in in KHz. To get the divisors, +* it is necessary to divide one by another, so we +* convert the virtual clock precision to KHz here for higher +* precision. +*/ +u32 iclk_virtual_root_freq =172800 *1000 ; +u32 iclk_pi_range =64 ; +u32 desired_divisor, msb_divisor_value, pi_value; + + desired_divisor = (iclk_virtual_root_freq / crtc->mode.clock); + msb_divisor_value = desired_divisor / iclk_pi_range; + pi_value = desired_divisor % iclk_pi_range; + + auxdiv =0 ; + divsel = msb_divisor_value -2 ; + phaseinc = pi_value; + } + +/* This should not happen with any sane values */ +WARN_ON (SBI_SSCDIVINTPHASE_DIVSEL (divsel) & + ~SBI_SSCDIVINTPHASE_DIVSEL_MASK ); +WARN_ON (SBI_SSCDIVINTPHASE_DIR (phasedir) & + ~SBI_SSCDIVINTPHASE_INCVAL_MASK ); + +DRM_DEBUG_KMS ("iCLKIP clock: found settings for %dKHz refresh rate: auxdiv=%x, divsel=%x, phasedir=%x, phaseinc=%x\n" , + crtc->mode.clock, + auxdiv, + divsel, + phasedir, + phaseinc); + +/* Program SSCDIVINTPHASE6 */ + temp =intel_sbi_read (dev_priv,SBI_SSCDIVINTPHASE6 ); + temp &= ~SBI_SSCDIVINTPHASE_DIVSEL_MASK ; + temp |=SBI_SSCDIVINTPHASE_DIVSEL (divsel); + temp &= ~SBI_SSCDIVINTPHASE_INCVAL_MASK ; + temp |=SBI_SSCDIVINTPHASE_INCVAL (phaseinc); + temp |=SBI_SSCDIVINTPHASE_DIR (phasedir); + temp |=SBI_SSCDIVINTPHASE_PROPAGATE ; + +intel_sbi_write (dev_priv, +SBI_SSCDIVINTPHASE6 , + temp); + +/* Program SSCAUXDIV */ + temp =intel_sbi_read (dev_priv,SBI_SSCAUXDIV6 ); + temp &= ~SBI_SSCAUXDIV_FINALDIV2SEL (1 ); + temp |=SBI_SSCAUXDIV_FINALDIV2SEL (auxdiv); +intel_sbi_write (dev_priv, +SBI_SSCAUXDIV6 , + temp); + + +/* Enable modulator and associated divider */ + temp =intel_sbi_read (dev_priv,SBI_SSCCTL6 ); + temp &= ~SBI_SSCCTL_DISABLE ; +intel_sbi_write (dev_priv, +SBI_SSCCTL6 , + temp); + +/* Wait for initialization time */ +udelay (24 ); + +I915_WRITE (PIXCLK_GATE ,PIXCLK_GATE_UNGATE ); +} +/* * Enable PCH resources required for PCH ports: * - PCH PLLs
@@ -2704,11 +2795,14 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)/* For PCH output, training FDI link */ dev_priv->display.fdi_link_train (crtc); -intel_enable_pch_pll (intel_crtc); - -if (HAS_PCH_CPT (dev)) { +if (HAS_PCH_LPT (dev)) { +DRM_DEBUG_KMS ("LPT detected: programming iCLKIP\n" ); +lpt_program_iclkip (crtc); + }else if (HAS_PCH_CPT (dev)) {u32 sel; +intel_enable_pch_pll (intel_crtc); + temp =I915_READ (PCH_DPLL_SEL );switch (pipe) {default :
Signature · 1 line
1.7.10
PATCH 20/25 drm/i915: detect digital outputs on Haswell
In reply to Eugeni DodonovDigital port detection on Haswell is indicated by the presence of a bit in DDI_BUF_CTL for port A, and by a different register for ports B, C and D. So we check for those bits during the initialization time and let the hdmi function know about those.
Note that this bit does not indicates whether the output is DP or HDMI. However, the DDI buffers can be programmed in a way that is shared between DP/HDMI and FDI/HDMI except for PORT E.
So for now, we detect those digital outputs as being HDMI, but proper DP support is still pending.
Note that DDI A can only drive eDP, so we do not handle it here for hdmi initialization.
v2: simplify Haswell handling logic
v3: use generic function for handling digital outputs.
--- drivers/gpu/drm/i915/intel_ddi.c | 29 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 21 ++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 50 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +29 -0
@@ -220,3 +220,32 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)DRM_DEBUG_KMS ("FDI train done.\n" ); } + +/* For DDI connections, it is possible to support different outputs over the +* same DDI port, such as HDMI or DP or even VGA via FDI. So we don't know by +* the time the output is detected what exactly is on the other end of it. This +* function aims at providing support for this detection and proper output +* configuration. +*/ +void intel_ddi_init (struct drm_device *dev,enum port port) +{ +/* For now, we don't do any proper output detection and assume that we +* handle HDMI only */ + +switch (port){ +case PORT_A : +/* We don't handle eDP and DP yet */ +DRM_DEBUG_DRIVER ("Found digital output on DDI port A\n" ); +break ; +/* Assume that the ports B, C and D are working in HDMI mode for now */ +case PORT_B : +case PORT_C : +case PORT_D : +intel_hdmi_init (dev,DDI_BUF_CTL (port)); +break ; +default : +DRM_DEBUG_DRIVER ("No handlers defined for port %d, skipping DDI initialization\n" , + port); +break ; + } +}
drivers/gpu/drm/i915/intel_display.c +20 -1
@@ -6480,7 +6480,26 @@ static void intel_setup_outputs(struct drm_device *dev)intel_crt_init (dev); -if (HAS_PCH_SPLIT (dev)) { +if (IS_HASWELL (dev)) { +int found; + +/* Haswell uses DDI functions to detect digital outputs */ + found =I915_READ (DDI_BUF_CTL_A ) &DDI_INIT_DISPLAY_DETECTED ; +/* DDI A only supports eDP */ +if (found) +intel_ddi_init (dev,PORT_A ); + +/* DDI B, C and D detection is indicated by the SFUSE_STRAP +* register */ + found =I915_READ (SFUSE_STRAP ); + +if (found &SFUSE_STRAP_DDIB_DETECTED ) +intel_ddi_init (dev,PORT_B ); +if (found &SFUSE_STRAP_DDIC_DETECTED ) +intel_ddi_init (dev,PORT_C ); +if (found &SFUSE_STRAP_DDID_DETECTED ) +intel_ddi_init (dev,PORT_D ); + }else if (HAS_PCH_SPLIT (dev)) {int found;if (I915_READ (HDMIB ) &PORT_DETECTED ) {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -448,6 +448,7 @@ extern void intel_write_eld(struct drm_encoder *encoder,extern void intel_cpt_verify_modeset (struct drm_device *dev,int pipe);extern void intel_prepare_ddi (struct drm_device *dev);extern void hsw_fdi_link_train (struct drm_crtc *crtc); +extern void intel_ddi_init (struct drm_device *dev,enum port port);/* For use by IVB LP watermark workaround in intel_sprite.c */ extern void intel_update_watermarks (struct drm_device *dev);
Signature · 1 line
1.7.10
PATCH 21/25 drm/i915: add support for DDI-controlled digital outputs
In reply to Eugeni DodonovThose are driven by DDIs on Haswell architecture, so we need to keep track of which DDI is being used on each output.
--- drivers/gpu/drm/i915/intel_hdmi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +19 -0
@@ -41,6 +41,7 @@ struct intel_hdmi {struct intel_encoder base;u32 sdvox_reg;int ddc_bus; +int ddi_port;uint32_t color_range;bool has_hdmi_sink;bool has_audio;
@@ -713,6 +714,24 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) intel_encoder->clone_mask = (1 <<INTEL_HDMIF_CLONE_BIT ); intel_hdmi->ddc_bus =GMBUS_PORT_DPD ; dev_priv->hotplug_supported_mask |=HDMID_HOTPLUG_INT_STATUS ; + }else if (sdvox_reg ==DDI_BUF_CTL (PORT_B )) { +DRM_DEBUG_DRIVER ("LPT: detected output on DDI B\n" ); + intel_encoder->clone_mask = (1 <<INTEL_HDMIB_CLONE_BIT ); + intel_hdmi->ddc_bus =GMBUS_PORT_DPB ; + intel_hdmi->ddi_port =PORT_B ; + dev_priv->hotplug_supported_mask |=HDMIB_HOTPLUG_INT_STATUS ; + }else if (sdvox_reg ==DDI_BUF_CTL (PORT_C )) { +DRM_DEBUG_DRIVER ("LPT: detected output on DDI C\n" ); + intel_encoder->clone_mask = (1 <<INTEL_HDMIC_CLONE_BIT ); + intel_hdmi->ddc_bus =GMBUS_PORT_DPC ; + intel_hdmi->ddi_port =PORT_C ; + dev_priv->hotplug_supported_mask |=HDMIC_HOTPLUG_INT_STATUS ; + }else if (sdvox_reg ==DDI_BUF_CTL (PORT_D )) { +DRM_DEBUG_DRIVER ("LPT: detected output on DDI D\n" ); + intel_encoder->clone_mask = (1 <<INTEL_HDMID_CLONE_BIT ); + intel_hdmi->ddc_bus =GMBUS_PORT_DPD ; + intel_hdmi->ddi_port =PORT_D ; + dev_priv->hotplug_supported_mask |=HDMID_HOTPLUG_INT_STATUS ; }else {/* If we got an unknown sdvox_reg, things are pretty much broken * in a way that we should let the kernel know about it */
Signature · 1 line
1.7.10
PATCH 22/25 drm/i915: add WR PLL programming table
In reply to Eugeni DodonovThis table is used for programming WR PLL clocks, used by HDMI and DVI outputs. I split it into a separate patch to simplify the HDMI enabling patch which was getting huge.
Note that this table is a temporary solution for WR PLL programming. It will be reworked into a more exact algorithm at a later stage. But for now, it provides the most accurate clock setting solution, so we use it here.
--- drivers/gpu/drm/i915/intel_ddi.c | 388 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 388 insertions(+)
drivers/gpu/drm/i915/intel_ddi.c +388 -0
@@ -249,3 +249,391 @@ void intel_ddi_init(struct drm_device *dev, enum port port)break ; } } + +/* WRPLL clock dividers */ +struct wrpll_tmds_clock { +u32 clock; +u16 p;/* Post divider */ +u16 n2;/* Feedback divider */ +u16 r2;/* Reference divider */ +}; + +/* Table of matching values for WRPLL clocks programming for each frequency */ +static const struct wrpll_tmds_clock wrpll_tmds_clock_table[] = { + {19750 ,38 ,25 ,18 }, + {20000 ,48 ,32 ,18 }, + {21000 ,36 ,21 ,15 }, + {21912 ,42 ,29 ,17 }, + {22000 ,36 ,22 ,15 }, + {23000 ,36 ,23 ,15 }, + {23500 ,40 ,40 ,23 }, + {23750 ,26 ,16 ,14 }, + {23750 ,26 ,16 ,14 }, + {24000 ,36 ,24 ,15 }, + {25000 ,36 ,25 ,15 }, + {25175 ,26 ,40 ,33 }, + {25200 ,30 ,21 ,15 }, + {26000 ,36 ,26 ,15 }, + {27000 ,30 ,21 ,14 }, + {27027 ,18 ,100 ,111 }, + {27500 ,30 ,29 ,19 }, + {28000 ,34 ,30 ,17 }, + {28320 ,26 ,30 ,22 }, + {28322 ,32 ,42 ,25 }, + {28750 ,24 ,23 ,18 }, + {29000 ,30 ,29 ,18 }, + {29750 ,32 ,30 ,17 }, + {30000 ,30 ,25 ,15 }, + {30750 ,30 ,41 ,24 }, + {31000 ,30 ,31 ,18 }, + {31500 ,30 ,28 ,16 }, + {32000 ,30 ,32 ,18 }, + {32500 ,28 ,32 ,19 }, + {33000 ,24 ,22 ,15 }, + {34000 ,28 ,30 ,17 }, + {35000 ,26 ,32 ,19 }, + {35500 ,24 ,30 ,19 }, + {36000 ,26 ,26 ,15 }, + {36750 ,26 ,46 ,26 }, + {37000 ,24 ,23 ,14 }, + {37762 ,22 ,40 ,26 }, + {37800 ,20 ,21 ,15 }, + {38000 ,24 ,27 ,16 }, + {38250 ,24 ,34 ,20 }, + {39000 ,24 ,26 ,15 }, + {40000 ,24 ,32 ,18 }, + {40500 ,20 ,21 ,14 }, + {40541 ,22 ,147 ,89 }, + {40750 ,18 ,19 ,14 }, + {41000 ,16 ,17 ,14 }, + {41500 ,22 ,44 ,26 }, + {41540 ,22 ,44 ,26 }, + {42000 ,18 ,21 ,15 }, + {42500 ,22 ,45 ,26 }, + {43000 ,20 ,43 ,27 }, + {43163 ,20 ,24 ,15 }, + {44000 ,18 ,22 ,15 }, + {44900 ,20 ,108 ,65 }, + {45000 ,20 ,25 ,15 }, + {45250 ,20 ,52 ,31 }, + {46000 ,18 ,23 ,15 }, + {46750 ,20 ,45 ,26 }, + {47000 ,20 ,40 ,23 }, + {48000 ,18 ,24 ,15 }, + {49000 ,18 ,49 ,30 }, + {49500 ,16 ,22 ,15 }, + {50000 ,18 ,25 ,15 }, + {50500 ,18 ,32 ,19 }, + {51000 ,18 ,34 ,20 }, + {52000 ,18 ,26 ,15 }, + {52406 ,14 ,34 ,25 }, + {53000 ,16 ,22 ,14 }, + {54000 ,16 ,24 ,15 }, + {54054 ,16 ,173 ,108 }, + {54500 ,14 ,24 ,17 }, + {55000 ,12 ,22 ,18 }, + {56000 ,14 ,45 ,31 }, + {56250 ,16 ,25 ,15 }, + {56750 ,14 ,25 ,17 }, + {57000 ,16 ,27 ,16 }, + {58000 ,16 ,43 ,25 }, + {58250 ,16 ,38 ,22 }, + {58750 ,16 ,40 ,23 }, + {59000 ,14 ,26 ,17 }, + {59341 ,14 ,40 ,26 }, + {59400 ,16 ,44 ,25 }, + {60000 ,16 ,32 ,18 }, + {60500 ,12 ,39 ,29 }, + {61000 ,14 ,49 ,31 }, + {62000 ,14 ,37 ,23 }, + {62250 ,14 ,42 ,26 }, + {63000 ,12 ,21 ,15 }, + {63500 ,14 ,28 ,17 }, + {64000 ,12 ,27 ,19 }, + {65000 ,14 ,32 ,19 }, + {65250 ,12 ,29 ,20 }, + {65500 ,12 ,32 ,22 }, + {66000 ,12 ,22 ,15 }, + {66667 ,14 ,38 ,22 }, + {66750 ,10 ,21 ,17 }, + {67000 ,14 ,33 ,19 }, + {67750 ,14 ,58 ,33 }, + {68000 ,14 ,30 ,17 }, + {68179 ,14 ,46 ,26 }, + {68250 ,14 ,46 ,26 }, + {69000 ,12 ,23 ,15 }, + {70000 ,12 ,28 ,18 }, + {71000 ,12 ,30 ,19 }, + {72000 ,12 ,24 ,15 }, + {73000 ,10 ,23 ,17 }, + {74000 ,12 ,23 ,14 }, + {74176 ,8 ,100 ,91 }, + {74250 ,10 ,22 ,16 }, + {74481 ,12 ,43 ,26 }, + {74500 ,10 ,29 ,21 }, + {75000 ,12 ,25 ,15 }, + {75250 ,10 ,39 ,28 }, + {76000 ,12 ,27 ,16 }, + {77000 ,12 ,53 ,31 }, + {78000 ,12 ,26 ,15 }, + {78750 ,12 ,28 ,16 }, + {79000 ,10 ,38 ,26 }, + {79500 ,10 ,28 ,19 }, + {80000 ,12 ,32 ,18 }, + {81000 ,10 ,21 ,14 }, + {81081 ,6 ,100 ,111 }, + {81624 ,8 ,29 ,24 }, + {82000 ,8 ,17 ,14 }, + {83000 ,10 ,40 ,26 }, + {83950 ,10 ,28 ,18 }, + {84000 ,10 ,28 ,18 }, + {84750 ,6 ,16 ,17 }, + {85000 ,6 ,17 ,18 }, + {85250 ,10 ,30 ,19 }, + {85750 ,10 ,27 ,17 }, + {86000 ,10 ,43 ,27 }, + {87000 ,10 ,29 ,18 }, + {88000 ,10 ,44 ,27 }, + {88500 ,10 ,41 ,25 }, + {89000 ,10 ,28 ,17 }, + {89012 ,6 ,90 ,91 }, + {89100 ,10 ,33 ,20 }, + {90000 ,10 ,25 ,15 }, + {91000 ,10 ,32 ,19 }, + {92000 ,10 ,46 ,27 }, + {93000 ,10 ,31 ,18 }, + {94000 ,10 ,40 ,23 }, + {94500 ,10 ,28 ,16 }, + {95000 ,10 ,44 ,25 }, + {95654 ,10 ,39 ,22 }, + {95750 ,10 ,39 ,22 }, + {96000 ,10 ,32 ,18 }, + {97000 ,8 ,23 ,16 }, + {97750 ,8 ,42 ,29 }, + {98000 ,8 ,45 ,31 }, + {99000 ,8 ,22 ,15 }, + {99750 ,8 ,34 ,23 }, + {100000 ,6 ,20 ,18 }, + {100500 ,6 ,19 ,17 }, + {101000 ,6 ,37 ,33 }, + {101250 ,8 ,21 ,14 }, + {102000 ,6 ,17 ,15 }, + {102250 ,6 ,25 ,22 }, + {103000 ,8 ,29 ,19 }, + {104000 ,8 ,37 ,24 }, + {105000 ,8 ,28 ,18 }, + {106000 ,8 ,22 ,14 }, + {107000 ,8 ,46 ,29 }, + {107214 ,8 ,27 ,17 }, + {108000 ,8 ,24 ,15 }, + {108108 ,8 ,173 ,108 }, + {109000 ,6 ,23 ,19 }, + {109000 ,6 ,23 ,19 }, + {110000 ,6 ,22 ,18 }, + {110013 ,6 ,22 ,18 }, + {110250 ,8 ,49 ,30 }, + {110500 ,8 ,36 ,22 }, + {111000 ,8 ,23 ,14 }, + {111264 ,8 ,150 ,91 }, + {111375 ,8 ,33 ,20 }, + {112000 ,8 ,63 ,38 }, + {112500 ,8 ,25 ,15 }, + {113100 ,8 ,57 ,34 }, + {113309 ,8 ,42 ,25 }, + {114000 ,8 ,27 ,16 }, + {115000 ,6 ,23 ,18 }, + {116000 ,8 ,43 ,25 }, + {117000 ,8 ,26 ,15 }, + {117500 ,8 ,40 ,23 }, + {118000 ,6 ,38 ,29 }, + {119000 ,8 ,30 ,17 }, + {119500 ,8 ,46 ,26 }, + {119651 ,8 ,39 ,22 }, + {120000 ,8 ,32 ,18 }, + {121000 ,6 ,39 ,29 }, + {121250 ,6 ,31 ,23 }, + {121750 ,6 ,23 ,17 }, + {122000 ,6 ,42 ,31 }, + {122614 ,6 ,30 ,22 }, + {123000 ,6 ,41 ,30 }, + {123379 ,6 ,37 ,27 }, + {124000 ,6 ,51 ,37 }, + {125000 ,6 ,25 ,18 }, + {125250 ,4 ,13 ,14 }, + {125750 ,4 ,27 ,29 }, + {126000 ,6 ,21 ,15 }, + {127000 ,6 ,24 ,17 }, + {127250 ,6 ,41 ,29 }, + {128000 ,6 ,27 ,19 }, + {129000 ,6 ,43 ,30 }, + {129859 ,4 ,25 ,26 }, + {130000 ,6 ,26 ,18 }, + {130250 ,6 ,42 ,29 }, + {131000 ,6 ,32 ,22 }, + {131500 ,6 ,38 ,26 }, + {131850 ,6 ,41 ,28 }, + {132000 ,6 ,22 ,15 }, + {132750 ,6 ,28 ,19 }, + {133000 ,6 ,34 ,23 }, + {133330 ,6 ,37 ,25 }, + {134000 ,6 ,61 ,41 }, + {135000 ,6 ,21 ,14 }, + {135250 ,6 ,167 ,111 }, + {136000 ,6 ,62 ,41 }, + {137000 ,6 ,35 ,23 }, + {138000 ,6 ,23 ,15 }, + {138500 ,6 ,40 ,26 }, + {138750 ,6 ,37 ,24 }, + {139000 ,6 ,34 ,22 }, + {139050 ,6 ,34 ,22 }, + {139054 ,6 ,34 ,22 }, + {140000 ,6 ,28 ,18 }, + {141000 ,6 ,36 ,23 }, + {141500 ,6 ,22 ,14 }, + {142000 ,6 ,30 ,19 }, + {143000 ,6 ,27 ,17 }, + {143472 ,4 ,17 ,16 }, + {144000 ,6 ,24 ,15 }, + {145000 ,6 ,29 ,18 }, + {146000 ,6 ,47 ,29 }, + {146250 ,6 ,26 ,16 }, + {147000 ,6 ,49 ,30 }, + {147891 ,6 ,23 ,14 }, + {148000 ,6 ,23 ,14 }, + {148250 ,6 ,28 ,17 }, + {148352 ,4 ,100 ,91 }, + {148500 ,6 ,33 ,20 }, + {149000 ,6 ,48 ,29 }, + {150000 ,6 ,25 ,15 }, + {151000 ,4 ,19 ,17 }, + {152000 ,6 ,27 ,16 }, + {152280 ,6 ,44 ,26 }, + {153000 ,6 ,34 ,20 }, + {154000 ,6 ,53 ,31 }, + {155000 ,6 ,31 ,18 }, + {155250 ,6 ,50 ,29 }, + {155750 ,6 ,45 ,26 }, + {156000 ,6 ,26 ,15 }, + {157000 ,6 ,61 ,35 }, + {157500 ,6 ,28 ,16 }, + {158000 ,6 ,65 ,37 }, + {158250 ,6 ,44 ,25 }, + {159000 ,6 ,53 ,30 }, + {159500 ,6 ,39 ,22 }, + {160000 ,6 ,32 ,18 }, + {161000 ,4 ,31 ,26 }, + {162000 ,4 ,18 ,15 }, + {162162 ,4 ,131 ,109 }, + {162500 ,4 ,53 ,44 }, + {163000 ,4 ,29 ,24 }, + {164000 ,4 ,17 ,14 }, + {165000 ,4 ,22 ,18 }, + {166000 ,4 ,32 ,26 }, + {167000 ,4 ,26 ,21 }, + {168000 ,4 ,46 ,37 }, + {169000 ,4 ,104 ,83 }, + {169128 ,4 ,64 ,51 }, + {169500 ,4 ,39 ,31 }, + {170000 ,4 ,34 ,27 }, + {171000 ,4 ,19 ,15 }, + {172000 ,4 ,51 ,40 }, + {172750 ,4 ,32 ,25 }, + {172800 ,4 ,32 ,25 }, + {173000 ,4 ,41 ,32 }, + {174000 ,4 ,49 ,38 }, + {174787 ,4 ,22 ,17 }, + {175000 ,4 ,35 ,27 }, + {176000 ,4 ,30 ,23 }, + {177000 ,4 ,38 ,29 }, + {178000 ,4 ,29 ,22 }, + {178500 ,4 ,37 ,28 }, + {179000 ,4 ,53 ,40 }, + {179500 ,4 ,73 ,55 }, + {180000 ,4 ,20 ,15 }, + {181000 ,4 ,55 ,41 }, + {182000 ,4 ,31 ,23 }, + {183000 ,4 ,42 ,31 }, + {184000 ,4 ,30 ,22 }, + {184750 ,4 ,26 ,19 }, + {185000 ,4 ,37 ,27 }, + {186000 ,4 ,51 ,37 }, + {187000 ,4 ,36 ,26 }, + {188000 ,4 ,32 ,23 }, + {189000 ,4 ,21 ,15 }, + {190000 ,4 ,38 ,27 }, + {190960 ,4 ,41 ,29 }, + {191000 ,4 ,41 ,29 }, + {192000 ,4 ,27 ,19 }, + {192250 ,4 ,37 ,26 }, + {193000 ,4 ,20 ,14 }, + {193250 ,4 ,53 ,37 }, + {194000 ,4 ,23 ,16 }, + {194208 ,4 ,23 ,16 }, + {195000 ,4 ,26 ,18 }, + {196000 ,4 ,45 ,31 }, + {197000 ,4 ,35 ,24 }, + {197750 ,4 ,41 ,28 }, + {198000 ,4 ,22 ,15 }, + {198500 ,4 ,25 ,17 }, + {199000 ,4 ,28 ,19 }, + {200000 ,4 ,37 ,25 }, + {201000 ,4 ,61 ,41 }, + {202000 ,4 ,112 ,75 }, + {202500 ,4 ,21 ,14 }, + {203000 ,4 ,146 ,97 }, + {204000 ,4 ,62 ,41 }, + {204750 ,4 ,44 ,29 }, + {205000 ,4 ,38 ,25 }, + {206000 ,4 ,29 ,19 }, + {207000 ,4 ,23 ,15 }, + {207500 ,4 ,40 ,26 }, + {208000 ,4 ,37 ,24 }, + {208900 ,4 ,48 ,31 }, + {209000 ,4 ,48 ,31 }, + {209250 ,4 ,31 ,20 }, + {210000 ,4 ,28 ,18 }, + {211000 ,4 ,25 ,16 }, + {212000 ,4 ,22 ,14 }, + {213000 ,4 ,30 ,19 }, + {213750 ,4 ,38 ,24 }, + {214000 ,4 ,46 ,29 }, + {214750 ,4 ,35 ,22 }, + {215000 ,4 ,43 ,27 }, + {216000 ,4 ,24 ,15 }, + {217000 ,4 ,37 ,23 }, + {218000 ,4 ,42 ,26 }, + {218250 ,4 ,42 ,26 }, + {218750 ,4 ,34 ,21 }, + {219000 ,4 ,47 ,29 }, + {219000 ,4 ,47 ,29 }, + {220000 ,4 ,44 ,27 }, + {220640 ,4 ,49 ,30 }, + {220750 ,4 ,36 ,22 }, + {221000 ,4 ,36 ,22 }, + {222000 ,4 ,23 ,14 }, + {222525 ,4 ,28 ,17 }, + {222750 ,4 ,33 ,20 }, + {227000 ,4 ,37 ,22 }, + {230250 ,4 ,29 ,17 }, + {233500 ,4 ,38 ,22 }, + {235000 ,4 ,40 ,23 }, + {238000 ,4 ,30 ,17 }, + {241500 ,2 ,17 ,19 }, + {245250 ,2 ,20 ,22 }, + {247750 ,2 ,22 ,24 }, + {253250 ,2 ,15 ,16 }, + {256250 ,2 ,18 ,19 }, + {262500 ,2 ,31 ,32 }, + {267250 ,2 ,66 ,67 }, + {268500 ,2 ,94 ,95 }, + {270000 ,2 ,14 ,14 }, + {272500 ,2 ,77 ,76 }, + {273750 ,2 ,57 ,56 }, + {280750 ,2 ,24 ,23 }, + {281250 ,2 ,23 ,22 }, + {286000 ,2 ,17 ,16 }, + {291750 ,2 ,26 ,24 }, + {296703 ,2 ,56 ,51 }, + {297000 ,2 ,22 ,20 }, + {298000 ,2 ,21 ,19 }, +};
Signature · 1 line
1.7.10
PATCH 23/25 drm/i915: move HDMI structs to shared location
In reply to Eugeni DodonovMove intel_hdmi data structure and support functions to a shared location, to allow their usage from intel_ddi module.
--- drivers/gpu/drm/i915/intel_drv.h | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_hdmi.c | 19 +++---------------- 2 files changed, 21 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +18 -1
@@ -290,6 +290,19 @@ struct dip_infoframe { } __attribute__ ((packed)) body; } __attribute__((packed)); +struct intel_hdmi { +struct intel_encoder base; +u32 sdvox_reg; +int ddc_bus; +int ddi_port; +uint32_t color_range; +bool has_hdmi_sink; +bool has_audio; +enum hdmi_force_audio force_audio; +void (*write_infoframe)(struct drm_encoder *encoder, +struct dip_infoframe *frame); +}; +static inline struct drm_crtc *intel_get_crtc_for_pipe (struct drm_device *dev,int pipe) {
@@ -329,7 +342,11 @@ extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector)extern void intel_crt_init (struct drm_device *dev);extern void intel_hdmi_init (struct drm_device *dev,int sdvox_reg); -void intel_dip_infoframe_csum (struct dip_infoframe *avi_if); +extern struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder); +extern void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder, +struct drm_display_mode *adjusted_mode); +extern void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder); +extern void intel_dip_infoframe_csum (struct dip_infoframe *avi_if);extern bool intel_sdvo_init (struct drm_device *dev,uint32_t sdvo_reg,bool is_sdvob);extern void intel_dvo_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_hdmi.c +3 -16
@@ -37,20 +37,7 @@#include "i915_drm.h" #include "i915_drv.h" -struct intel_hdmi { -struct intel_encoder base; -u32 sdvox_reg; -int ddc_bus; -int ddi_port; -uint32_t color_range; -bool has_hdmi_sink; -bool has_audio; -enum hdmi_force_audio force_audio; -void (*write_infoframe)(struct drm_encoder *encoder, -struct dip_infoframe *frame); -}; - -static struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder) +struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder) { return container_of(encoder, struct intel_hdmi, base.base); }
@@ -354,7 +341,7 @@ static void intel_set_infoframe(struct drm_encoder *encoder, intel_hdmi->write_infoframe (encoder, frame); } -static void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder, +void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder,struct drm_display_mode *adjusted_mode) {struct dip_infoframe avi_if = {
@@ -369,7 +356,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,intel_set_infoframe (encoder, &avi_if); } -static void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder) +void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder) {struct dip_infoframe spd_if;
Signature · 1 line
1.7.10
Re: [PATCH 23/25] drm/i915: move HDMI structs to shared location
Quoted 20 lines · Eugeni Dodonov
Move
intel_hdmidata structure and support functions to a shared location, to allow their usage fromintel_ddimodule.Reviewed-by Jesse Barnes <[email protected]>Signed-off-by Eugeni Dodonov <[email protected]>--- drivers/gpu/drm/i915/intel_drv.h | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_hdmi.c | 19 +++---------------- 2 files changed, 21 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -290,6 +290,19 @@ struct dip_infoframe { } __attribute__ ((packed)) body; } __attribute__((packed)); +struct intel_hdmi { + struct intel_encoder base;
drivers/gpu/drm/i915/intel_drv.h struct dip_infoframe { · line 304
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +10
-0+u32 sdvox_reg; +int ddc_bus; +int ddi_port; +uint32_t color_range; +bool has_hdmi_sink; +bool has_audio; +enum hdmi_force_audio force_audio; +void (*write_infoframe)(struct drm_encoder *encoder, +struct dip_infoframe *frame); +};
I do wonder whether we shouldn't create an intel_digital_encoder struct to control all this funny infoframe writing, many of the flags in there (like has_hdmi_sink, has_audio) and similar stuff.
But I guess that can wait until we have working infoframe support on display ports and working display port on ddi links. When that all landed we should see much clearer how to best structure the code. -Daniel
Quoted 68 lines
drivers/gpu/drm/i915/intel_drv.h +6
-1+static inline struct drm_crtc *intel_get_crtc_for_pipe (struct drm_device *dev,int pipe) {@@ -329,7 +342,11 @@ extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector)extern void intel_crt_init (struct drm_device *dev);extern void intel_hdmi_init (struct drm_device *dev,int sdvox_reg); -void intel_dip_infoframe_csum (struct dip_infoframe *avi_if); +extern struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder); +extern void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder, +struct drm_display_mode *adjusted_mode); +extern void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder); +extern void intel_dip_infoframe_csum (struct dip_infoframe *avi_if);extern bool intel_sdvo_init (struct drm_device *dev,uint32_t sdvo_reg,bool is_sdvob);extern void intel_dvo_init (struct drm_device *dev);drivers/gpu/drm/i915/intel_hdmi.c +3
-16@@ -37,20 +37,7 @@#include "i915_drm.h" #include "i915_drv.h" -struct intel_hdmi { -struct intel_encoder base; -u32 sdvox_reg; -int ddc_bus; -int ddi_port; -uint32_t color_range; -bool has_hdmi_sink; -bool has_audio; -enum hdmi_force_audio force_audio; -void (*write_infoframe)(struct drm_encoder *encoder, -struct dip_infoframe *frame); -}; - -static struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder) +struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder) { return container_of(encoder, struct intel_hdmi, base.base); }@@ -354,7 +341,7 @@ static void intel_set_infoframe(struct drm_encoder *encoder, intel_hdmi->write_infoframe (encoder, frame); } -static void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder, +void intel_hdmi_set_avi_infoframe (struct drm_encoder *encoder,struct drm_display_mode *adjusted_mode) {struct dip_infoframe avi_if = {@@ -369,7 +356,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,intel_set_infoframe (encoder, &avi_if); } -static void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder) +void intel_hdmi_set_spd_infoframe (struct drm_encoder *encoder) {struct dip_infoframe spd_if;Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
PATCH 24/25 drm/i915: prepare HDMI link for Haswell
In reply to Eugeni DodonovOn Haswell, we need to properly train the DDI buffers prior to enabling HDMI, and enable the required clocks with correct dividers for the desired frequency.
Also, we cannot simple reuse HDMI routines from previous generations of GPU, as most of HDMI-specific stuff is being done via the DDI port programming instead of HDMI-specific registers.
This commit take advantage of the WR PLL clock table which is in a separate (previous) commit to select the right divisors for each mode.
--- drivers/gpu/drm/i915/intel_ddi.c | 116 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 5 ++ drivers/gpu/drm/i915/intel_hdmi.c | 13 ++++- 3 files changed, 133 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +116 -0
@@ -637,3 +637,119 @@ static const struct wrpll_tmds_clock wrpll_tmds_clock_table[] = { {297000, 2, 22, 20}, {298000, 2, 21, 19}, }; + +void intel_ddi_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +struct drm_device *dev = encoder->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = encoder->crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); +int port = intel_hdmi->ddi_port; +int pipe = intel_crtc->pipe; +int p, n2, r2, valid=0 ; +u32 temp, i; + +/* On Haswell, we need to enable the clocks and prepare DDI function to +* work in HDMI mode for this pipe. +*/ +DRM_DEBUG_KMS ("Preparing HDMI DDI mode for Haswell on port %c, pipe %c\n" ,port_name (port),pipe_name (pipe)); + +for (i=0 ; i <ARRAY_SIZE (wrpll_tmds_clock_table); i++) { +if (crtc->mode.clock == wrpll_tmds_clock_table[i].clock) { + p = wrpll_tmds_clock_table[i].p; + n2 = wrpll_tmds_clock_table[i].n2; + r2 = wrpll_tmds_clock_table[i].r2; + +DRM_DEBUG_KMS ("WR PLL clock: found settings for %dKHz refresh rate: p=%d, n2=%d, r2=%d\n" , + crtc->mode.clock, + p, n2, r2); + + valid =1 ; +break ; + } + } + +if (!valid) { +DRM_ERROR ("Unable to find WR PLL clock settings for %dKHz refresh rate\n" , + crtc->mode.clock); +return ; + } + +/* Enable LCPLL if disabled */ + temp =I915_READ (LCPLL_CTL ); +if (temp &LCPLL_PLL_DISABLE ) +I915_WRITE (LCPLL_CTL , + temp & ~LCPLL_PLL_DISABLE ); + +/* Configure WR PLL 1, program the correct divider values for +* the desired frequency and wait for warmup */ +I915_WRITE (WRPLL_CTL1 , +WRPLL_PLL_ENABLE | +WRPLL_PLL_SELECT_LCPLL_2700 | +WRPLL_DIVIDER_REFERENCE (r2) | +WRPLL_DIVIDER_FEEDBACK (n2) | +WRPLL_DIVIDER_POST (p)); + +udelay (20 ); + +/* Use WRPLL1 clock to drive the output to the port, and tell the pipe to use +* this port for connection. +*/ +I915_WRITE (PORT_CLK_SEL (port), +PORT_CLK_SEL_WRPLL1 ); +I915_WRITE (PIPE_CLK_SEL (pipe), +PIPE_CLK_SEL_PORT (port)); + +udelay (20 ); + +if (intel_hdmi->has_audio) { +/* Proper support for digital audio needs a new logic and a new set +* of registers, so we leave it for future patch bombing. +*/ +DRM_DEBUG_DRIVER ("HDMI audio on pipe %c not yet supported on DDI\n" , +pipe_name (intel_crtc->pipe)); + } + +/* Enable PIPE_DDI_FUNC_CTL for the pipe to work in HDMI mode */ + temp =I915_READ (DDI_FUNC_CTL (pipe)); + temp &= ~PIPE_DDI_PORT_MASK ; + temp &= ~PIPE_DDI_BPC_12 ; + temp |=PIPE_DDI_SELECT_PORT (port) | +PIPE_DDI_MODE_SELECT_HDMI | + ((intel_crtc->bpp >24 ) ? +PIPE_DDI_BPC_12 : +PIPE_DDI_BPC_8 ) | +PIPE_DDI_FUNC_ENABLE ; + +I915_WRITE (DDI_FUNC_CTL (pipe), temp); + +intel_hdmi_set_avi_infoframe (encoder, adjusted_mode); +intel_hdmi_set_spd_infoframe (encoder); +} + +void intel_ddi_dpms (struct drm_encoder *encoder,int mode) +{ +struct drm_device *dev = encoder->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); +int port = intel_hdmi->ddi_port; +u32 temp; + + temp =I915_READ (DDI_BUF_CTL (port)); + +if (mode !=DRM_MODE_DPMS_ON ) { + temp &= ~DDI_BUF_CTL_ENABLE ; + }else { + temp |=DDI_BUF_CTL_ENABLE ; + } + +/* Enable DDI_BUF_CTL. In HDMI/DVI mode, the port width, +* and swing/emphasis values are ignored so nothing special needs +* to be done besides enabling the port. +*/ +I915_WRITE (DDI_BUF_CTL (port), + temp); +}
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -497,4 +497,9 @@ extern void gen6_update_ring_freq(struct drm_i915_private *dev_priv);extern void gen6_disable_rps (struct drm_device *dev);extern void intel_init_emon (struct drm_device *dev); +extern void intel_ddi_dpms (struct drm_encoder *encoder,int mode); +extern void intel_ddi_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode); +#endif /* __INTEL_DRV_H__ */
drivers/gpu/drm/i915/intel_hdmi.c +12 -1
@@ -612,6 +612,14 @@ static void intel_hdmi_destroy(struct drm_connector *connector)kfree (connector); } +static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = { + .dpms = intel_ddi_dpms, + .mode_fixup = intel_hdmi_mode_fixup, + .prepare = intel_encoder_prepare, + .mode_set = intel_ddi_mode_set, + .commit = intel_encoder_commit, +}; +static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = { .dpms = intel_hdmi_dpms, .mode_fixup = intel_hdmi_mode_fixup,
@@ -751,7 +759,10 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)I915_WRITE (TVIDEO_DIP_CTL (i),0 ); } -drm_encoder_helper_add (&intel_encoder->base, &intel_hdmi_helper_funcs); +if (IS_HASWELL (dev)) +drm_encoder_helper_add (&intel_encoder->base, &intel_hdmi_helper_funcs_hsw); +else +drm_encoder_helper_add (&intel_encoder->base, &intel_hdmi_helper_funcs);intel_hdmi_add_properties (intel_hdmi, connector);
Signature · 1 line
1.7.10
PATCH 25/25 drm/i915: hook Haswell devices in place
In reply to Eugeni DodonovThis patch enables i915 driver to handle Haswell devices. It should go in last, when things are working stable enough.
--- drivers/char/agp/intel-agp.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ 2 files changed, 11 insertions(+)
drivers/char/agp/intel-agp.c +4 -0
@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = {ID (PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB ),ID (PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB ),ID (PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_M_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_S_HB ), + ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB), { } };
drivers/gpu/drm/i915/i915_drv.c +7 -0
@@ -345,6 +345,13 @@ static const struct pci_device_id pciidlist[] = { /* aka */INTEL_VGA_DEVICE (0x0162 , &intel_ivybridge_d_info),/* GT2 desktop */ INTEL_VGA_DEVICE (0x015a , &intel_ivybridge_d_info),/* GT1 server */ INTEL_VGA_DEVICE (0x016a , &intel_ivybridge_d_info),/* GT2 server */ +INTEL_VGA_DEVICE (0x0402 , &intel_haswell_d_info),/* GT1 desktop */ +INTEL_VGA_DEVICE (0x0412 , &intel_haswell_d_info),/* GT2 desktop */ +INTEL_VGA_DEVICE (0x040a , &intel_haswell_d_info),/* GT1 server */ +INTEL_VGA_DEVICE (0x041a , &intel_haswell_d_info),/* GT2 server */ +INTEL_VGA_DEVICE (0x0406 , &intel_haswell_m_info),/* GT1 mobile */ +INTEL_VGA_DEVICE (0x0416 , &intel_haswell_m_info),/* GT2 mobile */ +INTEL_VGA_DEVICE (0x0c16 , &intel_haswell_d_info),/* SDV */ {0, 0, 0} };
Signature · 1 line
1.7.10
Re: [PATCH 25/25] drm/i915: hook Haswell devices in place
Quoted 4 lines · Eugeni Dodonov
This patch enables i915 driver to handle Haswell devices. It should go in last, when things are working stable enough.
Signed-off-by Eugeni Dodonov <[email protected]>
Ok, merged them all into dinq, with the commit message of patch 11 pimped by your explanation from the private email.
Thanks, Daniel
Quoted 45 lines
--- drivers/char/agp/intel-agp.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ 2 files changed, 11 insertions(+)drivers/char/agp/intel-agp.c +4
-0@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = {ID (PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB ),ID (PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB ),ID (PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_M_HB ), +ID (PCI_DEVICE_ID_INTEL_HASWELL_S_HB ), + ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB), { } };drivers/gpu/drm/i915/i915_drv.c +7
-0@@ -345,6 +345,13 @@ static const struct pci_device_id pciidlist[] = { /* aka */INTEL_VGA_DEVICE (0x0162 , &intel_ivybridge_d_info),/* GT2 desktop */ INTEL_VGA_DEVICE (0x015a , &intel_ivybridge_d_info),/* GT1 server */ INTEL_VGA_DEVICE (0x016a , &intel_ivybridge_d_info),/* GT2 server */ +INTEL_VGA_DEVICE (0x0402 , &intel_haswell_d_info),/* GT1 desktop */ +INTEL_VGA_DEVICE (0x0412 , &intel_haswell_d_info),/* GT2 desktop */ +INTEL_VGA_DEVICE (0x040a , &intel_haswell_d_info),/* GT1 server */ +INTEL_VGA_DEVICE (0x041a , &intel_haswell_d_info),/* GT2 server */ +INTEL_VGA_DEVICE (0x0406 , &intel_haswell_m_info),/* GT1 mobile */ +INTEL_VGA_DEVICE (0x0416 , &intel_haswell_m_info),/* GT2 mobile */ +INTEL_VGA_DEVICE (0x0c16 , &intel_haswell_d_info),/* SDV */ {0, 0, 0} };Signature · 6 lines
1.7.10 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48