Skip to contentSkip to conversation

drm/i915: remove comment about IVB link training from intel_pm.c

PATCH In review Paulo Zanoni 3 participants 7 messages Apr 12, 2013 – Apr 16, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/i915: remove comment about IVB link training from intel_pm.c

From: Paulo Zanoni <[email protected]>

We have the exact same comment inside intel_init_display. This is a leftover from when we moved a lot of code from intel_display.c to intel_pm.c.

---
 drivers/gpu/drm/i915/intel_pm.c |    1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +0 -1
index baea4fc..a175984 100644
@@ -4191,7 +4191,6 @@ void intel_init_pm(struct drm_device *dev)
 			}
 			dev_priv->display.init_clock_gating = gen6_init_clock_gating;
 		} else if (IS_IVYBRIDGE(dev)) {
-			/* FIXME: detect B0+ stepping and use auto training */
 			if (SNB_READ_WM0_LATENCY()) {
 				dev_priv->display.update_wm = ivybridge_update_wm;
 				dev_priv->display.update_sprite_wm = sandybridge_update_sprite_wm;
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/3 drm/i915: don't intel_crt_init on any ULT machines

From: Paulo Zanoni <[email protected]>

We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not have CRT, so just check for !IS_ULT. This problem happened on a real machine and resulted in a very ugly dmesg.

---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index 574d68d..64b4407 100644
@@ -8488,7 +8488,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 		I915_WRITE(PFIT_CONTROL, 0);
 	}
 
-	if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)))
+	if (!IS_ULT(dev))
 		intel_crt_init(dev);
 
 	if (HAS_DDI(dev)) {
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [Intel-gfx] [PATCH 2/3] drm/i915: don't intel_crt_init on any ULT machines

Quoted 8 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not have CRT, so just check for !IS_ULT. This problem happened on a real machine and resulted in a very ugly dmesg.

This doesn't apply to dinq. The approach I'd favour is to have a intel_info.has_crt similar to the other feature flags. -Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#3 lore raw

Re: [Intel-gfx] [PATCH 2/3] drm/i915: don't intel_crt_init on any ULT machines

Quoted 7 lines · Chris Wilson
Quoted 6 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not have CRT, so just check for !IS_ULT. This problem happened on a real machine and resulted in a very ugly dmesg.

Quoted 5 lines
Quoted 2 lines

This doesn't apply to dinq. The approach I'd favour is to have a intel_info.has_crt similar to the other feature flags.

I'm ok with piling checks on top here for now, I guess we should reconsider once the next hw platforms shows up around the corner ...

All patches merged to dinq, thanks.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#4 lore raw

Re: [Intel-gfx] [PATCH 2/3] drm/i915: don't intel_crt_init on any ULT machines

Hi

2013/4/16 Daniel Vetter <[email protected]>:

Quoted 8 lines · Chris Wilson
Quoted 7 lines · Paulo Zanoni
Quoted 6 lines

From: Paulo Zanoni <[email protected]>

We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not have CRT, so just check for !IS_ULT. This problem happened on a real machine and resulted in a very ugly dmesg.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

This doesn't apply to dinq. The approach I'd favour is to have a intel_info.has_crt similar to the other feature flags.

I'm ok with piling checks on top here for now, I guess we should reconsider once the next hw platforms shows up around the corner ...

We can always apply Chris's suggestion as a follow-up patch.

Quoted 2 lines

All patches merged to dinq, thanks.

I thought patch 2 would go to -fixes. We need it even for older Kernels.

Thanks for the reviews,
Paulo

Quoted 5 lines

-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

--
Paulo Zanoni

#5 lore raw

Re: [Intel-gfx] [PATCH 2/3] drm/i915: don't intel_crt_init on any ULT machines

Quoted 4 lines · Paulo Zanoni
Quoted 1 line

All patches merged to dinq, thanks.

I thought patch 2 would go to -fixes. We need it even for older Kernels.

This late in the release cycle -fixes is for severe regressions and black-screen level non-regression issues only. Hence merged through -next with cc: stable.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

#6 lore raw

PATCH 3/3 drm/i915: WARN when LPT-LP is not paired with ULT CPU

In reply to Paulo Zanoni

From: Paulo Zanoni <[email protected]>

---
 drivers/gpu/drm/i915/i915_drv.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +2 -0
index bddb9a5..3d3803a 100644
@@ -457,11 +457,13 @@ void intel_detect_pch(struct drm_device *dev)
 				dev_priv->num_pch_pll = 0;
 				DRM_DEBUG_KMS("Found LynxPoint PCH\n");
 				WARN_ON(!IS_HASWELL(dev));
+				WARN_ON(IS_ULT(dev));
 			} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = PCH_LPT;
 				dev_priv->num_pch_pll = 0;
 				DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
 				WARN_ON(!IS_HASWELL(dev));
+				WARN_ON(!IS_ULT(dev));
 			}
 			BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS);
 		}
Signature · 1 line
1.7.10.4