drm/i915: fix regression after clock gating init split
authorJason Stubbs <jasonbstubbs@gmail.com>
Sat, 28 May 2011 04:26:48 +0000 (14:26 +1000)
committerKeith Packard <keithp@keithp.com>
Sat, 4 Jun 2011 17:40:26 +0000 (10:40 -0700)
During the refactoring in revision 6067aaeadb5b3df26f27ac827256b1ef01e674f5,
the intel_enable_clock_gating was split up into several functions that are
then called indirectly. However, which function to call was not specified for
the IS_PINEVIEW() case. This patch specifies the correct gating function.

Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/intel_display.c

index f553ddfdc16819fa343b4780c27de14fa37d1337..bb1b59b3d12dbd03da814aeb58b0dd8380c0e06e 100644 (file)
@@ -7675,6 +7675,7 @@ static void intel_init_display(struct drm_device *dev)
                        dev_priv->display.update_wm = NULL;
                } else
                        dev_priv->display.update_wm = pineview_update_wm;
+               dev_priv->display.init_clock_gating = gen3_init_clock_gating;
        } else if (IS_G4X(dev)) {
                dev_priv->display.update_wm = g4x_update_wm;
                dev_priv->display.init_clock_gating = g4x_init_clock_gating;