Skip to contentSkip to conversation

drm/i915: change CHV write_eld/global_resources function pointers

PATCH Applied Paulo Zanoni 3 participants 3 messages Sep 2, 2014 – Sep 3, 2014

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

PATCH 1/1 drm/i915: change CHV write_eld/global_resources function pointers

From: Paulo Zanoni <[email protected]>

Currently, CHV is using the same functions as HSW/BDW instead of the same functions as VLV. This looks wrong, especially since, for example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW check.

This patch has the potential to fix display audio and the CHV CDCLK.

Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This is completely untested! But maybe it should go to fixes/stable.

drivers/gpu/drm/i915/intel_display.c +1 -1
index c092ff4..e6cae59 100644
@@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
 		dev_priv->display.write_eld = ironlake_write_eld;
 		dev_priv->display.modeset_global_resources =
 			ivb_modeset_global_resources;
-	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
+	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
 		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
 		dev_priv->display.write_eld = haswell_write_eld;
 		dev_priv->display.modeset_global_resources =
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Currently, CHV is using the same functions as HSW/BDW instead of the same functions as VLV. This looks wrong, especially since, for example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW check.

This patch has the potential to fix display audio and the CHV CDCLK.

Cc Ville Syrjälä <[email protected]>

Whoops. These things seem to slip through a lot. I can imediately spot another IS_GEN8 fumble with intel_frontbuffer_flush().

Anyway this patch is:

Quoted 6 lines
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This is completely untested! But maybe it should go to fixes/stable.

Yes. -fixes at least so we get it into 3.17. I'll spin it up on my bsw and make sure it doesn't explode in some unforseen way.

Quoted 17 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
index c092ff4..e6cae59 100644
@@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
 		dev_priv->display.write_eld = ironlake_write_eld;
 		dev_priv->display.modeset_global_resources =
 			ivb_modeset_global_resources;
-	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
+	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
 		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
 		dev_priv->display.write_eld = haswell_write_eld;
 		dev_priv->display.modeset_global_resources =
Signature · 1 line
2.1.0
Signature · 2 lines
Ville Syrjälä
Intel OTC
#2 lore raw
Quoted 24 lines · Ville Syrjälä
Quoted 11 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Currently, CHV is using the same functions as HSW/BDW instead of the same functions as VLV. This looks wrong, especially since, for example, valleyview_modeset_global_resouces even has an IS_CHERRYVIEW check.

This patch has the potential to fix display audio and the CHV CDCLK.

Cc Ville Syrjälä <[email protected]>

Whoops. These things seem to slip through a lot. I can imediately spot another IS_GEN8 fumble with intel_frontbuffer_flush().

Anyway this patch is:

Quoted 5 lines
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 4 lines
Quoted 1 line

This is completely untested! But maybe it should go to fixes/stable.

Yes. -fixes at least so we get it into 3.17. I'll spin it up on my bsw and make sure it doesn't explode in some unforseen way.

chv is still hidden behind the preliminary_hw flag, so no need for -fixes. But we need the patch to remove this flag asap since the 3.18 merge window will close roughly this week (if Dave really puts through his stance on closing drm-next when -rc5 hits the streets).

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

Quoted 26 lines
Quoted 18 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
index c092ff4..e6cae59 100644
@@ -12550,7 +12550,7 @@ static void intel_init_display(struct drm_device *dev)
 		dev_priv->display.write_eld = ironlake_write_eld;
 		dev_priv->display.modeset_global_resources =
 			ivb_modeset_global_resources;
-	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
+	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
 		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
 		dev_priv->display.write_eld = haswell_write_eld;
 		dev_priv->display.modeset_global_resources =
Signature · 1 line
2.1.0
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch