Skip to contentSkip to conversation

drm/i915: don't check for i830 in vlv specific code

PATCH Applied Jani Nikula 4 participants 5 messages Aug 22, 2014 – Aug 26, 2014 1 message not in the archive

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

PATCH 1/1 drm/i915: don't check for i830 in vlv specific code

---
 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 51b4cd29f932..83eabd758ed9 100644
@@ -1546,7 +1546,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc)
 	BUG_ON(!IS_VALLEYVIEW(dev_priv->dev));
 
 	/* PLL is protected by panel, make sure we can write it */
-	if (IS_MOBILE(dev_priv->dev) && !IS_I830(dev_priv->dev))
+	if (IS_MOBILE(dev_priv->dev))
 		assert_panel_unlocked(dev_priv, crtc->pipe);
 
 	I915_WRITE(reg, dpll);
Signature · 1 line
1.9.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Jani Nikula
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 51b4cd29f932..83eabd758ed9 100644

drivers/gpu/drm/i915/intel_display.c static void vlv_enable_pll(struct intel_crtc *crtc) · line 1550

Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -1546,7 +1546,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc)
 	BUG_ON(!IS_VALLEYVIEW(dev_priv->dev));
 
 	/* PLL is protected by panel, make sure we can write it */
-	if (IS_MOBILE(dev_priv->dev) && !IS_I830(dev_priv->dev))
+	if (IS_MOBILE(dev_priv->dev))
 		assert_panel_unlocked(dev_priv, crtc->pipe);

My gut feeling is that the IS_MOBILE check could also be dropped. Not quite sure though since VLV_D is not mentioned anywhere in the docs AFAICS.

Anyway dropping the 830 check definitely makes sense so:

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
 	I915_WRITE(reg, dpll);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
#2 lore raw
Quoted 13 lines · Ville Syrjälä
Quoted 12 lines · Jani Nikula
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 51b4cd29f932..83eabd758ed9 100644
@@ -1546,7 +1546,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc)
 	BUG_ON(!IS_VALLEYVIEW(dev_priv->dev));
 
Quoted 8 lines

drivers/gpu/drm/i915/intel_display.c static void vlv_enable_pll(struct intel_crtc *crtc) · line 1550

Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
 	/* PLL is protected by panel, make sure we can write it */
-	if (IS_MOBILE(dev_priv->dev) && !IS_I830(dev_priv->dev))
+	if (IS_MOBILE(dev_priv->dev))
 		assert_panel_unlocked(dev_priv, crtc->pipe);

My gut feeling is that the IS_MOBILE check could also be dropped. Not quite sure though since VLV_D is not mentioned anywhere in the docs AFAICS.

I think in the old gens we've pretty much just used IS_MOBILE as HAS_LVDS. vlv/chv having edp panels instead makes that a bit more complicated, but generally I think a new IS_MOBILE check is bogus.

Quoted 2 lines

Anyway dropping the 830 check definitely makes sense so:

Queued for -next, thanks for the patch.
-Daniel

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

A message that is not in the archive (sent off-list or not yet received): 32504_1408711479_53F73B37_32504_3103_1_20140822124430.GV4193@intel.com

#4 lore raw

Ping: Status of the i830 code?

Hi Ville, hi Daniel,

this is again a "ping" on the status of the i830 code. I reviewed the code I received, at least the code I could review (I do not know enough about the internal wirings of the intel_display source, only on the ns2501 dvo source), but I haven't heart anything back. Is there anything I can do to help to move Ville's modifications for i380 into the kernel?

Thanks,
Thomas

#5 lore raw

Re: Ping: Status of the i830 code?

Quoted 7 lines · Thomas Richter

Hi Ville, hi Daniel,

this is again a "ping" on the status of the i830 code. I reviewed the code I received, at least the code I could review (I do not know enough about the internal wirings of the intel_display source, only on the ns2501 dvo source), but I haven't heart anything back. Is there anything I can do to help to move Ville's modifications for i380 into the kernel?

Me getting back to working internet essentially so that I can give them a spin on my own i830m.
-Daniel

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